From 98c5b6e73bd5aa3ecc0869c18a0b5013eb473d8c Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 18:27:50 +0100 Subject: [PATCH 01/40] Text box alignment in Smoothly theme Make sure comment text boxes stay within their surrounding box. --- view/theme/smoothly/style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 80e42dd617..847b5ced58 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1780,7 +1780,8 @@ code { } .comment-edit-text-empty { - width: 672px; /*80%*/ + width: 98%; + max-width: 672px; height: 20px; color: #babdb6; transition: all 0.5s ease-in-out; @@ -1793,7 +1794,8 @@ code { } .comment-edit-text-full { - width: 670px; + width: 98%; + max-width: 672px; height: 6em; transition: all 0.5s ease-in-out; -webkit-transition: all 0.5s ease-in-out; @@ -1801,7 +1803,8 @@ code { } .comment-edit-submit-wrapper { - width: 670px; + width: 98%; + max-width: 672px; margin-left: 20px; text-align: left; } From ee5d2acd4299ed4980f26c9d3af339a3cb5055fa Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 19:04:18 +0100 Subject: [PATCH 02/40] Fix alignment of location --- view/theme/smoothly/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 847b5ced58..84597da606 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1543,7 +1543,6 @@ ul .sidebar-group-li .icon { .wall-item-location { margin-top: 5px; - width: 100px; overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; From d9d7eb89edfdc48094b98eed41d4c58087c52f9b Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 19:15:39 +0100 Subject: [PATCH 03/40] Fix alignment of photo menu Remove duplicate definitions Align menu button to be exactly the same width as the photo --- view/theme/smoothly/style.css | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 84597da606..aa62d59949 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1378,9 +1378,15 @@ ul .sidebar-group-li .icon { position: absolute; overflow: hidden; height: 20px; - width: 90px; + width: 100%; top: 85px; left: -1px; + border-right: 1px solid #dddddd; + border-left: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; + box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; border-radius: 0px 0px 5px 5px; -webkit-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px; @@ -1605,7 +1611,7 @@ ul .sidebar-group-li .icon { .wall-item-photo-menu { display: none; - min-width: 92px; + min-width: 88px; color: #2e3436; border-top: 1px; background: #eeeeee; @@ -1626,15 +1632,6 @@ ul .sidebar-group-li .icon { } -.wall-item-photo-menu-button { - border-right: 1px solid #dddddd; - border-left: 1px solid #dddddd; - border-bottom: 1px solid #dddddd; - box-shadow: 3px 3px 4px #959494; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; -} - .fakelink wall-item-photo-menu-button { -webkit-border-radius: 0px 5px 5px 5px; -moz-border-radius: 0px 5px 5px 5px; @@ -1732,7 +1729,6 @@ code { } .wall-item-outside-wrapper.comment .wall-item-photo-menu-button { - width: 50px; top: 45px; background-position: 35px center; } From 68a9386e032dfe18ef4a66e319fdf1a549ff24dc Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 19 Dec 2012 19:28:14 +0000 Subject: [PATCH 04/40] Rename quickstart files to make them obviously related to each other. --- doc/Home.md | 2 +- doc/{andfinally.md => Quick-Start-andfinally.md} | 2 -- doc/{groupsandpages.md => Quick-Start-groupsandpages.md} | 4 ++-- doc/{guide.md => Quick-Start-guide.md} | 2 +- doc/{makingnewfriends.md => Quick-Start-makingnewfriends.md} | 4 ++-- doc/{network.md => Quick-Start-network.md} | 4 ++-- doc/de/Home.md | 2 +- doc/de/{andfinally.md => Quick-Start-andfinally.md} | 0 doc/de/{groupsandpages.md => Quick-Start-groupsandpages.md} | 4 ++-- doc/de/{guide.md => Quick-Start-guide.md} | 2 +- .../{makingnewfriends.md => Quick-Start-makingnewfriends.md} | 4 ++-- doc/de/{network.md => Quick-Start-network.md} | 4 ++-- 12 files changed, 16 insertions(+), 18 deletions(-) rename doc/{andfinally.md => Quick-Start-andfinally.md} (96%) rename doc/{groupsandpages.md => Quick-Start-groupsandpages.md} (85%) rename doc/{guide.md => Quick-Start-guide.md} (94%) rename doc/{makingnewfriends.md => Quick-Start-makingnewfriends.md} (83%) rename doc/{network.md => Quick-Start-network.md} (75%) rename doc/de/{andfinally.md => Quick-Start-andfinally.md} (100%) rename doc/de/{groupsandpages.md => Quick-Start-groupsandpages.md} (84%) rename doc/de/{guide.md => Quick-Start-guide.md} (95%) rename doc/de/{makingnewfriends.md => Quick-Start-makingnewfriends.md} (87%) rename doc/de/{network.md => Quick-Start-network.md} (81%) diff --git a/doc/Home.md b/doc/Home.md index dc45a22534..4c33c64aa5 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,7 +5,7 @@ Friendica Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) -* [New User Quick Start](help/guide) +* [New User Quick Start](help/Quick-Start-guide) * [Creating posts](help/Text_editor) * [Comment, sort and delete posts](help/Text_comment) * [Profiles](help/Profiles) diff --git a/doc/andfinally.md b/doc/Quick-Start-andfinally.md similarity index 96% rename from doc/andfinally.md rename to doc/Quick-Start-andfinally.md index c4e8cb9480..97afd8140c 100644 --- a/doc/andfinally.md +++ b/doc/Quick-Start-andfinally.md @@ -1,5 +1,3 @@ -[[!meta title="And Finally..."]] - And that brings the Quick Start to an end. Here are some more things to help get you started: diff --git a/doc/groupsandpages.md b/doc/Quick-Start-groupsandpages.md similarity index 85% rename from doc/groupsandpages.md rename to doc/Quick-Start-groupsandpages.md index 5cfbc653cf..9beb2ff4c6 100644 --- a/doc/groupsandpages.md +++ b/doc/Quick-Start-groupsandpages.md @@ -1,10 +1,10 @@ -This is the global directory. If you get lost, you can click this link to bring yourself back here. +This is the global directory. If you get lost, you can click this link to bring yourself back here. On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. -Once you've added some groups, move on to the next section. +Once you've added some groups, move on to the next section. diff --git a/doc/guide.md b/doc/Quick-Start-guide.md similarity index 94% rename from doc/guide.md rename to doc/Quick-Start-guide.md index d76af92e25..47537a3e81 100644 --- a/doc/guide.md +++ b/doc/Quick-Start-guide.md @@ -6,7 +6,7 @@ This is a bit like your Facebook wall. It's where all your status messgages are Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. -Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab diff --git a/doc/makingnewfriends.md b/doc/Quick-Start-makingnewfriends.md similarity index 83% rename from doc/makingnewfriends.md rename to doc/Quick-Start-makingnewfriends.md index 7eff1eda10..d3911266ce 100644 --- a/doc/makingnewfriends.md +++ b/doc/Quick-Start-makingnewfriends.md @@ -1,10 +1,10 @@ -This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. +This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. -Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! +Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! diff --git a/doc/network.md b/doc/Quick-Start-network.md similarity index 75% rename from doc/network.md rename to doc/Quick-Start-network.md index 08ddca290e..b456135e2d 100644 --- a/doc/network.md +++ b/doc/Quick-Start-network.md @@ -1,8 +1,8 @@ -This is your Network Tab. If you get lost, you can click this link to bring yourself back here. +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to make some new friends. +Now we need to fill it up, the first step, is to make some new friends. diff --git a/doc/de/Home.md b/doc/de/Home.md index 585f78f44e..9e92f2d834 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -4,7 +4,7 @@ Friendica - Dokumentation und Ressourcen **Inhalte** * [Account - Basics](help/Account-Basics) -* [Schnellstart für neue Benutzer](help/guide) +* [Schnellstart für neue Benutzer](help/Quick-Start-guide) * [Beiträge erstellen](help/Text_editor) * [Beiträge kommentieren, einordnen und löschen](help/Text_comment) * [Profile](help/Profiles) diff --git a/doc/de/andfinally.md b/doc/de/Quick-Start-andfinally.md similarity index 100% rename from doc/de/andfinally.md rename to doc/de/Quick-Start-andfinally.md diff --git a/doc/de/groupsandpages.md b/doc/de/Quick-Start-groupsandpages.md similarity index 84% rename from doc/de/groupsandpages.md rename to doc/de/Quick-Start-groupsandpages.md index 0b5f1fcedd..f0547667f2 100644 --- a/doc/de/groupsandpages.md +++ b/doc/de/Quick-Start-groupsandpages.md @@ -3,13 +3,13 @@ Gruppen und Seiten * [Zur Startseite der Hilfe](help) -Hier siehst du das globale Verzeichnis. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. +Hier siehst du das globale Verzeichnis. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. Auf dieser Seite findest du eine Zusammenstellung von Gruppen, Foren und bekannten Seiten. Gruppen sind keine realen Personen. Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet. Habe keine Sorge, falls du dich unbehaglich fühlst, wenn du dich einer neuen Person vorstellen sollst, da es sich nicht um Personen handelt. Wenn du dich mit einer Gruppe verbindest, erscheinen alle Nachrichten der Gruppe in deinem "Netzwerk"-Tab. Du kannst diese Beiträge kommentieren oder selbst in der Gruppe schreiben, ohne eine der Gruppenmitglieder persönlich hinzuzufügen. Das ist ein großartiger Weg, dynamisch neue Freunde zu gewinnen. Du findest Personen, die du magst, anstatt Fremde hinzuzufügen. Suche dir einfach eine Gruppe und füge sie so hinzu, wie du auch normale Freunde hinzufügst. Es gibt eine Menge Gruppen und möglicherweise findest du nicht wieder zu dieser Seite zurück. In diesem Fall nutze einfach den Link oben auf dieser Seite. -Wenn du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt. +Wenn du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt. diff --git a/doc/de/guide.md b/doc/de/Quick-Start-guide.md similarity index 95% rename from doc/de/guide.md rename to doc/de/Quick-Start-guide.md index a5ce54a1dc..5006d7f9f3 100644 --- a/doc/de/guide.md +++ b/doc/de/Quick-Start-guide.md @@ -11,7 +11,7 @@ Hier sieht es ein wenig wie auf deiner Facebook-Seite aus. Hier findest du alle Wenn du deinen Beitrag ("Post") geschrieben hast, kannst du auf das "Schloss"-Symbol klicken und festlegen, wer deinen Beitrag sehen kann. Wenn du dieses Symbol nicht anklickst, ist dein Beitrag öffentlich. Das bedeutet, dass jeder, der dein Profil ansieht, der auf dem "Community"-Tab deines Servers oder auf dem "Netzwerk"-Tab ("Beiträge deiner Kontakte") eines befreundeten Kontakts ist, den Beitrag sehen kann. -Probiere es doch einfach mal aus. Wenn du fertg bist, schauen wir uns den "Netzwerk"-Tab an. +Probiere es doch einfach mal aus. Wenn du fertg bist, schauen wir uns den "Netzwerk"-Tab an. diff --git a/doc/de/makingnewfriends.md b/doc/de/Quick-Start-makingnewfriends.md similarity index 87% rename from doc/de/makingnewfriends.md rename to doc/de/Quick-Start-makingnewfriends.md index 911b7f4a89..24d9ee4186 100644 --- a/doc/de/makingnewfriends.md +++ b/doc/de/Quick-Start-makingnewfriends.md @@ -3,13 +3,13 @@ Neue Freunde finden * [Zur Startseite der Hilfe](help) -Hier siehst du die Kontaktvorschläge. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. +Hier siehst du die Kontaktvorschläge. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. Diese Seite ist ein wenig wie die Kontaktvorschläge in Facebook. Jeder auf dieser Liste hat zugestimmt, als Kontaktvorschlag zu erscheinen. Das bedeutet, das sie Anfragen meist nicht ablehnen, da sie neue Leute kennenlernen wollen. Siehst du jemanden, dessen Aussehen du magst? Klicke auf den "Verbinden"-Button beim Foto. Als nächstes kommst du zur Seite "Freundschafts-/Kontaktanfrage". Fülle das Formular wie vorgegeben aus und trage optional eine kleine Notiz ein. Nun musst du nur noch auf die Bestätigung warten. Beachte dabei, dass es sich um reale Personen handelt und es somit etwas dauern kann. Jetzt, nachdem du jemanden hinzugefügt hast, weißt du vielleicht nicht mehr, wie du zurückkommst. Klicke einfach auf den Link oben auf dieser Seite und du kommst zurück zur Seite mit den Kontaktvorschlägen, um weitere Personen hinzuzufügen. -Du willst nicht einfach Personen hinzufügen, die du nicht kennst? Kein Problem - an dieser Stelle kommen wir zu den Gruppen und Seiten. +Du willst nicht einfach Personen hinzufügen, die du nicht kennst? Kein Problem - an dieser Stelle kommen wir zu den Gruppen und Seiten. diff --git a/doc/de/network.md b/doc/de/Quick-Start-network.md similarity index 81% rename from doc/de/network.md rename to doc/de/Quick-Start-network.md index 37eeec869d..6132cd57fc 100644 --- a/doc/de/network.md +++ b/doc/de/Quick-Start-network.md @@ -3,11 +3,11 @@ Deine "Netzwerk"-Seite * [Zur Startseite der Hilfe](help) -Das ist dein "Netzwerk"-Tab. Wenn du dich mal verirrt hast, kannst du diesen Link klicken, um wieder hierher zu kommen. +Das ist dein "Netzwerk"-Tab. Wenn du dich mal verirrt hast, kannst du diesen Link klicken, um wieder hierher zu kommen. Diese Seite ist ein wenig wie die News-Seite in Facebook oder der Stream in Diaspora. Hier findest du alle Beiträge deiner Kontakte, Gruppen und Feeds, die du eingetragen hast. Wenn du neu bist, siehst du hier noch nichts, falls du deinen Status im letzten Schritt noch nicht eingetragen hast. Wenn du bereits ein paar Freunde eingetragen hast, findest du hier ihre Beiträge. Hier kannst du Beiträge kommentieren, eintragen, dass du den Beitrag magst oder ablehnst oder die Profile durch einen Klick auf deren Namen anschauen und auf deren Seite ("Wall") Nachrichten schreiben. -Nun wollen wir diese Seite mit Inhalt füllen. Der erste Schritt ist es, Leute zu deinem Account hinzuzufügen. +Nun wollen wir diese Seite mit Inhalt füllen. Der erste Schritt ist es, Leute zu deinem Account hinzuzufügen. From e441f3286ca7d0e2b0ddc154f5ecf5deae61f597 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 21 Dec 2012 13:09:33 +0100 Subject: [PATCH 05/40] DE: update to the strings --- view/de/messages.po | 28 ++++++++++++++-------------- view/de/strings.php | 7 ++----- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index fddccca05b..a1ba4ac6de 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-12-16 10:00-0800\n" -"PO-Revision-Date: 2012-12-17 09:03+0000\n" +"POT-Creation-Date: 2012-12-18 10:00-0800\n" +"PO-Revision-Date: 2012-12-21 12:00+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -455,7 +455,7 @@ msgstr "Fotoalben" #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 #: ../../mod/photos.php:1092 ../../mod/photos.php:1107 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 -#: ../../addon/communityhome/communityhome.php:110 +#: ../../addon/communityhome/communityhome.php:111 #: ../../view/theme/diabook/theme.php:492 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" @@ -478,7 +478,7 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../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 -#: ../../addon/communityhome/communityhome.php:111 +#: ../../addon/communityhome/communityhome.php:112 #: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 @@ -1572,7 +1572,7 @@ msgstr "Wall-to-Wall" msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -3257,7 +3257,7 @@ msgid "People Search" msgstr "Personensuche" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:163 +#: ../../addon/communityhome/communityhome.php:164 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442 #: ../../include/diaspora.php:1848 ../../include/conversation.php:125 #: ../../include/conversation.php:253 @@ -3267,8 +3267,8 @@ msgstr "Foto" #: ../../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 +#: ../../addon/communityhome/communityhome.php:159 +#: ../../addon/communityhome/communityhome.php:168 #: ../../view/theme/diabook/theme.php:459 #: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 @@ -3280,7 +3280,7 @@ msgid "status" msgstr "Status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 -#: ../../addon/communityhome/communityhome.php:172 +#: ../../addon/communityhome/communityhome.php:173 #: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 @@ -5288,7 +5288,7 @@ msgstr "Unterdrücke \"Auf Friendica Ansehen\"" #: ../../addon/fbpost/fbpost.php:245 msgid "Post to page/group:" -msgstr "" +msgstr "Auf FB Seite/Gruppe veröffentlichen" #: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240 msgid "Facebook Post Settings" @@ -5680,12 +5680,12 @@ msgstr "Aktivste Nutzer" msgid "Latest photos" msgstr "Neueste Fotos" -#: ../../addon/communityhome/communityhome.php:133 +#: ../../addon/communityhome/communityhome.php:134 #: ../../addon.old/communityhome/communityhome.php:133 msgid "Latest likes" msgstr "Neueste Favoriten" -#: ../../addon/communityhome/communityhome.php:155 +#: ../../addon/communityhome/communityhome.php:156 #: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 @@ -8533,11 +8533,11 @@ msgstr "Anhänge:" msgid "view full size" msgstr "Volle Größe anzeigen" -#: ../../include/oembed.php:137 +#: ../../include/oembed.php:138 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:146 +#: ../../include/oembed.php:147 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" diff --git a/view/de/strings.php b/view/de/strings.php index 297e7fac3c..adc1300d15 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1024,7 +1024,6 @@ $a->strings["Delegate Page Management"] = "Delegiere das Management für die Sei $a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"; $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager"; $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; -$a->strings["Delegations"] = "Bevollmächtigungen"; $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; $a->strings["Add"] = "Hinzufügen"; $a->strings["No entries."] = "Keine Einträge"; @@ -1147,7 +1146,7 @@ $a->strings["Facebook Post"] = "Facebook Relai"; $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren."; $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen"; $a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\""; -$a->strings["Post to page/group:"] = ""; +$a->strings["Post to page/group:"] = "Auf FB Seite/Gruppe veröffentlichen"; $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", @@ -2077,7 +2076,7 @@ $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; $a->strings["[No description]"] = "[keine Beschreibung]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche:"; +$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; @@ -2098,7 +2097,5 @@ $a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträ $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert."; $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden"; $a->strings["URL to embed:"] = "URL zum Einbetten:"; -$a->strings['%s wrote the following post:'] = - '%s hat diesen Beitrag ursprünglich gepostet:'; $a->strings["Tumblr login"] = "Tumblr Login"; $a->strings["Tumblr password"] = "Tumblr Passwort"; From 5cedd3430f898df6219d3c029a2a5bc1a25bfa40 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 21 Dec 2012 13:10:03 +0100 Subject: [PATCH 06/40] CS: update to the strings --- view/cs/messages.po | 2336 ++++++++++++++++++++++++------------------- view/cs/strings.php | 81 +- 2 files changed, 1378 insertions(+), 1039 deletions(-) diff --git a/view/cs/messages.po b/view/cs/messages.po index cf9b1d6769..727246eff8 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-11-08 10:00-0800\n" -"PO-Revision-Date: 2012-11-10 18:38+0000\n" +"POT-Creation-Date: 2012-12-18 10:00-0800\n" +"PO-Revision-Date: 2012-12-20 18:23+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" @@ -38,11 +38,11 @@ msgstr "Aktualizace kontaktu selhala." #: ../../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:132 ../../mod/photos.php:994 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../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 -#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 +#: ../../mod/settings.php:91 ../../mod/settings.php:541 +#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -51,17 +51,18 @@ msgstr "Aktualizace kontaktu selhala." #: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 -#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 -#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 +#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 #: ../../mod/display.php:165 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:424 ../../mod/delegate.php:6 +#: ../../mod/profiles.php:431 ../../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 -#: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 -#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 +#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166 +#: ../../addon/fbpost/fbpost.php:172 +#: ../../addon/dav/friendica/layout.fnk.php:354 +#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977 +#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/dav/friendica/layout.fnk.php:354 @@ -93,8 +94,8 @@ msgstr "Prosím použijte ihned v prohlížeči tlačítko \"zp msgid "Return to contact editor" msgstr "Návrat k editoru kontaktu" -#: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/crepair.php:148 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705 msgid "Name" msgstr "Jméno" @@ -131,22 +132,22 @@ msgid "New photo from this URL" msgstr "Nové foto z této URL adresy" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1027 -#: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:351 -#: ../../mod/settings.php:543 ../../mod/settings.php:697 -#: ../../mod/settings.php:769 ../../mod/settings.php:976 -#: ../../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:594 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/settings.php:559 ../../mod/settings.php:669 +#: ../../mod/settings.php:738 ../../mod/settings.php:810 +#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445 +#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028 +#: ../../mod/admin.php:1115 ../../mod/profiles.php:604 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 -#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 +#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -155,16 +156,17 @@ msgstr "Nové foto z této URL adresy" #: ../../addon/remote_permissions/remote_permissions.php:195 #: ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 -#: ../../addon/forumlist/forumlist.php:175 +#: ../../addon/forumlist/forumlist.php:178 #: ../../addon/impressum/impressum.php:83 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/group_text/group_text.php:84 #: ../../addon/libravatar/libravatar.php:99 -#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87 -#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 -#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 +#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91 +#: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 +#: ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:307 #: ../../addon/statusnet/statusnet.php:278 @@ -172,18 +174,18 @@ msgstr "Nové foto z této URL adresy" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -232,20 +234,20 @@ msgstr "Nové foto z této URL adresy" msgid "Submit" msgstr "Odeslat" -#: ../../mod/help.php:30 +#: ../../mod/help.php:79 msgid "Help:" msgstr "Nápověda:" -#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225 msgid "Help" msgstr "Nápověda" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:90 ../../index.php:218 msgid "Not Found" msgstr "Nenalezen" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:93 ../../index.php:221 msgid "Page not found." msgstr "Stránka nenalezena" @@ -283,12 +285,12 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editovat událost" -#: ../../mod/events.php:323 ../../include/text.php:1185 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "odkaz na zdroj" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1711 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "Události" @@ -345,8 +347,9 @@ msgid "Description:" msgstr "Popis:" #: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1241 +#: ../../boot.php:1278 msgid "Location:" msgstr "Místo:" @@ -358,10 +361,10 @@ msgstr "Název:" msgid "Share this event" msgstr "Sdílet tuto událost" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 -#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1001 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 +#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Zrušit" @@ -408,117 +411,118 @@ msgid "" msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../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:574 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/profiles.php:584 msgid "Yes" msgstr "Ano" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:238 -#: ../../mod/profiles.php:575 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/profiles.php:585 msgid "No" msgstr "Ne" -#: ../../mod/photos.php:50 ../../boot.php:1704 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "Fotoalba" -#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 -#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 -#: ../../mod/photos.php:1565 ../../mod/photos.php:1577 -#: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 +#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 +#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 +#: ../../addon/communityhome/communityhome.php:111 +#: ../../view/theme/diabook/theme.php:492 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Fotogalerie kontaktu" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615 +#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 msgid "Upload New Photos" msgstr "Nahrát nové fotografie" -#: ../../mod/photos.php:78 ../../mod/settings.php:23 +#: ../../mod/photos.php:79 ../../mod/settings.php:23 msgid "everybody" msgstr "Žádost o připojení selhala nebo byla zrušena." -#: ../../mod/photos.php:142 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "Kontakt byl zablokován" -#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095 -#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1107 ../../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 -#: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 +#: ../../addon/communityhome/communityhome.php:112 +#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" msgstr "Profilové fotografie" -#: ../../mod/photos.php:163 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "Album nenalezeno." -#: ../../mod/photos.php:181 ../../mod/photos.php:1104 +#: ../../mod/photos.php:182 ../../mod/photos.php:1101 msgid "Delete Album" msgstr "Smazat album" -#: ../../mod/photos.php:244 ../../mod/photos.php:1367 +#: ../../mod/photos.php:245 ../../mod/photos.php:1364 msgid "Delete Photo" msgstr "Smazat fotografii" -#: ../../mod/photos.php:606 +#: ../../mod/photos.php:607 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s byl označen v %2$s uživatelem %3$s" -#: ../../mod/photos.php:606 +#: ../../mod/photos.php:607 msgid "a photo" msgstr "fotografie" -#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Velikost obrázku překračuje limit velikosti" -#: ../../mod/photos.php:719 +#: ../../mod/photos.php:720 msgid "Image file is empty." msgstr "Soubor obrázku je prázdný." -#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153 -#: ../../mod/wall_upload.php:110 +#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153 +#: ../../mod/wall_upload.php:112 msgid "Unable to process image." msgstr "Obrázek není možné zprocesovat" -#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301 -#: ../../mod/wall_upload.php:136 +#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301 +#: ../../mod/wall_upload.php:138 msgid "Image upload failed." msgstr "Nahrání obrázku selhalo." -#: ../../mod/photos.php:864 ../../mod/community.php:18 +#: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 +#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 +#: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "Veřejný přístup odepřen." -#: ../../mod/photos.php:874 +#: ../../mod/photos.php:875 msgid "No photos selected" msgstr "Není vybrána žádná fotografie" -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:976 msgid "Access to this item is restricted." msgstr "Přístup k této položce je omezen." @@ -527,162 +531,157 @@ msgstr "Přístup k této položce je omezen." msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií." -#: ../../mod/photos.php:1040 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Použil jste %1$.2f Mbytes kapacity úložiště fotografií." - -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:1043 msgid "Upload Photos" msgstr "Nahrání fotografií " -#: ../../mod/photos.php:1050 ../../mod/photos.php:1099 +#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 msgid "New album name: " msgstr "Název nového alba: " -#: ../../mod/photos.php:1051 +#: ../../mod/photos.php:1048 msgid "or existing album name: " msgstr "nebo stávající název alba: " -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1049 msgid "Do not show a status post for this upload" msgstr "Nezobrazovat stav pro tento upload" -#: ../../mod/photos.php:1054 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 msgid "Permissions" msgstr "Oprávnění:" -#: ../../mod/photos.php:1114 +#: ../../mod/photos.php:1111 msgid "Edit Album" msgstr "Edituj album" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1117 msgid "Show Newest First" msgstr "Zobrazit nejprve nejnovější:" -#: ../../mod/photos.php:1122 +#: ../../mod/photos.php:1119 msgid "Show Oldest First" msgstr "Zobrazit nejprve nejstarší:" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1598 +#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 msgid "View Photo" msgstr "Zobraz fotografii" -#: ../../mod/photos.php:1181 +#: ../../mod/photos.php:1178 msgid "Permission denied. Access to this item may be restricted." msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen." -#: ../../mod/photos.php:1183 +#: ../../mod/photos.php:1180 msgid "Photo not available" msgstr "Fotografie není k dispozici" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "View photo" msgstr "Zobrazit obrázek" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "Edit photo" msgstr "Editovat fotografii" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1237 msgid "Use as profile photo" msgstr "Použít jako profilovou fotografii" -#: ../../mod/photos.php:1246 ../../mod/content.php:603 -#: ../../object/Item.php:103 +#: ../../mod/photos.php:1243 ../../mod/content.php:603 +#: ../../object/Item.php:105 msgid "Private Message" msgstr "Soukromá zpráva" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1262 msgid "View Full Size" msgstr "Zobrazit v plné velikosti" -#: ../../mod/photos.php:1339 +#: ../../mod/photos.php:1336 msgid "Tags: " msgstr "Štítky: " -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1339 msgid "[Remove any tag]" msgstr "[Odstranit všechny štítky]" -#: ../../mod/photos.php:1352 +#: ../../mod/photos.php:1349 msgid "Rotate CW (right)" msgstr "Rotovat po směru hodinových ručiček (doprava)" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1350 msgid "Rotate CCW (left)" msgstr "Rotovat proti směru hodinových ručiček (doleva)" -#: ../../mod/photos.php:1355 +#: ../../mod/photos.php:1352 msgid "New album name" msgstr "Nové jméno alba" -#: ../../mod/photos.php:1358 +#: ../../mod/photos.php:1355 msgid "Caption" msgstr "Titulek" -#: ../../mod/photos.php:1360 +#: ../../mod/photos.php:1357 msgid "Add a Tag" msgstr "Přidat štítek" -#: ../../mod/photos.php:1364 +#: ../../mod/photos.php:1361 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1384 ../../mod/content.php:667 -#: ../../object/Item.php:196 +#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../object/Item.php:203 msgid "I like this (toggle)" msgstr "Líbí se mi to (přepínač)" -#: ../../mod/photos.php:1385 ../../mod/content.php:668 -#: ../../object/Item.php:197 +#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../object/Item.php:204 msgid "I don't like this (toggle)" msgstr "Nelíbí se mi to (přepínač)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:962 +#: ../../mod/photos.php:1383 ../../include/conversation.php:969 msgid "Share" msgstr "Sdílet" -#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:846 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:981 ../../object/Item.php:258 +#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 +#: ../../mod/content.php:482 ../../mod/content.php:848 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:488 ../../include/conversation.php:624 +#: ../../include/conversation.php:988 ../../object/Item.php:270 msgid "Please wait" msgstr "Čekejte prosím" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 -#: ../../mod/photos.php:1519 ../../mod/content.php:690 -#: ../../object/Item.php:556 +#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1516 ../../mod/content.php:690 +#: ../../object/Item.php:574 msgid "This is you" msgstr "Nastavte Vaši polohu" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589 -#: ../../object/Item.php:558 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:267 ../../object/Item.php:576 msgid "Comment" msgstr "Okomentovat" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 -#: ../../mod/photos.php:1523 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:999 -#: ../../object/Item.php:568 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:586 msgid "Preview" msgstr "Náhled" -#: ../../mod/photos.php:1491 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:606 -#: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:569 ../../object/Item.php:117 +#: ../../mod/photos.php:1488 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:622 +#: ../../mod/group.php:168 ../../mod/admin.php:699 +#: ../../include/conversation.php:569 ../../object/Item.php:119 msgid "Delete" msgstr "Odstranit" -#: ../../mod/photos.php:1604 +#: ../../mod/photos.php:1601 msgid "View Album" msgstr "Zobrazit album" -#: ../../mod/photos.php:1613 +#: ../../mod/photos.php:1610 msgid "Recent Photos" msgstr "Aktuální fotografie" @@ -690,13 +689,13 @@ msgstr "Aktuální fotografie" msgid "Not available." msgstr "Není k dispozici." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 #: ../../include/nav.php:101 msgid "Community" msgstr "Komunita" #: ../../mod/community.php:61 ../../mod/community.php:86 -#: ../../mod/search.php:159 ../../mod/search.php:185 +#: ../../mod/search.php:162 ../../mod/search.php:188 msgid "No results." msgstr "Žádné výsledky." @@ -736,100 +735,100 @@ msgstr "Nejsou žádné nainstalované doplňky/aplikace" msgid "Item not found" msgstr "Položka nenalezena" -#: ../../mod/editpost.php:36 +#: ../../mod/editpost.php:39 msgid "Edit post" msgstr "Upravit příspěvek" -#: ../../mod/editpost.php:88 ../../include/conversation.php:948 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "Poslat příspěvek na e-mail" -#: ../../mod/editpost.php:103 ../../mod/content.php:711 -#: ../../mod/settings.php:605 ../../object/Item.php:107 +#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/settings.php:621 ../../object/Item.php:109 msgid "Edit" msgstr "Upravit" -#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:963 +#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:298 ../../mod/message.php:485 +#: ../../include/conversation.php:970 msgid "Upload photo" msgstr "Nahrát fotografii" -#: ../../mod/editpost.php:105 ../../include/conversation.php:964 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "nahrát fotky" -#: ../../mod/editpost.php:106 ../../include/conversation.php:965 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "Přiložit soubor" -#: ../../mod/editpost.php:107 ../../include/conversation.php:966 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "attach file" msgstr "přidat soubor" -#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:967 +#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:299 ../../mod/message.php:486 +#: ../../include/conversation.php:974 msgid "Insert web link" msgstr "Vložit webový odkaz" -#: ../../mod/editpost.php:109 ../../include/conversation.php:968 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "webový odkaz" -#: ../../mod/editpost.php:110 ../../include/conversation.php:969 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "Zadejte odkaz na video" -#: ../../mod/editpost.php:111 ../../include/conversation.php:970 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "odkaz na video" -#: ../../mod/editpost.php:112 ../../include/conversation.php:971 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "Zadejte odkaz na zvukový záznam" -#: ../../mod/editpost.php:113 ../../include/conversation.php:972 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "odkaz na audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:973 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "Nastavte vaši polohu" -#: ../../mod/editpost.php:115 ../../include/conversation.php:974 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "nastavit místo" -#: ../../mod/editpost.php:116 ../../include/conversation.php:975 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "Odstranit adresu v prohlížeči" -#: ../../mod/editpost.php:117 ../../include/conversation.php:976 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "vymazat místo" -#: ../../mod/editpost.php:119 ../../include/conversation.php:982 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "Nastavení oprávnění" -#: ../../mod/editpost.php:127 ../../include/conversation.php:991 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "skrytá kopie: e-mailové adresy" -#: ../../mod/editpost.php:128 ../../include/conversation.php:992 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "Veřejný příspěvek" -#: ../../mod/editpost.php:131 ../../include/conversation.php:978 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "Nastavit titulek" -#: ../../mod/editpost.php:133 ../../include/conversation.php:980 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "Kategorie (čárkou oddělený seznam)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:994 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "Příklad: bob@example.com, mary@example.com" @@ -915,7 +914,7 @@ msgstr "Neplatné URL profilu." msgid "Disallowed profile URL." msgstr "Nepovolené URL profilu." -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "Nepodařilo se aktualizovat kontakt." @@ -951,7 +950,7 @@ msgstr "Prosím potvrďte Vaši žádost o propojení %s." msgid "Confirm" msgstr "Potvrdit" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "[Jméno odepřeno]" @@ -1003,7 +1002,7 @@ msgstr "Friendica" msgid "StatusNet/Federated Social Web" msgstr "StatusNet / Federativní Sociální Web" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -1023,59 +1022,59 @@ msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"re msgid "Submit Request" msgstr "Odeslat žádost" -#: ../../mod/uexport.php:10 ../../mod/settings.php:30 -#: ../../include/nav.php:137 +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 msgid "Account settings" msgstr "Nastavení účtu" -#: ../../mod/uexport.php:15 ../../mod/settings.php:35 +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 msgid "Display settings" msgstr "Nastavení zobrazení" -#: ../../mod/uexport.php:21 ../../mod/settings.php:41 +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 msgid "Connector settings" msgstr "Nastavení konektoru" -#: ../../mod/uexport.php:26 ../../mod/settings.php:46 +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 msgid "Plugin settings" msgstr "Nastavení pluginu" -#: ../../mod/uexport.php:31 ../../mod/settings.php:51 +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 msgid "Connected apps" msgstr "Propojené aplikace" -#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56 +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 msgid "Export personal data" msgstr "Export osobních údajů" -#: ../../mod/uexport.php:41 ../../mod/settings.php:61 +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 msgid "Remove account" msgstr "Odstranit účet" -#: ../../mod/uexport.php:49 ../../mod/settings.php:69 -#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../mod/uexport.php:48 ../../mod/settings.php:74 +#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138 +#: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Nastavení" -#: ../../mod/uexport.php:73 +#: ../../mod/uexport.php:72 msgid "Export account" msgstr "Exportovat účet" -#: ../../mod/uexport.php:73 +#: ../../mod/uexport.php:72 msgid "" "Export your account info and contacts. Use this to make a backup of your " "account and/or to move it to another server." msgstr "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření zálohy svého účtu a/nebo k přesunu na jiný server." -#: ../../mod/uexport.php:74 +#: ../../mod/uexport.php:73 msgid "Export all" msgstr "Exportovat vše" -#: ../../mod/uexport.php:74 +#: ../../mod/uexport.php:73 msgid "" "Export your accout info, contacts and all your items as json. Could be a " "very big file, and could take a lot of time. Use this to make a full backup " @@ -1403,7 +1402,7 @@ msgid "is interested in:" msgstr "zajímá se o:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1179 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "Spojit" @@ -1420,32 +1419,32 @@ msgstr "Vzdálené soukromé informace nejsou k dispozici." msgid "Visible to:" msgstr "Viditelné pro:" -#: ../../mod/content.php:119 ../../mod/network.php:544 +#: ../../mod/content.php:119 ../../mod/network.php:594 msgid "No such group" msgstr "Žádná taková skupina" -#: ../../mod/content.php:130 ../../mod/network.php:555 +#: ../../mod/content.php:130 ../../mod/network.php:605 msgid "Group is empty" msgstr "Skupina je prázdná" -#: ../../mod/content.php:134 ../../mod/network.php:559 +#: ../../mod/content.php:134 ../../mod/network.php:609 msgid "Group: " msgstr "Skupina: " #: ../../mod/content.php:438 ../../mod/content.php:723 -#: ../../include/conversation.php:568 ../../object/Item.php:116 +#: ../../include/conversation.php:568 ../../object/Item.php:118 msgid "Select" msgstr "Vybrat" -#: ../../mod/content.php:455 ../../mod/content.php:816 -#: ../../mod/content.php:817 ../../include/conversation.php:587 -#: ../../object/Item.php:227 ../../object/Item.php:228 +#: ../../mod/content.php:455 ../../mod/content.php:817 +#: ../../mod/content.php:818 ../../include/conversation.php:587 +#: ../../object/Item.php:235 ../../object/Item.php:236 #, php-format msgid "View %s's profile @ %s" msgstr "Zobrazit profil uživatele %s na %s" -#: ../../mod/content.php:465 ../../mod/content.php:828 -#: ../../include/conversation.php:607 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:829 +#: ../../include/conversation.php:607 ../../object/Item.php:249 #, php-format msgid "%s from %s" msgstr "%s od %s" @@ -1454,7 +1453,7 @@ msgstr "%s od %s" msgid "View in context" msgstr "Pohled v kontextu" -#: ../../mod/content.php:586 ../../object/Item.php:277 +#: ../../mod/content.php:586 ../../object/Item.php:289 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1462,8 +1461,8 @@ msgstr[0] "%d komentář" msgstr[1] "%d komentářů" msgstr[2] "%d komentářů" -#: ../../mod/content.php:588 ../../include/text.php:1441 -#: ../../object/Item.php:279 ../../object/Item.php:292 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:291 ../../object/Item.php:304 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1472,97 +1471,97 @@ msgstr[2] "komentář" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:590 -#: ../../object/Item.php:280 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../object/Item.php:292 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "zobrazit více" -#: ../../mod/content.php:667 ../../object/Item.php:196 +#: ../../mod/content.php:667 ../../object/Item.php:203 msgid "like" msgstr "má rád" -#: ../../mod/content.php:668 ../../object/Item.php:197 +#: ../../mod/content.php:668 ../../object/Item.php:204 msgid "dislike" msgstr "nemá rád" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:206 msgid "Share this" msgstr "Sdílet toto" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:206 msgid "share" msgstr "sdílí" -#: ../../mod/content.php:694 ../../object/Item.php:560 +#: ../../mod/content.php:694 ../../object/Item.php:578 msgid "Bold" msgstr "Tučné" -#: ../../mod/content.php:695 ../../object/Item.php:561 +#: ../../mod/content.php:695 ../../object/Item.php:579 msgid "Italic" msgstr "Kurzíva" -#: ../../mod/content.php:696 ../../object/Item.php:562 +#: ../../mod/content.php:696 ../../object/Item.php:580 msgid "Underline" msgstr "Podrtžené" -#: ../../mod/content.php:697 ../../object/Item.php:563 +#: ../../mod/content.php:697 ../../object/Item.php:581 msgid "Quote" msgstr "Citovat" -#: ../../mod/content.php:698 ../../object/Item.php:564 +#: ../../mod/content.php:698 ../../object/Item.php:582 msgid "Code" msgstr "Kód" -#: ../../mod/content.php:699 ../../object/Item.php:565 +#: ../../mod/content.php:699 ../../object/Item.php:583 msgid "Image" msgstr "Obrázek" -#: ../../mod/content.php:700 ../../object/Item.php:566 +#: ../../mod/content.php:700 ../../object/Item.php:584 msgid "Link" msgstr "Odkaz" -#: ../../mod/content.php:701 ../../object/Item.php:567 +#: ../../mod/content.php:701 ../../object/Item.php:585 msgid "Video" msgstr "Video" -#: ../../mod/content.php:736 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:182 msgid "add star" msgstr "přidat hvězdu" -#: ../../mod/content.php:737 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:183 msgid "remove star" msgstr "odebrat hvězdu" -#: ../../mod/content.php:738 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:184 msgid "toggle star status" msgstr "přepnout hvězdu" -#: ../../mod/content.php:741 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:187 msgid "starred" msgstr "označeno hvězdou" -#: ../../mod/content.php:742 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:192 msgid "add tag" msgstr "přidat štítek" -#: ../../mod/content.php:746 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:122 msgid "save to folder" msgstr "uložit do složky" -#: ../../mod/content.php:818 ../../object/Item.php:229 +#: ../../mod/content.php:819 ../../object/Item.php:237 msgid "to" msgstr "pro" -#: ../../mod/content.php:819 ../../object/Item.php:230 +#: ../../mod/content.php:820 ../../object/Item.php:239 msgid "Wall-to-Wall" msgstr "Zeď-na-Zeď" -#: ../../mod/content.php:820 ../../object/Item.php:231 +#: ../../mod/content.php:821 ../../object/Item.php:240 msgid "via Wall-To-Wall:" msgstr "přes Zeď-na-Zeď " -#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1578,8 +1577,8 @@ msgid "Discard" msgstr "Odstranit" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 -#: ../../mod/contacts.php:378 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "Ignorovat" @@ -1591,21 +1590,21 @@ msgstr "Systém" msgid "Network" msgstr "Síť" -#: ../../mod/notifications.php:88 ../../mod/network.php:407 +#: ../../mod/notifications.php:88 ../../mod/network.php:444 msgid "Personal" msgstr "Osobní" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 -#: ../../include/nav.php:77 ../../include/nav.php:115 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "Domů" -#: ../../mod/notifications.php:98 ../../include/nav.php:121 +#: ../../mod/notifications.php:98 ../../include/nav.php:122 msgid "Introductions" msgstr "Představení" -#: ../../mod/notifications.php:103 ../../mod/message.php:176 -#: ../../include/nav.php:128 +#: ../../mod/notifications.php:103 ../../mod/message.php:180 +#: ../../include/nav.php:129 msgid "Messages" msgstr "Zprávy" @@ -1631,7 +1630,7 @@ msgid "suggested by %s" msgstr "navrhl %s" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "Skrýt tento kontakt před ostatními" @@ -1644,7 +1643,7 @@ msgid "if applicable" msgstr "je-li použitelné" #: ../../mod/notifications.php:160 ../../mod/notifications.php:207 -#: ../../mod/admin.php:694 +#: ../../mod/admin.php:697 msgid "Approve" msgstr "Schválit" @@ -1688,7 +1687,7 @@ msgstr "Nový následovník" msgid "No introductions." msgstr "Žádné představení." -#: ../../mod/notifications.php:219 ../../include/nav.php:122 +#: ../../mod/notifications.php:219 ../../include/nav.php:123 msgid "Notifications" msgstr "Upozornění" @@ -1753,87 +1752,87 @@ msgstr "Žádné další domácí upozornění." msgid "Home Notifications" msgstr "Domácí upozornění" -#: ../../mod/contacts.php:84 ../../mod/contacts.php:164 +#: ../../mod/contacts.php:85 ../../mod/contacts.php:165 msgid "Could not access contact record." msgstr "Nelze získat přístup k záznamu kontaktu." -#: ../../mod/contacts.php:98 +#: ../../mod/contacts.php:99 msgid "Could not locate selected profile." msgstr "Nelze nalézt vybraný profil." -#: ../../mod/contacts.php:121 +#: ../../mod/contacts.php:122 msgid "Contact updated." msgstr "Kontakt aktualizován." -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been blocked" msgstr "Kontakt byl zablokován" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been unblocked" msgstr "Kontakt byl odblokován" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been ignored" msgstr "Kontakt bude ignorován" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been unignored" msgstr "Kontakt přestal být ignorován" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "Kontakt byl archivován" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "Kontakt byl vrácen z archívu." -#: ../../mod/contacts.php:232 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "Kontakt byl odstraněn." -#: ../../mod/contacts.php:266 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "Jste vzájemní přátelé s uživatelem %s" -#: ../../mod/contacts.php:270 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "Sdílíte s uživatelem %s" -#: ../../mod/contacts.php:275 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "uživatel %s sdílí s vámi" -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "Soukromá komunikace není dostupná pro tento kontakt." -#: ../../mod/contacts.php:295 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "Nikdy" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "(Aktualizace byla úspěšná)" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "(Aktualizace nebyla úspěšná)" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "Navrhněte přátelé" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "Typ sítě: %s" -#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" @@ -1841,220 +1840,222 @@ msgstr[0] "%d sdílený kontakt" msgstr[1] "%d sdílených kontaktů" msgstr[2] "%d sdílených kontaktů" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "Zobrazit všechny kontakty" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 -#: ../../mod/admin.php:698 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:701 msgid "Unblock" msgstr "Odblokovat" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 -#: ../../mod/admin.php:697 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:700 msgid "Block" msgstr "Blokovat" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "Přepnout stav Blokováno" -#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "Přestat ignorovat" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "Přepnout stav Ignorováno" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "Vrátit z archívu" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "Archivovat" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "Přepnout stav Archivováno" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "Opravit" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "Pokročilé nastavení kontaktu" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "Komunikace s tímto kontaktem byla ztracena!" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "Editor kontaktu" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "Viditelnost profilu" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu." -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "Kontaktní informace / poznámky" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "Editovat poznámky kontaktu" -#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Navštivte profil uživatele %s [%s]" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "Blokovat / Odblokovat kontakt" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "Ignorovat kontakt" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "Opravit nastavení adresy URL " -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "Zobrazit konverzace" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "Odstranit kontakt" -#: ../../mod/contacts.php:370 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "Poslední aktualizace:" -#: ../../mod/contacts.php:372 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "Aktualizovat veřejné příspěvky" -#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1173 msgid "Update now" msgstr "Aktualizovat" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "V současnosti zablokováno" -#: ../../mod/contacts.php:382 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "V současnosti ignorováno" -#: ../../mod/contacts.php:383 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "Aktuálně archivován" -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Odpovědi/Libí se na Vaše veřejné příspěvky mohou být stále viditelné" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "Doporučení" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "Navrhnout potenciální přátele" -#: ../../mod/contacts.php:443 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "Všechny kontakty" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "Zobrazit všechny kontakty" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "Odblokován" -#: ../../mod/contacts.php:452 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "Zobrazit pouze neblokované kontakty" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "Blokován" -#: ../../mod/contacts.php:459 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "Zobrazit pouze blokované kontakty" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "Ignorován" -#: ../../mod/contacts.php:466 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "Zobrazit pouze ignorované kontakty" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "Archivován" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "Zobrazit pouze archivované kontakty" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "Skrytý" -#: ../../mod/contacts.php:480 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "Zobrazit pouze skryté kontakty" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "Vzájemné přátelství" -#: ../../mod/contacts.php:532 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "je Váš fanoušek" -#: ../../mod/contacts.php:536 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "jste fanouškem" -#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Editovat kontakt" -#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "Kontakty" -#: ../../mod/contacts.php:578 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "Prohledat Vaše kontakty" -#: ../../mod/contacts.php:579 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 +#: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "Zjištění: " -#: ../../mod/contacts.php:580 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 +#: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Najít" @@ -2076,10 +2077,10 @@ msgstr "Na %s bylo zažádáno o resetování hesla" #: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 +#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 -#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2093,7 +2094,7 @@ msgid "" "Password reset failed." msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo." -#: ../../mod/lostpass.php:83 ../../boot.php:940 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "Obnovení hesla" @@ -2137,69 +2138,77 @@ msgstr "Přezdívka nebo e-mail: " msgid "Reset" msgstr "Reset" -#: ../../mod/settings.php:113 +#: ../../mod/settings.php:35 +msgid "Additional features" +msgstr "Další funkčnosti" + +#: ../../mod/settings.php:118 msgid "Missing some important data!" msgstr "Chybí některé důležité údaje!" -#: ../../mod/settings.php:116 ../../mod/settings.php:569 +#: ../../mod/settings.php:121 ../../mod/settings.php:585 msgid "Update" msgstr "Aktualizace" -#: ../../mod/settings.php:221 +#: ../../mod/settings.php:226 msgid "Failed to connect with email account using the settings provided." msgstr "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení." -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:231 msgid "Email settings updated." msgstr "Nastavení e-mailu aktualizována." -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:246 +msgid "Features updated" +msgstr "Aktualizované funkčnosti" + +#: ../../mod/settings.php:306 msgid "Passwords do not match. Password unchanged." msgstr "Hesla se neshodují. Heslo nebylo změněno." -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:311 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno." -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:322 msgid "Password changed." msgstr "Heslo bylo změněno." -#: ../../mod/settings.php:308 +#: ../../mod/settings.php:324 msgid "Password update failed. Please try again." msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu." -#: ../../mod/settings.php:373 +#: ../../mod/settings.php:389 msgid " Please use a shorter name." msgstr "Prosím použijte kratší jméno." -#: ../../mod/settings.php:375 +#: ../../mod/settings.php:391 msgid " Name too short." msgstr "Jméno je příliš krátké." -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:397 msgid " Not valid email." msgstr "Neplatný e-mail." -#: ../../mod/settings.php:383 +#: ../../mod/settings.php:399 msgid " Cannot change to that email." msgstr "Nelze provést změnu na tento e-mail." -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:453 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "Soukromé fórum nemá nastaveno zabezpečení. Používá se defaultní soukromá skupina." -#: ../../mod/settings.php:441 +#: ../../mod/settings.php:457 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní soukromou skupinu." -#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 -#: ../../addon/fbpost/fbpost.php:144 +#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 +#: ../../addon/fbpost/fbpost.php:151 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2209,443 +2218,456 @@ msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní msgid "Settings updated." msgstr "Nastavení aktualizováno." -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 +#: ../../mod/settings.php:620 msgid "Add application" msgstr "Přidat aplikaci" -#: ../../mod/settings.php:546 ../../mod/settings.php:572 -#: ../../addon/statusnet/statusnet.php:570 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../addon/statusnet/statusnet.php:694 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 -#: ../../addon/statusnet/statusnet.php:569 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../addon/statusnet/statusnet.php:693 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 msgid "Redirect" msgstr "Přesměrování" -#: ../../mod/settings.php:549 ../../mod/settings.php:575 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Icon url" msgstr "URL ikony" -#: ../../mod/settings.php:560 +#: ../../mod/settings.php:576 msgid "You can't edit this application." msgstr "Nemůžete editovat tuto aplikaci." -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:619 msgid "Connected Apps" msgstr "Připojené aplikace" -#: ../../mod/settings.php:607 +#: ../../mod/settings.php:623 msgid "Client key starts with" msgstr "Klienský klíč začíná" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:624 msgid "No name" msgstr "Bez názvu" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:625 msgid "Remove authorization" msgstr "Odstranit oprávnění" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:637 msgid "No Plugin settings configured" msgstr "Žádný doplněk není nastaven" -#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Nastavení doplňku" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:659 +msgid "Off" +msgstr "Vypnuto" + +#: ../../mod/settings.php:659 +msgid "On" +msgstr "Zapnuto" + +#: ../../mod/settings.php:667 +msgid "Additional Features" +msgstr "Další Funkčnosti" + +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Vestavěná podpora pro připojení s %s je %s" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "povoleno" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "zakázáno" -#: ../../mod/settings.php:641 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "Přístup k elektronické poště je na tomto serveru zakázán." -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:720 msgid "Connector Settings" msgstr "Nastavení konektoru" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:725 msgid "Email/Mailbox Setup" msgstr "Nastavení e-mailu" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:726 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce." -#: ../../mod/settings.php:686 +#: ../../mod/settings.php:727 msgid "Last successful email check:" msgstr "Poslední úspěšná kontrola e-mailu:" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:729 msgid "IMAP server name:" msgstr "jméno IMAP serveru:" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:730 msgid "IMAP port:" msgstr "IMAP port:" -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:731 msgid "Security:" msgstr "Zabezpečení:" -#: ../../mod/settings.php:690 ../../mod/settings.php:695 +#: ../../mod/settings.php:731 ../../mod/settings.php:736 +#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "Žádný" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:732 msgid "Email login name:" msgstr "přihlašovací jméno k e-mailu:" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:733 msgid "Email password:" msgstr "heslo k Vašemu e-mailu:" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:734 msgid "Reply-to address:" msgstr "Odpovědět na adresu:" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:735 msgid "Send public posts to all email contacts:" msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Action after import:" msgstr "Akce po importu:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Mark as seen" msgstr "Označit jako přečtené" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Move to folder" msgstr "Přesunout do složky" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:737 msgid "Move to folder:" msgstr "Přesunout do složky:" -#: ../../mod/settings.php:727 ../../mod/admin.php:402 +#: ../../mod/settings.php:768 ../../mod/admin.php:404 msgid "No special theme for mobile devices" msgstr "žádné speciální téma pro mobilní zařízení" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:808 msgid "Display Settings" msgstr "Nastavení Zobrazení" -#: ../../mod/settings.php:773 ../../mod/settings.php:784 +#: ../../mod/settings.php:814 ../../mod/settings.php:825 msgid "Display Theme:" msgstr "Vybrat grafickou šablonu:" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:815 msgid "Mobile Theme:" msgstr "Téma pro mobilní zařízení:" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Update browser every xx seconds" msgstr "Aktualizovat prohlížeč každých xx sekund" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimum 10 sekund, žádné maximum." -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Number of items to display per page:" msgstr "Počet položek zobrazených na stránce:" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Maximum of 100 items" msgstr "Maximum 100 položek" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:818 msgid "Don't show emoticons" msgstr "Nezobrazovat emotikony" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:894 msgid "Normal Account Page" msgstr "Normální stránka účtu" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:895 msgid "This account is a normal personal profile" msgstr "Tento účet je běžný osobní profil" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:898 msgid "Soapbox Page" msgstr "Stránka \"Soapbox\"" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:899 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Automaticky schválit všechna spojení / přátelství jako fanoušky s právem pouze ke čtení" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:902 msgid "Community Forum/Celebrity Account" msgstr "Komunitní fórum/ účet celebrity" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:903 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství, jako fanoušky s právem ke čtení." -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:906 msgid "Automatic Friend Page" msgstr "Automatická stránka přítele" -#: ../../mod/settings.php:866 +#: ../../mod/settings.php:907 msgid "Automatically approve all connection/friend requests as friends" msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství jako přátele" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:910 msgid "Private Forum [Experimental]" msgstr "Soukromé fórum [Experimentální]" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:911 msgid "Private forum - approved members only" msgstr "Soukromé fórum - pouze pro schválené členy" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu." -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:933 msgid "Publish your default profile in your local site directory?" msgstr "Publikovat Váš výchozí profil v místním adresáři webu?" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:939 msgid "Publish your default profile in the global social directory?" msgstr "Publikovat Váš výchozí profil v globální sociálním adresáři?" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:947 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Skrýt Vaše kontaktní údaje a seznam přátel před návštěvníky ve Vašem výchozím profilu?" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:951 msgid "Hide your profile details from unknown viewers?" msgstr "Skrýt Vaše profilové detaily před neznámými uživateli?" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:956 msgid "Allow friends to post to your profile page?" msgstr "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:962 msgid "Allow friends to tag your posts?" msgstr "Povolit přátelům označovat Vaše příspěvky?" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:968 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Chcete nám povolit abychom vás navrhovali jako přátelé pro nové členy?" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:974 msgid "Permit unknown people to send you private mail?" msgstr "Povolit neznámým lidem Vám zasílat soukromé zprávy?" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:982 msgid "Profile is not published." msgstr "Profil není zveřejněn." -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 msgid "or" msgstr "nebo" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:990 msgid "Your Identity Address is" msgstr "Vaše adresa identity je" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "Automatically expire posts after this many days:" msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:1002 msgid "Advanced expiration settings" msgstr "Pokročilé nastavení expirací" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:1003 msgid "Advanced Expiration" msgstr "Nastavení expirací" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1004 msgid "Expire posts:" msgstr "Expirovat příspěvky:" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1005 msgid "Expire personal notes:" msgstr "Expirovat osobní poznámky:" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1006 msgid "Expire starred posts:" msgstr "Expirovat příspěvky s hvězdou:" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:1007 msgid "Expire photos:" msgstr "Expirovat fotografie:" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1008 msgid "Only expire posts by others:" msgstr "Přízpěvky expirovat pouze ostatními:" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:1015 msgid "Account Settings" msgstr "Nastavení účtu" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1023 msgid "Password Settings" msgstr "Nastavení hesla" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1024 msgid "New Password:" msgstr "Nové heslo:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Confirm:" msgstr "Potvrďte:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Leave password fields blank unless changing" msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1029 msgid "Basic Settings" msgstr "Základní nastavení" -#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Celé jméno:" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1031 msgid "Email Address:" msgstr "E-mailová adresa:" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1032 msgid "Your Timezone:" msgstr "Vaše časové pásmo:" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1033 msgid "Default Post Location:" msgstr "Výchozí umístění příspěvků:" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1034 msgid "Use Browser Location:" msgstr "Používat umístění dle prohlížeče:" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1037 msgid "Security and Privacy Settings" msgstr "Nastavení zabezpečení a soukromí" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1039 msgid "Maximum Friend Requests/Day:" msgstr "Maximální počet žádostí o přátelství za den:" -#: ../../mod/settings.php:998 ../../mod/settings.php:1017 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 msgid "(to prevent spam abuse)" msgstr "(Aby se zabránilo spamu)" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1040 msgid "Default Post Permissions" msgstr "Výchozí oprávnění pro příspěvek" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1041 msgid "(click to open/close)" msgstr "(Klikněte pro otevření/zavření)" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1058 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum soukromých zpráv od neznámých lidí:" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1061 msgid "Notification Settings" msgstr "Nastavení notifikací" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1062 msgid "By default post a status message when:" msgstr "Defaultně posílat statusové zprávy když:" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1063 msgid "accepting a friend request" msgstr "akceptuji požadavek na přátelství" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1064 msgid "joining a forum/community" msgstr "připojující se k fóru/komunitě" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1065 msgid "making an interesting profile change" msgstr "provedení zajímavé profilové změny" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1066 msgid "Send a notification email when:" msgstr "Poslat notifikaci e-mailem, když" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1067 msgid "You receive an introduction" msgstr "obdržíte žádost o propojení" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1068 msgid "Your introductions are confirmed" msgstr "Vaše žádosti jsou potvrzeny" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1069 msgid "Someone writes on your profile wall" msgstr "někdo Vám napíše na Vaši profilovou stránku" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1070 msgid "Someone writes a followup comment" msgstr "někdo Vám napíše následný komentář" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1071 msgid "You receive a private message" msgstr "obdržíte soukromou zprávu" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1072 msgid "You receive a friend suggestion" msgstr "Obdržel jste návrh přátelství" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1073 msgid "You are tagged in a post" msgstr "Jste označen v příspěvku" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1074 msgid "You are poked/prodded/etc. in a post" msgstr "Byl Jste šťouchnout v příspěvku" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1077 msgid "Advanced Account/Page Type Settings" msgstr "Pokročilé nastavení účtu/stránky" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1078 msgid "Change the behaviour of this account for special situations" msgstr "Změnit chování tohoto účtu ve speciálních situacích" @@ -2667,63 +2689,64 @@ msgstr "Vyberte identitu pro správu: " msgid "Search Results For:" msgstr "Výsledky hledání pro:" -#: ../../mod/network.php:221 ../../mod/search.php:18 +#: ../../mod/network.php:224 ../../mod/search.php:21 msgid "Remove term" msgstr "Odstranit termín" -#: ../../mod/network.php:230 ../../mod/search.php:27 +#: ../../mod/network.php:233 ../../mod/search.php:30 +#: ../../include/features.php:41 msgid "Saved Searches" msgstr "Uložená hledání" -#: ../../mod/network.php:231 ../../include/group.php:275 +#: ../../mod/network.php:234 ../../include/group.php:275 msgid "add" msgstr "přidat" -#: ../../mod/network.php:394 +#: ../../mod/network.php:397 msgid "Commented Order" msgstr "Dle komentářů" -#: ../../mod/network.php:397 +#: ../../mod/network.php:400 msgid "Sort by Comment Date" msgstr "Řadit podle data komentáře" -#: ../../mod/network.php:400 +#: ../../mod/network.php:403 msgid "Posted Order" msgstr "Dle data" -#: ../../mod/network.php:403 +#: ../../mod/network.php:406 msgid "Sort by Post Date" msgstr "Řadit podle data příspěvku" -#: ../../mod/network.php:410 +#: ../../mod/network.php:447 msgid "Posts that mention or involve you" msgstr "Příspěvky, které Vás zmiňují nebo zahrnují" -#: ../../mod/network.php:413 +#: ../../mod/network.php:453 msgid "New" msgstr "Nové" -#: ../../mod/network.php:416 +#: ../../mod/network.php:456 msgid "Activity Stream - by date" msgstr "Proud aktivit - dle data" -#: ../../mod/network.php:419 -msgid "Starred" -msgstr "S hvězdičkou" - -#: ../../mod/network.php:422 -msgid "Favourite Posts" -msgstr "Oblíbené přízpěvky" - -#: ../../mod/network.php:425 +#: ../../mod/network.php:462 msgid "Shared Links" msgstr "Sdílené odkazy" -#: ../../mod/network.php:428 +#: ../../mod/network.php:465 msgid "Interesting Links" msgstr "Zajímavé odkazy" -#: ../../mod/network.php:496 +#: ../../mod/network.php:471 +msgid "Starred" +msgstr "S hvězdičkou" + +#: ../../mod/network.php:474 +msgid "Favourite Posts" +msgstr "Oblíbené přízpěvky" + +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2732,32 +2755,32 @@ msgstr[0] "Upozornění: Tato skupina obsahuje %s člena z nezabezpečené sít msgstr[1] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě." msgstr[2] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě." -#: ../../mod/network.php:499 +#: ../../mod/network.php:549 msgid "Private messages to this group are at risk of public disclosure." msgstr "Soukromé zprávy této skupině jsou vystaveny riziku prozrazení." -#: ../../mod/network.php:569 +#: ../../mod/network.php:619 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:571 +#: ../../mod/network.php:621 msgid "Private messages to this person are at risk of public disclosure." msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení." -#: ../../mod/network.php:576 +#: ../../mod/network.php:626 msgid "Invalid contact." msgstr "Neplatný kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1718 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "Osobní poznámky" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 -#: ../../addon/fbpost/fbpost.php:267 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 +#: ../../addon/fbpost/fbpost.php:314 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2766,26 +2789,32 @@ msgstr "Osobní poznámky" msgid "Save" msgstr "Uložit" -#: ../../mod/uimport.php:41 +#: ../../mod/uimport.php:50 ../../mod/register.php:190 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to zítra znovu." + +#: ../../mod/uimport.php:64 msgid "Import" msgstr "Import" -#: ../../mod/uimport.php:43 +#: ../../mod/uimport.php:66 msgid "Move account" msgstr "Přesunout účet" -#: ../../mod/uimport.php:44 +#: ../../mod/uimport.php:67 msgid "" -"You can move here an account from another Friendica server.
\r\n" -" You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n" -" This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora" -msgstr "Zde si můžete přesunout účet z jiného serveru Friendika.
\n Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory" +"You can import an account from another Friendica server.
\r\n" +" You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n" +" This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora" +msgstr "Je možné importovat účet z jiného Friendica serveru.
\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.
\nTato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory." -#: ../../mod/uimport.php:47 +#: ../../mod/uimport.php:70 msgid "Account file" msgstr "Soubor s účtem" -#: ../../mod/uimport.php:47 +#: ../../mod/uimport.php:70 msgid "" "To export your accont, go to \"Settings->Export your porsonal data\" and " "select \"Export account\"" @@ -2796,7 +2825,7 @@ msgstr "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobní msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena." -#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:63 msgid "No recipient selected." msgstr "Nevybrán příjemce." @@ -2804,15 +2833,15 @@ msgstr "Nevybrán příjemce." msgid "Unable to check your home location." msgstr "Nebylo možné zjistit Vaši domácí lokaci." -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:70 msgid "Message could not be sent." msgstr "Zprávu se nepodařilo odeslat." -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:73 msgid "Message collection failure." msgstr "Sběr zpráv selhal." -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:76 msgid "Message sent." msgstr "Zpráva odeslána." @@ -2821,12 +2850,12 @@ msgid "No recipient." msgstr "Žádný příjemce." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:898 ../../include/conversation.php:916 +#: ../../mod/message.php:249 ../../mod/message.php:257 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Please enter a link URL:" msgstr "Zadejte prosím URL odkaz:" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "Odeslat soukromou zprávu" @@ -2837,18 +2866,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů." -#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 -#: ../../mod/message.php:469 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:476 msgid "To:" msgstr "Adresát:" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 -#: ../../mod/message.php:471 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:478 msgid "Subject:" msgstr "Předmět:" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 -#: ../../mod/message.php:474 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:481 ../../mod/invite.php:113 msgid "Your message:" msgstr "Vaše zpráva:" @@ -2903,9 +2932,9 @@ msgid "" msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný, leda by všichni vaši potenciální přátelé věděli, jak vás přesně najít." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1694 +#: ../../boot.php:1731 msgid "Profile" msgstr "Profil" @@ -2947,7 +2976,7 @@ msgid "Connecting" msgstr "Probíhá pokus o připojení" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 +#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286 #: ../../include/contact_selectors.php:81 #: ../../addon.old/facebook/facebook.php:728 #: ../../addon.old/fbpost/fbpost.php:239 @@ -3076,7 +3105,7 @@ msgstr "Skupina nenalezena." msgid "Group name changed." msgstr "Název skupiny byl změněn." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332 msgid "Permission denied" msgstr "Nedostatečné oprávnění" @@ -3128,7 +3157,7 @@ msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )" msgid "No contacts." msgstr "Žádné kontakty." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:625 msgid "View Contacts" msgstr "Zobrazit kontakty" @@ -3159,12 +3188,6 @@ msgstr "Žádost o registraci na %s" msgid "Your registration is pending approval by the site owner." msgstr "Vaše registrace čeká na schválení vlastníkem serveru." -#: ../../mod/register.php:190 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to zítra znovu." - #: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " @@ -3193,7 +3216,7 @@ msgstr "Členství na tomto webu je pouze na pozvání." msgid "Your invitation ID: " msgstr "Vaše pozvání ID:" -#: ../../mod/register.php:260 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:446 msgid "Registration" msgstr "Registrace" @@ -3216,7 +3239,7 @@ msgstr "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaš msgid "Choose a nickname: " msgstr "Vyberte přezdívku:" -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "Registrovat" @@ -3225,9 +3248,9 @@ msgid "People Search" msgstr "Vyhledávání lidí" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../addon/communityhome/communityhome.php:164 +#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3235,10 +3258,10 @@ msgstr "fotografie" #: ../../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:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 +#: ../../addon/communityhome/communityhome.php:159 +#: ../../addon/communityhome/communityhome.php:168 +#: ../../view/theme/diabook/theme.php:459 +#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3248,8 +3271,8 @@ msgid "status" msgstr "Stav" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 -#: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 +#: ../../addon/communityhome/communityhome.php:173 +#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3263,8 +3286,8 @@ msgid "%1$s doesn't like %2$s's %3$s" 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:39 -#: ../../mod/display.php:169 ../../include/items.php:3837 +#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "Položka nenalezena." @@ -3272,8 +3295,8 @@ msgstr "Položka nenalezena." msgid "Access denied." msgstr "Přístup odmítnut" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1701 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "Fotografie" @@ -3302,35 +3325,35 @@ msgstr "Nelze nalézt původní příspěvek." msgid "Empty post discarded." msgstr "Prázdný příspěvek odstraněn." -#: ../../mod/item.php:420 ../../mod/wall_upload.php:133 -#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 +#: ../../mod/item.php:424 ../../mod/wall_upload.php:135 +#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Fotografie na zdi" -#: ../../mod/item.php:833 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "Chyba systému. Příspěvek nebyl uložen." -#: ../../mod/item.php:858 +#: ../../mod/item.php:862 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica." -#: ../../mod/item.php:860 +#: ../../mod/item.php:864 #, php-format msgid "You may visit them online at %s" msgstr "Můžete je navštívit online na adrese %s" -#: ../../mod/item.php:861 +#: ../../mod/item.php:865 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam." -#: ../../mod/item.php:863 +#: ../../mod/item.php:867 #, php-format msgid "%s posted an update." msgstr "%s poslal aktualizaci." @@ -3368,7 +3391,7 @@ msgstr "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, p msgid "Unable to process image" msgstr "Obrázek nelze zpracovat " -#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90 #, php-format msgid "Image exceeds size limit of %d" msgstr "Obrázek překročil limit velikosti %d" @@ -3429,50 +3452,50 @@ msgstr "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odst msgid "Please enter your password for verification:" msgstr "Prosím, zadejte své heslo pro ověření:" -#: ../../mod/message.php:9 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:132 msgid "New Message" msgstr "Nová zpráva" -#: ../../mod/message.php:63 +#: ../../mod/message.php:67 msgid "Unable to locate contact information." msgstr "Nepodařilo se najít kontaktní informace." -#: ../../mod/message.php:191 +#: ../../mod/message.php:195 msgid "Message deleted." msgstr "Zpráva odstraněna." -#: ../../mod/message.php:221 +#: ../../mod/message.php:225 msgid "Conversation removed." msgstr "Konverzace odstraněna." -#: ../../mod/message.php:327 +#: ../../mod/message.php:334 msgid "No messages." msgstr "Žádné zprávy." -#: ../../mod/message.php:334 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "Neznámý odesilatel - %s" -#: ../../mod/message.php:337 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "Vy a %s" -#: ../../mod/message.php:340 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "%s a Vy" -#: ../../mod/message.php:350 ../../mod/message.php:462 +#: ../../mod/message.php:357 ../../mod/message.php:469 msgid "Delete conversation" msgstr "Odstranit konverzaci" -#: ../../mod/message.php:353 +#: ../../mod/message.php:360 msgid "D, d M Y - g:i A" msgstr "D M R - g:i A" -#: ../../mod/message.php:356 +#: ../../mod/message.php:363 #, php-format msgid "%d message" msgid_plural "%d messages" @@ -3480,21 +3503,21 @@ msgstr[0] "%d zpráva" msgstr[1] "%d zprávy" msgstr[2] "%d zpráv" -#: ../../mod/message.php:391 +#: ../../mod/message.php:398 msgid "Message not available." msgstr "Zpráva není k dispozici." -#: ../../mod/message.php:444 +#: ../../mod/message.php:451 msgid "Delete message" msgstr "Smazat zprávu" -#: ../../mod/message.php:464 +#: ../../mod/message.php:471 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Není k dispozici zabezpečená komunikace. Možná budete schopni reagovat z odesilatelovy profilové stránky." -#: ../../mod/message.php:468 +#: ../../mod/message.php:475 msgid "Send Reply" msgstr "Poslat odpověď" @@ -3511,19 +3534,19 @@ msgstr "Žádní přátelé k zobrazení" msgid "Theme settings updated." msgstr "Nastavení téma zobrazení bylo aktualizováno." -#: ../../mod/admin.php:96 ../../mod/admin.php:442 +#: ../../mod/admin.php:96 ../../mod/admin.php:444 msgid "Site" msgstr "Web" -#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701 +#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704 msgid "Users" msgstr "Uživatelé" -#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825 +#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828 msgid "Plugins" msgstr "Pluginy" -#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024 +#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027 msgid "Themes" msgstr "Témata" @@ -3531,11 +3554,11 @@ msgstr "Témata" msgid "DB updates" msgstr "Aktualizace databáze" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114 msgid "Logs" msgstr "Logy" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "Administrace" @@ -3547,19 +3570,19 @@ msgstr "Funkčnosti rozšíření" msgid "User registrations waiting for confirmation" msgstr "Registrace uživatele čeká na potvrzení" -#: ../../mod/admin.php:183 ../../mod/admin.php:669 +#: ../../mod/admin.php:183 ../../mod/admin.php:672 msgid "Normal Account" msgstr "Normální účet" -#: ../../mod/admin.php:184 ../../mod/admin.php:670 +#: ../../mod/admin.php:184 ../../mod/admin.php:673 msgid "Soapbox Account" msgstr "Soapbox účet" -#: ../../mod/admin.php:185 ../../mod/admin.php:671 +#: ../../mod/admin.php:185 ../../mod/admin.php:674 msgid "Community/Celebrity Account" msgstr "Komunitní účet / Účet celebrity" -#: ../../mod/admin.php:186 ../../mod/admin.php:672 +#: ../../mod/admin.php:186 ../../mod/admin.php:675 msgid "Automatic Friend Account" msgstr "Účet s automatickým schvalováním přátel" @@ -3575,9 +3598,9 @@ msgstr "Soukromé fórum" msgid "Message queues" msgstr "Fronty zpráv" -#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687 -#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987 -#: ../../mod/admin.php:1023 ../../mod/admin.php:1110 +#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690 +#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990 +#: ../../mod/admin.php:1026 ../../mod/admin.php:1113 msgid "Administration" msgstr "Administrace" @@ -3601,380 +3624,391 @@ msgstr "Verze" msgid "Active plugins" msgstr "Aktivní pluginy" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:375 msgid "Site settings updated." msgstr "Nastavení webu aktualizováno." -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "Closed" msgstr "Uzavřeno" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "Requires approval" msgstr "Vyžaduje schválení" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Open" msgstr "Otevřená" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "No SSL policy, links will track page SSL state" msgstr "Žádná SSL politika, odkazy budou následovat stránky SSL stav" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Force all links to use SSL" msgstr "Vyžadovat u všech odkazů použití SSL" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odkazy (nedoporučeno)" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:447 msgid "File upload" msgstr "Nahrání souborů" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:448 msgid "Policies" msgstr "Politiky" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:449 msgid "Advanced" msgstr "Pokročilé" -#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "Název webu" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:454 msgid "Banner/Logo" msgstr "Banner/logo" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:455 msgid "System language" msgstr "Systémový jazyk" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "System theme" msgstr "Grafická šablona systému " -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Defaultní systémové téma - může být změněno v uživatelských profilech - změnit theme settings" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:457 msgid "Mobile system theme" msgstr "Systémové téma zobrazení pro mobilní zařízení" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:457 msgid "Theme for mobile devices" msgstr "Téma zobrazení pro mobilní zařízení" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "SSL link policy" msgstr "Politika SSL odkazů" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "Determines whether generated links should be forced to use SSL" msgstr "Určuje, zda-li budou generované odkazy používat SSL" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "Maximum image size" msgstr "Maximální velikost obrázků" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximální velikost v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno." -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "Maximum image length" msgstr "Maximální velikost obrázků" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "Maximální délka v pixelech delší stránky nahrávaných obrázků. Defaultně je -1, což označuje bez limitu" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:461 msgid "JPEG image quality" msgstr "JPEG kvalita obrázku" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:461 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Defaultní je 100, což znamená plnou kvalitu." -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:463 msgid "Register policy" msgstr "Politika registrace" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:464 +msgid "Maximum Daily Registrations" +msgstr "Maximální počet denních registrací" + +#: ../../mod/admin.php:464 +msgid "" +"If registration is permitted above, this sets the maximum number of new user" +" registrations to accept per day. If register is set to closed, this " +"setting has no effect." +msgstr "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt." + +#: ../../mod/admin.php:465 msgid "Register text" msgstr "Registrace textu" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:465 msgid "Will be displayed prominently on the registration page." msgstr "Bude zřetelně zobrazeno na registrační stránce." -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:466 msgid "Accounts abandoned after x days" msgstr "Účet je opuštěn po x dnech" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:466 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Neztrácejte systémové zdroje kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit." -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:467 msgid "Allowed friend domains" msgstr "Povolené domény přátel" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:467 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Čárkou oddělený seznam domén, kterým je povoleno navazovat přátelství s tímto webem. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu." -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:468 msgid "Allowed email domains" msgstr "Povolené e-mailové domény" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:468 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Čárkou oddělený seznam domén emalových adres, kterým je povoleno provádět registraci na tomto webu. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu." -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "Block public" msgstr "Blokovat veřejnost" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Označemím přepínače zablokujete veřejný přístup ke všem jinak veřejně přístupným soukromým stránkám uživatelům, kteří nebudou přihlášeni." -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:470 msgid "Force publish" msgstr "Publikovat" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:470 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Označením přepínače budou včechny profily na tomto webu uvedeny v adresáři webu." -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:471 msgid "Global directory update URL" msgstr "aktualizace URL adresy Globálního adresáře " -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:471 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL adresa k aktualizaci globálního adresáře. Pokud není zadáno, funkce globálního adresáře není dostupná žádné aplikaci." -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Allow threaded items" msgstr "Povolit vícevláknové zpracování obsahu" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Allow infinite level threading for items on this site." msgstr "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken." -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:473 msgid "Private posts by default for new users" msgstr "Nastavit pro nové uživatele příspěvky jako soukromé" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:473 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." 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 +#: ../../mod/admin.php:475 msgid "Block multiple registrations" msgstr "Blokovat více registrací" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:475 msgid "Disallow users to register additional accounts for use as pages." msgstr "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky." -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "OpenID support" msgstr "podpora OpenID" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "OpenID support for registration and logins." msgstr "Podpora OpenID pro registraci a přihlašování." -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:477 msgid "Fullname check" msgstr "kontrola úplného jména" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:477 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Přimět uživatele k registraci s mezerou mezi jménu a příjmením v poli Celé jméno, jako antispamové opatření." -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:478 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Regulární výrazy" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:478 msgid "Use PHP UTF8 regular expressions" msgstr "Použít PHP UTF8 regulární výrazy." -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:479 msgid "Show Community Page" msgstr "Zobrazit stránku komunity" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:479 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zobrazit Komunitní stránku zobrazující všechny veřejné příspěvky napsané na této stránce." -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:480 msgid "Enable OStatus support" msgstr "Zapnout podporu OStatus" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:480 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Poskytnout zabudouvanou kompatibilitu s OStatus (identi.ca, status.net, etc.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění." -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:481 msgid "Enable Diaspora support" msgstr "Povolit podporu Diaspora" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:481 msgid "Provide built-in Diaspora network compatibility." msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora." -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 msgid "Only allow Friendica contacts" msgstr "Povolit pouze Friendica kontakty" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Všechny kontakty musí používat Friendica protokol. Všchny jiné zabudované komunikační protokoly budou zablokované." -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:483 msgid "Verify SSL" msgstr "Ověřit SSL" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:483 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem." -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:484 msgid "Proxy user" msgstr "Proxy uživatel" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:485 msgid "Proxy URL" msgstr "Proxy URL adresa" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:486 msgid "Network timeout" msgstr "čas síťového spojení vypršelo (timeout)" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:486 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno)." -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 msgid "Delivery interval" msgstr "Interval doručování" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Prodleva mezi doručovacími procesy běžícími na pozadí snižuje zátěž systému. Doporučené nastavení: 4-5 pro sdílené instalace, 2-3 pro virtuální soukromé servery, 0-1 pro velké dedikované servery." -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:488 msgid "Poll interval" msgstr "Dotazovací interval" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:488 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval." -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 msgid "Maximum Load Average" msgstr "Maximální průměrné zatížení" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50" -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:506 msgid "Update has been marked successful" msgstr "Aktualizace byla označena jako úspěšná." -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:516 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Vykonávání %s selhalo. Zkontrolujte chybový protokol." -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:519 #, php-format msgid "Update %s was successfully applied." msgstr "Aktualizace %s byla úspěšně aplikována." -#: ../../mod/admin.php:520 +#: ../../mod/admin.php:523 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Aktualizace %s nevrátila žádný status. Není zřejmé, jestli byla úspěšná." -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:526 #, php-format msgid "Update function %s could not be found." msgstr "Aktualizační funkce %s nebyla nalezena." -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:541 msgid "No failed updates." msgstr "Žádné neúspěšné aktualizace." -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:545 msgid "Failed Updates" msgstr "Neúspěšné aktualizace" -#: ../../mod/admin.php:543 +#: ../../mod/admin.php:546 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status." -#: ../../mod/admin.php:544 +#: ../../mod/admin.php:547 msgid "Mark success (if update was manually applied)" msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)" -#: ../../mod/admin.php:545 +#: ../../mod/admin.php:548 msgid "Attempt to execute this update step automatically" msgstr "Pokusit se provést tuto aktualizaci automaticky." -#: ../../mod/admin.php:570 +#: ../../mod/admin.php:573 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" @@ -3982,7 +4016,7 @@ msgstr[0] "%s uživatel blokován/odblokován" msgstr[1] "%s uživatelů blokováno/odblokováno" msgstr[2] "%s uživatelů blokováno/odblokováno" -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:580 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" @@ -3990,171 +4024,172 @@ msgstr[0] "%s uživatel smazán" msgstr[1] "%s uživatelů smazáno" msgstr[2] "%s uživatelů smazáno" -#: ../../mod/admin.php:616 +#: ../../mod/admin.php:619 #, php-format msgid "User '%s' deleted" msgstr "Uživatel '%s' smazán" -#: ../../mod/admin.php:624 +#: ../../mod/admin.php:627 #, php-format msgid "User '%s' unblocked" msgstr "Uživatel '%s' odblokován" -#: ../../mod/admin.php:624 +#: ../../mod/admin.php:627 #, php-format msgid "User '%s' blocked" msgstr "Uživatel '%s' blokován" -#: ../../mod/admin.php:690 +#: ../../mod/admin.php:693 msgid "select all" msgstr "Vybrat vše" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:694 msgid "User registrations waiting for confirm" msgstr "Registrace uživatele čeká na potvrzení" -#: ../../mod/admin.php:692 +#: ../../mod/admin.php:695 msgid "Request date" msgstr "Datum žádosti" -#: ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/admin.php:695 ../../mod/admin.php:705 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "E-mail" -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:696 msgid "No registrations." msgstr "Žádné registrace." -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Deny" msgstr "Odmítnout" -#: ../../mod/admin.php:699 +#: ../../mod/admin.php:702 msgid "Site admin" msgstr "Site administrátor" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Register date" msgstr "Datum registrace" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Last login" msgstr "Datum posledního přihlášení" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Last item" msgstr "Poslední položka" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Account" msgstr "Účet" -#: ../../mod/admin.php:704 +#: ../../mod/admin.php:707 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Vybraní uživatelé budou smazáni!\\n\\n Vše, co tito uživatelé na těchto stránkách vytvořili, bude trvale odstraněno!\\n\\n Opravdu pokračovat?" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:708 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto stránkách vytvořil, bude trvale odstraněno!\\n\\n Opravdu pokračovat?" -#: ../../mod/admin.php:746 +#: ../../mod/admin.php:749 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s zakázán." -#: ../../mod/admin.php:750 +#: ../../mod/admin.php:753 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s povolen." -#: ../../mod/admin.php:760 ../../mod/admin.php:958 +#: ../../mod/admin.php:763 ../../mod/admin.php:961 msgid "Disable" msgstr "Zakázat" -#: ../../mod/admin.php:762 ../../mod/admin.php:960 +#: ../../mod/admin.php:765 ../../mod/admin.php:963 msgid "Enable" msgstr "Povolit" -#: ../../mod/admin.php:784 ../../mod/admin.php:989 +#: ../../mod/admin.php:787 ../../mod/admin.php:992 msgid "Toggle" msgstr "Přepnout" -#: ../../mod/admin.php:792 ../../mod/admin.php:999 +#: ../../mod/admin.php:795 ../../mod/admin.php:1002 msgid "Author: " msgstr "Autor: " -#: ../../mod/admin.php:793 ../../mod/admin.php:1000 +#: ../../mod/admin.php:796 ../../mod/admin.php:1003 msgid "Maintainer: " msgstr "Správce: " -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:925 msgid "No themes found." msgstr "Nenalezeny žádná témata." -#: ../../mod/admin.php:981 +#: ../../mod/admin.php:984 msgid "Screenshot" msgstr "Snímek obrazovky" -#: ../../mod/admin.php:1029 +#: ../../mod/admin.php:1032 msgid "[Experimental]" msgstr "[Experimentální]" -#: ../../mod/admin.php:1030 +#: ../../mod/admin.php:1033 msgid "[Unsupported]" msgstr "[Nepodporováno]" -#: ../../mod/admin.php:1057 +#: ../../mod/admin.php:1060 msgid "Log settings updated." msgstr "Nastavení protokolu aktualizováno." -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1116 msgid "Clear" msgstr "Vyčistit" -#: ../../mod/admin.php:1119 +#: ../../mod/admin.php:1122 msgid "Debugging" msgstr "Ladění" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1123 msgid "Log file" msgstr "Soubor s logem" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1123 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Musí být editovatelné web serverem. Relativní cesta k vašemu kořenovému adresáři Friendica" -#: ../../mod/admin.php:1121 +#: ../../mod/admin.php:1124 msgid "Log level" msgstr "Úroveň auditu" -#: ../../mod/admin.php:1171 +#: ../../mod/admin.php:1174 msgid "Close" msgstr "Zavřít" -#: ../../mod/admin.php:1177 +#: ../../mod/admin.php:1180 msgid "FTP Host" msgstr "Hostitel FTP" -#: ../../mod/admin.php:1178 +#: ../../mod/admin.php:1181 msgid "FTP Path" msgstr "Cesta FTP" -#: ../../mod/admin.php:1179 +#: ../../mod/admin.php:1182 msgid "FTP User" msgstr "FTP uživatel" -#: ../../mod/admin.php:1180 +#: ../../mod/admin.php:1183 msgid "FTP Password" msgstr "FTP heslo" -#: ../../mod/profile.php:21 ../../boot.php:1089 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "Požadovaný profil není k dispozici." @@ -4224,8 +4259,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "Nenalezen účet a OpenID registrace na tomto serveru není dovolena." -#: ../../mod/openid.php:93 ../../include/auth.php:98 -#: ../../include/auth.php:161 +#: ../../mod/openid.php:93 ../../include/auth.php:110 +#: ../../include/auth.php:173 msgid "Login failed." msgstr "Přihlášení se nezdařilo." @@ -4262,13 +4297,13 @@ msgstr "Aplikace" msgid "No installed applications." msgstr "Žádné nainstalované aplikace." -#: ../../mod/search.php:96 ../../include/text.php:678 -#: ../../include/text.php:679 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:685 +#: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "Vyhledávání" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:434 -#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:441 +#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nenalezen" @@ -4276,307 +4311,312 @@ msgstr "Profil nenalezen" msgid "Profile Name is required." msgstr "Jméno profilu je povinné." -#: ../../mod/profiles.php:171 +#: ../../mod/profiles.php:178 msgid "Marital Status" msgstr "Rodinný Stav" -#: ../../mod/profiles.php:175 +#: ../../mod/profiles.php:182 msgid "Romantic Partner" msgstr "Romatický partner" -#: ../../mod/profiles.php:179 +#: ../../mod/profiles.php:186 msgid "Likes" msgstr "Libí se mi" -#: ../../mod/profiles.php:183 +#: ../../mod/profiles.php:190 msgid "Dislikes" msgstr "Nelibí se mi" -#: ../../mod/profiles.php:187 +#: ../../mod/profiles.php:194 msgid "Work/Employment" msgstr "Práce/Zaměstnání" -#: ../../mod/profiles.php:190 +#: ../../mod/profiles.php:197 msgid "Religion" msgstr "Náboženství" -#: ../../mod/profiles.php:194 +#: ../../mod/profiles.php:201 msgid "Political Views" msgstr "Politické přesvědčení" -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:205 msgid "Gender" msgstr "Pohlaví" -#: ../../mod/profiles.php:202 +#: ../../mod/profiles.php:209 msgid "Sexual Preference" msgstr "Sexuální orientace" -#: ../../mod/profiles.php:206 +#: ../../mod/profiles.php:213 msgid "Homepage" msgstr "Domácí stránka" -#: ../../mod/profiles.php:210 +#: ../../mod/profiles.php:217 msgid "Interests" msgstr "Zájmy" -#: ../../mod/profiles.php:214 +#: ../../mod/profiles.php:221 msgid "Address" msgstr "Adresa" -#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "Lokace" -#: ../../mod/profiles.php:304 +#: ../../mod/profiles.php:311 msgid "Profile updated." msgstr "Profil aktualizován." -#: ../../mod/profiles.php:371 +#: ../../mod/profiles.php:378 msgid " and " msgstr " a " -#: ../../mod/profiles.php:379 +#: ../../mod/profiles.php:386 msgid "public profile" msgstr "veřejný profil" -#: ../../mod/profiles.php:382 +#: ../../mod/profiles.php:389 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s změnil %2$s na “%3$s”" -#: ../../mod/profiles.php:383 +#: ../../mod/profiles.php:390 #, php-format msgid " - Visit %1$s's %2$s" msgstr " - Navštivte %2$s uživatele %1$s" -#: ../../mod/profiles.php:386 +#: ../../mod/profiles.php:393 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s aktualizoval %2$s, změnou %3$s." -#: ../../mod/profiles.php:453 +#: ../../mod/profiles.php:460 msgid "Profile deleted." msgstr "Profil smazán." -#: ../../mod/profiles.php:471 ../../mod/profiles.php:505 +#: ../../mod/profiles.php:478 ../../mod/profiles.php:512 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:490 ../../mod/profiles.php:532 +#: ../../mod/profiles.php:497 ../../mod/profiles.php:539 msgid "New profile created." msgstr "Nový profil vytvořen." -#: ../../mod/profiles.php:511 +#: ../../mod/profiles.php:518 msgid "Profile unavailable to clone." msgstr "Profil není možné naklonovat." -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:583 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:603 msgid "Edit Profile Details" msgstr "Upravit podrobnosti profilu " -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:605 +msgid "Change Profile Photo" +msgstr "Změna Profilové fotky" + +#: ../../mod/profiles.php:606 msgid "View this profile" msgstr "Zobrazit tento profil" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:607 msgid "Create a new profile using these settings" msgstr "Vytvořit nový profil pomocí tohoto nastavení" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:608 msgid "Clone this profile" msgstr "Klonovat tento profil" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:609 msgid "Delete this profile" msgstr "Smazat tento profil" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:610 msgid "Profile Name:" msgstr "Jméno profilu:" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:611 msgid "Your Full Name:" msgstr "Vaše celé jméno:" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:612 msgid "Title/Description:" msgstr "Název / Popis:" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:613 msgid "Your Gender:" msgstr "Vaše pohlaví:" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:614 #, php-format msgid "Birthday (%s):" msgstr "Narozeniny uživatele (%s):" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:615 msgid "Street Address:" msgstr "Ulice:" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:616 msgid "Locality/City:" msgstr "Město:" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:617 msgid "Postal/Zip Code:" msgstr "PSČ:" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:618 msgid "Country:" msgstr "Země:" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:619 msgid "Region/State:" msgstr "Region / stát:" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:620 msgid "♥ Marital Status:" msgstr "♥ Rodinný stav:" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:621 msgid "Who: (if applicable)" msgstr "Kdo: (pokud je možné)" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:622 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Příklady: jan123, Jan Novák, jan@seznam.cz" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:623 msgid "Since [date]:" msgstr "Od [data]:" -#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Sexuální preference:" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:625 msgid "Homepage URL:" msgstr "Odkaz na domovskou stránku:" -#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "Rodné město" -#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Politické přesvědčení:" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:628 msgid "Religious Views:" msgstr "Náboženské přesvědčení:" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:629 msgid "Public Keywords:" msgstr "Veřejná klíčová slova:" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:630 msgid "Private Keywords:" msgstr "Soukromá klíčová slova:" -#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "Líbí se:" -#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "Nelibí se:" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:633 msgid "Example: fishing photography software" msgstr "Příklad: fishing photography software" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:634 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:635 msgid "(Used for searching profiles, never shown to others)" msgstr "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:636 msgid "Tell us about yourself..." msgstr "Řekněte nám něco o sobě ..." -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:637 msgid "Hobbies/Interests" msgstr "Koníčky/zájmy" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:638 msgid "Contact information and Social Networks" msgstr "Kontaktní informace a sociální sítě" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:639 msgid "Musical interests" msgstr "Hudební vkus" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:640 msgid "Books, literature" msgstr "Knihy, literatura" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:641 msgid "Television" msgstr "Televize" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:642 msgid "Film/dance/culture/entertainment" msgstr "Film/tanec/kultura/zábava" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:643 msgid "Love/romance" msgstr "Láska/romantika" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:644 msgid "Work/employment" msgstr "Práce/zaměstnání" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:645 msgid "School/education" msgstr "Škola/vzdělání" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:650 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Toto je váš veřejný profil.
Ten může být viditelný kýmkoliv na internetu." -#: ../../mod/profiles.php:649 ../../mod/directory.php:111 +#: ../../mod/profiles.php:660 ../../mod/directory.php:111 +#: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "Věk: " -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:699 msgid "Edit/Manage Profiles" msgstr "Upravit / Spravovat profily" -#: ../../mod/profiles.php:689 ../../boot.php:1207 +#: ../../mod/profiles.php:700 ../../boot.php:1244 msgid "Change profile photo" msgstr "Změnit profilovou fotografii" -#: ../../mod/profiles.php:690 ../../boot.php:1208 +#: ../../mod/profiles.php:701 ../../boot.php:1245 msgid "Create New Profile" msgstr "Vytvořit nový profil" -#: ../../mod/profiles.php:701 ../../boot.php:1218 +#: ../../mod/profiles.php:712 ../../boot.php:1255 msgid "Profile Image" msgstr "Profilový obrázek" -#: ../../mod/profiles.php:703 ../../boot.php:1221 +#: ../../mod/profiles.php:714 ../../boot.php:1258 msgid "visible to everybody" msgstr "viditelné pro všechny" -#: ../../mod/profiles.php:704 ../../boot.php:1222 +#: ../../mod/profiles.php:715 ../../boot.php:1259 msgid "Edit visibility" msgstr "Upravit viditelnost" -#: ../../mod/filer.php:29 ../../include/conversation.php:902 -#: ../../include/conversation.php:920 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "Uložit do složky:" @@ -4668,7 +4708,7 @@ msgstr "Vstupní data (ve formátu Diaspora): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Návrhy přátel" @@ -4683,42 +4723,50 @@ msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to msgid "Ignore/Hide" msgstr "Ignorovat / skrýt" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 +#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 +#: ../../view/theme/diabook/theme.php:518 msgid "Global Directory" msgstr "Globální adresář" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79 msgid "Find on this site" msgstr "Nalézt na tomto webu" -#: ../../mod/directory.php:60 +#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82 msgid "Site Directory" msgstr "Adresář serveru" #: ../../mod/directory.php:114 +#: ../../addon/forumdirectory/forumdirectory.php:136 msgid "Gender: " msgstr "Pohlaví: " -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1243 +#: ../../mod/directory.php:136 +#: ../../addon/forumdirectory/forumdirectory.php:158 +#: ../../include/profile_advanced.php:17 ../../boot.php:1280 msgid "Gender:" msgstr "Pohlaví:" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1246 +#: ../../mod/directory.php:138 +#: ../../addon/forumdirectory/forumdirectory.php:160 +#: ../../include/profile_advanced.php:37 ../../boot.php:1283 msgid "Status:" msgstr "Status:" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1248 +#: ../../mod/directory.php:140 +#: ../../addon/forumdirectory/forumdirectory.php:162 +#: ../../include/profile_advanced.php:48 ../../boot.php:1285 msgid "Homepage:" msgstr "Domácí stránka:" -#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58 +#: ../../mod/directory.php:142 +#: ../../addon/forumdirectory/forumdirectory.php:164 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "O mě:" #: ../../mod/directory.php:180 +#: ../../addon/forumdirectory/forumdirectory.php:202 msgid "No entries (some entries may be hidden)." msgstr "Žádné záznamy (některé položky mohou být skryty)." @@ -4894,22 +4942,22 @@ msgstr "Připojení přijato na %s" msgid "%1$s has joined %2$s" msgstr "%1$s se připojil k %2$s" -#: ../../addon/fromgplus/fromgplus.php:29 +#: ../../addon/fromgplus/fromgplus.php:33 #: ../../addon.old/fromgplus/fromgplus.php:29 msgid "Google+ Import Settings" msgstr "Nastavení importu z Google+ " -#: ../../addon/fromgplus/fromgplus.php:32 +#: ../../addon/fromgplus/fromgplus.php:36 #: ../../addon.old/fromgplus/fromgplus.php:32 msgid "Enable Google+ Import" msgstr "Povolit Import z Google+" -#: ../../addon/fromgplus/fromgplus.php:35 +#: ../../addon/fromgplus/fromgplus.php:39 #: ../../addon.old/fromgplus/fromgplus.php:35 msgid "Google Account ID" msgstr "název účtu Google " -#: ../../addon/fromgplus/fromgplus.php:55 +#: ../../addon/fromgplus/fromgplus.php:59 #: ../../addon.old/fromgplus/fromgplus.php:55 msgid "Google+ Import Settings saved." msgstr "Nastavení importu z Google+ uloženo." @@ -4924,7 +4972,7 @@ msgstr "Facebook zakázán" msgid "Updating contacts" msgstr "Aktualizace kontaktů" -#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192 +#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199 #: ../../addon.old/facebook/facebook.php:551 #: ../../addon.old/fbpost/fbpost.php:192 msgid "Facebook API key is missing." @@ -4945,7 +4993,7 @@ msgstr "Nainstalovat pro tento účet Facebook konektor." msgid "Remove Facebook connector" msgstr "Odstranit konektor na Facebook" -#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217 +#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224 #: ../../addon.old/facebook/facebook.php:576 #: ../../addon.old/fbpost/fbpost.php:217 msgid "" @@ -4953,7 +5001,7 @@ msgid "" "changed.]" msgstr "Opětovná autentikace [Toto je nezbytné kdykoliv se změní Vaše heslo na Facebooku.]" -#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224 +#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231 #: ../../addon.old/facebook/facebook.php:583 #: ../../addon.old/fbpost/fbpost.php:224 msgid "Post to Facebook by default" @@ -5033,13 +5081,13 @@ msgstr "Problémy s Facebook Real-Time aktualizacemi" msgid "Facebook Connector Settings" msgstr "Nastavení Facebook konektoru " -#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255 +#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302 #: ../../addon.old/facebook/facebook.php:744 #: ../../addon.old/fbpost/fbpost.php:255 msgid "Facebook API Key" msgstr "Facebook API Key" -#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262 +#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309 #: ../../addon.old/facebook/facebook.php:754 #: ../../addon.old/fbpost/fbpost.php:262 msgid "" @@ -5067,13 +5115,13 @@ msgid "" "going on." msgstr "Správnost klíče API nemohla být detekovaná. Děje se něco podivného." -#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264 +#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311 #: ../../addon.old/facebook/facebook.php:766 #: ../../addon.old/fbpost/fbpost.php:264 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265 +#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312 #: ../../addon.old/facebook/facebook.php:767 #: ../../addon.old/fbpost/fbpost.php:265 msgid "Application secret" @@ -5117,7 +5165,7 @@ msgstr "Real-Time aktualizace nejsou aktivovány." msgid "Activate Real-Time Updates" msgstr "Aktivovat Real-Time aktualizace" -#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282 +#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329 #: ../../addon/dav/friendica/layout.fnk.php:361 #: ../../addon.old/facebook/facebook.php:799 #: ../../addon.old/fbpost/fbpost.php:282 @@ -5125,13 +5173,13 @@ msgstr "Aktivovat Real-Time aktualizace" msgid "The new values have been saved." msgstr "Nové hodnoty byly uloženy" -#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301 +#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348 #: ../../addon.old/facebook/facebook.php:823 #: ../../addon.old/fbpost/fbpost.php:301 msgid "Post to Facebook" msgstr "Přidat příspěvek na Facebook" -#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399 +#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446 #: ../../addon.old/facebook/facebook.php:921 #: ../../addon.old/fbpost/fbpost.php:399 msgid "" @@ -5139,31 +5187,31 @@ msgid "" "conflict." msgstr "Příspěvek na Facebook zrušen kvůli konfliktu přístupových práv mezi sítěmi." -#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610 +#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722 #: ../../addon.old/facebook/facebook.php:1149 #: ../../addon.old/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "Zobrazení na Friendica" -#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643 +#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759 #: ../../addon.old/facebook/facebook.php:1182 #: ../../addon.old/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "Zaslání příspěvku na Facebook selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání." -#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683 +#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799 #: ../../addon.old/facebook/facebook.php:1222 #: ../../addon.old/fbpost/fbpost.php:683 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Vaše připojení na Facebook přestalo být platné. Prosím znovu se přihlaste." -#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684 +#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800 #: ../../addon.old/facebook/facebook.php:1223 #: ../../addon.old/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "Připojení na Facebook bylo zneplatněno." -#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801 #: ../../addon.old/facebook/facebook.php:1224 #: ../../addon.old/fbpost/fbpost.php:685 #, php-format @@ -5188,48 +5236,56 @@ msgstr "Nastavení StatusNet automatického následování (AutoFollow)" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "Automaticky následovat jakékoliv StatusNet následníky/přispivatele" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "Životnost vyrovnávací paměti (v hodinách)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "Statistika vyrovnávací paměti" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "Počet položek" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "Velikost vyrovnávací paměti" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "Vymazat celou vyrovnávací paměť" -#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172 +#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172 msgid "Facebook Post disabled" msgstr "Příspěvky na Facebook zakázán." -#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199 +#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199 msgid "Facebook Post" msgstr "Facebook příspěvek" -#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205 +#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205 msgid "Install Facebook Post connector for this account." msgstr "Instalovat pro tento účet konektor pro příspěvky na Facebook." -#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212 +#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212 msgid "Remove Facebook Post connector" msgstr "Odstranit konektor pro příspěvky na Facebook" -#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240 +#: ../../addon/fbpost/fbpost.php:235 +msgid "Suppress \"View on friendica\"" +msgstr "Potlačit \"Zobrazit na friendica\"" + +#: ../../addon/fbpost/fbpost.php:245 +msgid "Post to page/group:" +msgstr "Příspěvek na stránku/skupinu" + +#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240 msgid "Facebook Post Settings" msgstr "Nastavení konektoru pro příspěvky na Facebook" @@ -5540,12 +5596,12 @@ msgid "%s - Click to open/close" msgstr "%s - Klikněte pro otevření/zavření" #: ../../addon/page/page.php:62 ../../addon/page/page.php:92 -#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62 +#: ../../addon/forumlist/forumlist.php:64 ../../addon.old/page/page.php:62 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60 msgid "Forums" msgstr "Fóra" -#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94 +#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98 #: ../../addon.old/page/page.php:130 #: ../../addon.old/forumlist/forumlist.php:94 msgid "Forums:" @@ -5579,11 +5635,15 @@ msgstr "Nastavení Planets" msgid "Enable Planets Plugin" msgstr "Povolit Planets plugin" +#: ../../addon/forumdirectory/forumdirectory.php:22 +msgid "Forum Directory" +msgstr "Adresář Fór" + #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:927 +#: ../../include/nav.php:64 ../../boot.php:949 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5617,13 +5677,13 @@ msgstr "Nejaktivnější uživatelé" msgid "Latest photos" msgstr "Poslední fotky" -#: ../../addon/communityhome/communityhome.php:133 +#: ../../addon/communityhome/communityhome.php:134 #: ../../addon.old/communityhome/communityhome.php:133 msgid "Latest likes" msgstr "Poslední \"líbí se mi\"" -#: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 +#: ../../addon/communityhome/communityhome.php:156 +#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5777,7 +5837,7 @@ msgstr "Dny" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5788,7 +5848,7 @@ msgstr "Neděle" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5796,35 +5856,35 @@ msgid "Monday" msgstr "Pondělí" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Úterý" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Středa" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Čtvrtek" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Pátek" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6192,7 +6252,7 @@ msgstr "Rozšířený kalendář s podporou CalDAV" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:774 +#: ../../include/enotify.php:28 ../../include/notifier.php:778 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -6464,6 +6524,7 @@ msgid "may only be a partial list" msgstr "pouze pro část seznamu" #: ../../addon/remote_permissions/remote_permissions.php:196 +#: ../../addon/altpager/altpager.php:99 msgid "Global" msgstr "Globální" @@ -6472,6 +6533,7 @@ msgid "The posts of every user on this server show the post recipients" msgstr "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků" #: ../../addon/remote_permissions/remote_permissions.php:197 +#: ../../addon/altpager/altpager.php:100 msgid "Individual" msgstr "Individuálové" @@ -6546,57 +6608,57 @@ msgstr "Přeneste sem soubory k nahrání" msgid "Failed" msgstr "Neúspěch" -#: ../../addon/js_upload/js_upload.php:297 +#: ../../addon/js_upload/js_upload.php:303 #: ../../addon.old/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "Žádné soubory nebyly nahrány." -#: ../../addon/js_upload/js_upload.php:303 +#: ../../addon/js_upload/js_upload.php:309 #: ../../addon.old/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "Nahraný soubor je prázdný" -#: ../../addon/js_upload/js_upload.php:326 +#: ../../addon/js_upload/js_upload.php:332 #: ../../addon.old/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "Soubor má neplatnou příponu, ta by měla být jednou z" -#: ../../addon/js_upload/js_upload.php:337 +#: ../../addon/js_upload/js_upload.php:343 #: ../../addon.old/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "Nahrávání bylo zrušeno nebo došlo k chybě na serveru" -#: ../../addon/forumlist/forumlist.php:63 +#: ../../addon/forumlist/forumlist.php:67 #: ../../addon.old/forumlist/forumlist.php:63 msgid "show/hide" msgstr "zobrazit/skrýt" -#: ../../addon/forumlist/forumlist.php:77 +#: ../../addon/forumlist/forumlist.php:81 #: ../../addon.old/forumlist/forumlist.php:77 msgid "No forum subscriptions" msgstr "Žádné registrace k fórům" -#: ../../addon/forumlist/forumlist.php:131 +#: ../../addon/forumlist/forumlist.php:134 #: ../../addon.old/forumlist/forumlist.php:131 msgid "Forumlist settings updated." msgstr "Nastavení Forumlist aktualizováno." -#: ../../addon/forumlist/forumlist.php:159 +#: ../../addon/forumlist/forumlist.php:162 #: ../../addon.old/forumlist/forumlist.php:159 msgid "Forumlist Settings" msgstr "Nastavení Forumlist" -#: ../../addon/forumlist/forumlist.php:161 +#: ../../addon/forumlist/forumlist.php:164 #: ../../addon.old/forumlist/forumlist.php:161 msgid "Randomise forum list" msgstr "Zamíchat list fór" -#: ../../addon/forumlist/forumlist.php:164 +#: ../../addon/forumlist/forumlist.php:167 #: ../../addon.old/forumlist/forumlist.php:164 msgid "Show forums on profile page" msgstr "Zobrazit fóra na profilové stránce" -#: ../../addon/forumlist/forumlist.php:167 +#: ../../addon/forumlist/forumlist.php:170 #: ../../addon.old/forumlist/forumlist.php:167 msgid "Show forums on network page" msgstr "Zobrazit fóra na stránce Síť" @@ -6792,11 +6854,8 @@ msgid "The default zoom level. (1:world, 18:highest)" msgstr "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)" #: ../../addon/group_text/group_text.php:46 -#: ../../addon/editplain/editplain.php:46 -#: ../../addon.old/group_text/group_text.php:46 -#: ../../addon.old/editplain/editplain.php:46 -msgid "Editplain settings updated." -msgstr "Editplain nastavení aktualizováno" +msgid "Group Text settings updated." +msgstr "Nastavení textu skupiny aktualizováno." #: ../../addon/group_text/group_text.php:76 #: ../../addon.old/group_text/group_text.php:76 @@ -6926,16 +6985,24 @@ msgstr "Defaultně poslat na Libertree" msgid "Altpager settings updated." msgstr "Nastavení Altpager aktualizováno." -#: ../../addon/altpager/altpager.php:79 +#: ../../addon/altpager/altpager.php:83 #: ../../addon.old/altpager/altpager.php:79 msgid "Alternate Pagination Setting" msgstr "Alternate Pagination nastavení" -#: ../../addon/altpager/altpager.php:81 +#: ../../addon/altpager/altpager.php:85 #: ../../addon.old/altpager/altpager.php:81 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?" msgstr "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?" +#: ../../addon/altpager/altpager.php:99 +msgid "Force global use of the alternate pager" +msgstr "Vynutit globální použití alternativního stránkování" + +#: ../../addon/altpager/altpager.php:100 +msgid "Each user chooses whether to use the alternate pager" +msgstr "Každý uživatel si vybere, zda-li použije alternativní stránkování." + #: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -6957,6 +7024,12 @@ msgid "" "be either the MathJax CDN or another installation of MathJax." msgstr "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax." +#: ../../addon/editplain/editplain.php:46 +#: ../../addon.old/group_text/group_text.php:46 +#: ../../addon.old/editplain/editplain.php:46 +msgid "Editplain settings updated." +msgstr "Editplain nastavení aktualizováno" + #: ../../addon/editplain/editplain.php:76 #: ../../addon.old/editplain/editplain.php:76 msgid "Editplain Settings" @@ -7261,7 +7334,7 @@ msgstr "Poslat propojené #-tagy a @-jména na StatusNet" msgid "Clear OAuth configuration" msgstr "Vymazat konfiguraci OAuth" -#: ../../addon/statusnet/statusnet.php:568 +#: ../../addon/statusnet/statusnet.php:692 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "API URL" @@ -7271,30 +7344,42 @@ msgstr "API URL" msgid "Infinite Improbability Drive" msgstr "Infinite Improbability Drive" -#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36 +#: ../../addon/tumblr/tumblr.php:144 +msgid "You are now authenticated to tumblr." +msgstr "Nyní jste přihlášen k tumblr." + +#: ../../addon/tumblr/tumblr.php:145 +msgid "return to the connector page" +msgstr "návrat ke stránce konektor" + +#: ../../addon/tumblr/tumblr.php:158 ../../addon.old/tumblr/tumblr.php:36 msgid "Post to Tumblr" msgstr "Příspěvek na Tumbir" -#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67 +#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67 msgid "Tumblr Post Settings" msgstr "Nastavení příspěvků na Tumbir" -#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69 +#: ../../addon/tumblr/tumblr.php:188 +msgid "(Re-)Authenticate your tumblr page" +msgstr "(Znovu) přihlásit k Vaší tumblr stránce" + +#: ../../addon/tumblr/tumblr.php:192 ../../addon.old/tumblr/tumblr.php:69 msgid "Enable Tumblr Post Plugin" msgstr "Povolit rozšíření Tumbir" -#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74 -msgid "Tumblr login" -msgstr "Tumbir přihlašovací jméno" - -#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79 -msgid "Tumblr password" -msgstr "Tumbir heslo" - -#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84 +#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84 msgid "Post to Tumblr by default" msgstr "Standardně posílat příspěvky na Tumbir" +#: ../../addon/tumblr/tumblr.php:217 +msgid "Post to page:" +msgstr "Příspěvek ke stránce:" + +#: ../../addon/tumblr/tumblr.php:228 +msgid "You are not authenticated to tumblr" +msgstr "Nyní nejste přihlášen k tumblr." + #: ../../addon/numfriends/numfriends.php:46 #: ../../addon.old/numfriends/numfriends.php:46 msgid "Numfriends settings updated." @@ -7495,11 +7580,11 @@ msgstr "Defaultně zasílat veřejné komentáře na Twitter" msgid "Send linked #-tags and @-names to Twitter" msgstr "Poslat propojené #-tagy a @-jména na Twitter" -#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "Consumer key" -#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "Consumer secret" @@ -7637,135 +7722,137 @@ msgstr "Nastavení šířku grafické šablony" msgid "Color scheme" msgstr "Barevné schéma" -#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "Vaše příspěvky a konverzace" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 msgid "Your profile page" msgstr "Vaše profilová stránka" -#: ../../view/theme/diabook/theme.php:88 +#: ../../view/theme/diabook/theme.php:89 msgid "Your contacts" msgstr "Vaše kontakty" -#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 msgid "Your photos" msgstr "Vaše fotky" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 msgid "Your events" msgstr "Vaše události" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Personal notes" msgstr "Osobní poznámky" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Vaše osobní fotky" -#: ../../view/theme/diabook/theme.php:93 +#: ../../view/theme/diabook/theme.php:94 +#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Komunitní stránky" -#: ../../view/theme/diabook/theme.php:377 -#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/theme.php:384 +#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Komunitní profily" -#: ../../view/theme/diabook/theme.php:398 -#: ../../view/theme/diabook/theme.php:596 +#: ../../view/theme/diabook/theme.php:405 +#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Poslední uživatelé" -#: ../../view/theme/diabook/theme.php:427 -#: ../../view/theme/diabook/theme.php:598 +#: ../../view/theme/diabook/theme.php:434 +#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Poslední líbí/nelíbí" -#: ../../view/theme/diabook/theme.php:472 -#: ../../view/theme/diabook/theme.php:597 +#: ../../view/theme/diabook/theme.php:479 +#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Poslední fotografie" -#: ../../view/theme/diabook/theme.php:509 -#: ../../view/theme/diabook/theme.php:594 +#: ../../view/theme/diabook/theme.php:516 +#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Nalézt Přátele" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:517 msgid "Local Directory" msgstr "Lokální Adresář" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Podobné zájmy" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Pozvat přátele" -#: ../../view/theme/diabook/theme.php:531 -#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/theme.php:572 +#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Earth Layers" -#: ../../view/theme/diabook/theme.php:536 +#: ../../view/theme/diabook/theme.php:577 msgid "Set zoomfactor for Earth Layers" msgstr "Nastavit faktor přiblížení pro Earth Layers" -#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Nastavit zeměpistnou délku (X) pro Earth Layers" -#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Nastavit zeměpistnou šířku (X) pro Earth Layers" -#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Pomoc nebo @ProNováčky ?" -#: ../../view/theme/diabook/theme.php:558 -#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Propojené služby" -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:606 +#: ../../view/theme/diabook/theme.php:638 msgid "Last Tweets" msgstr "Poslední tweety" -#: ../../view/theme/diabook/theme.php:568 +#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Nastavit vyhledávací frázi na twitteru" -#: ../../view/theme/diabook/theme.php:587 -#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 +#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313 msgid "don't show" msgstr "nikdy nezobrazit" -#: ../../view/theme/diabook/theme.php:587 -#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 +#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312 msgid "show" msgstr "zobrazit" -#: ../../view/theme/diabook/theme.php:588 +#: ../../view/theme/diabook/theme.php:630 msgid "Show/hide boxes at right-hand column:" msgstr "Zobrazit/skrýt boxy na pravém sloupci:" @@ -7939,6 +8026,10 @@ msgstr "XMPP/IM" msgid "MySpace" msgstr "MySpace" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "Google+" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "Muž" @@ -8180,7 +8271,7 @@ msgstr "Začíná:" msgid "Finishes:" msgstr "Končí:" -#: ../../include/delivery.php:457 ../../include/notifier.php:767 +#: ../../include/delivery.php:457 ../../include/notifier.php:771 msgid "(no subject)" msgstr "(Bez předmětu)" @@ -8212,11 +8303,11 @@ msgstr "novější" msgid "older" msgstr "starší" -#: ../../include/text.php:597 +#: ../../include/text.php:604 msgid "No contacts" msgstr "Žádné kontakty" -#: ../../include/text.php:606 +#: ../../include/text.php:613 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" @@ -8224,207 +8315,207 @@ msgstr[0] "%d kontakt" msgstr[1] "%d kontaktů" msgstr[2] "%d kontaktů" -#: ../../include/text.php:719 +#: ../../include/text.php:726 msgid "poke" msgstr "šťouchnout" -#: ../../include/text.php:719 ../../include/conversation.php:210 +#: ../../include/text.php:726 ../../include/conversation.php:210 msgid "poked" msgstr "šťouchnut" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "ping" msgstr "cinknout" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "pinged" msgstr "cinkut" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prod" msgstr "pobídnout" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prodded" msgstr "pobídnut" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slap" msgstr "dát facku" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slapped" msgstr "být uhozen" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "finger" msgstr "" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "fingered" msgstr "" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuff" msgstr "odmítnout" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuffed" msgstr "odmítnut" -#: ../../include/text.php:736 +#: ../../include/text.php:743 msgid "happy" msgstr "šťasný" -#: ../../include/text.php:737 +#: ../../include/text.php:744 msgid "sad" msgstr "smutný" -#: ../../include/text.php:738 +#: ../../include/text.php:745 msgid "mellow" msgstr "jemný" -#: ../../include/text.php:739 +#: ../../include/text.php:746 msgid "tired" msgstr "unavený" -#: ../../include/text.php:740 +#: ../../include/text.php:747 msgid "perky" msgstr "emergický" -#: ../../include/text.php:741 +#: ../../include/text.php:748 msgid "angry" msgstr "nazlobený" -#: ../../include/text.php:742 +#: ../../include/text.php:749 msgid "stupified" msgstr "otupen" -#: ../../include/text.php:743 +#: ../../include/text.php:750 msgid "puzzled" msgstr "popletený" -#: ../../include/text.php:744 +#: ../../include/text.php:751 msgid "interested" msgstr "zajímavý" -#: ../../include/text.php:745 +#: ../../include/text.php:752 msgid "bitter" msgstr "hořký" -#: ../../include/text.php:746 +#: ../../include/text.php:753 msgid "cheerful" msgstr "radnostný" -#: ../../include/text.php:747 +#: ../../include/text.php:754 msgid "alive" msgstr "naživu" -#: ../../include/text.php:748 +#: ../../include/text.php:755 msgid "annoyed" msgstr "otráven" -#: ../../include/text.php:749 +#: ../../include/text.php:756 msgid "anxious" msgstr "znepokojený" -#: ../../include/text.php:750 +#: ../../include/text.php:757 msgid "cranky" msgstr "mrzutý" -#: ../../include/text.php:751 +#: ../../include/text.php:758 msgid "disturbed" msgstr "vyrušen" -#: ../../include/text.php:752 +#: ../../include/text.php:759 msgid "frustrated" msgstr "frustrovaný" -#: ../../include/text.php:753 +#: ../../include/text.php:760 msgid "motivated" msgstr "motivovaný" -#: ../../include/text.php:754 +#: ../../include/text.php:761 msgid "relaxed" msgstr "uvolněný" -#: ../../include/text.php:755 +#: ../../include/text.php:762 msgid "surprised" msgstr "překvapený" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "January" msgstr "Ledna" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "February" msgstr "Února" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "March" msgstr "Března" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "April" msgstr "Dubna" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "May" msgstr "Května" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "June" msgstr "Června" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "July" msgstr "Července" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "August" msgstr "Srpna" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "September" msgstr "Září" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "October" msgstr "Října" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "November" msgstr "Listopadu" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "December" msgstr "Prosinec" -#: ../../include/text.php:1005 +#: ../../include/text.php:1010 msgid "bytes" msgstr "bytů" -#: ../../include/text.php:1032 ../../include/text.php:1044 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "Klikněte pro otevření/zavření" -#: ../../include/text.php:1217 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "standardní" -#: ../../include/text.php:1229 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "Vyběr alternativního jazyka" -#: ../../include/text.php:1439 +#: ../../include/text.php:1444 msgid "activity" msgstr "aktivita" -#: ../../include/text.php:1442 +#: ../../include/text.php:1447 msgid "post" msgstr "příspěvek" -#: ../../include/text.php:1597 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "Položka vyplněna" @@ -8432,19 +8523,19 @@ msgstr "Položka vyplněna" msgid "Sharing notification from Diaspora network" msgstr "Sdílení oznámení ze sítě Diaspora" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "Přílohy:" -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "zobrazit v plné velikosti" -#: ../../include/oembed.php:137 +#: ../../include/oembed.php:138 msgid "Embedded content" msgstr "vložený obsah" -#: ../../include/oembed.php:146 +#: ../../include/oembed.php:147 msgid "Embedding disabled" msgstr "Vkládání zakázáno" @@ -8460,15 +8551,24 @@ msgstr "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s msgid "Error! I can't import this file: DB schema version is not compatible." msgstr "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní." -#: ../../include/uimport.php:92 +#: ../../include/uimport.php:81 +msgid "Error! Cannot check nickname" +msgstr "Chyba! Nelze ověřit přezdívku" + +#: ../../include/uimport.php:85 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "Uživatel '%s' již na tomto serveru existuje!" + +#: ../../include/uimport.php:104 msgid "User creation error" msgstr "Chyba vytváření uživatele" -#: ../../include/uimport.php:110 +#: ../../include/uimport.php:122 msgid "User profile creation error" msgstr "Chyba vytváření uživatelského účtu" -#: ../../include/uimport.php:155 +#: ../../include/uimport.php:167 #, php-format msgid "%d contact not imported" msgid_plural "%d contacts not imported" @@ -8476,7 +8576,7 @@ msgstr[0] "%d kontakt nenaimporován" msgstr[1] "%d kontaktů nenaimporováno" msgstr[2] "%d kontakty nenaimporovány" -#: ../../include/uimport.php:233 +#: ../../include/uimport.php:245 msgid "Done. You can now login with your username and password" msgstr "Hotovo. Nyní se můžete přihlásit se svými uživatelským účtem a heslem" @@ -8511,7 +8611,7 @@ msgstr "Vytvořit novou skupinu" msgid "Contacts not in any group" msgstr "Kontakty, které nejsou v žádné skupině" -#: ../../include/nav.php:46 ../../boot.php:926 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "Odhlásit se" @@ -8519,7 +8619,7 @@ msgstr "Odhlásit se" msgid "End this session" msgstr "Konec této relace" -#: ../../include/nav.php:49 ../../boot.php:1687 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "Stav" @@ -8567,55 +8667,63 @@ msgstr "Adresář" msgid "Conversations from your friends" msgstr "Konverzace od Vašich přátel" -#: ../../include/nav.php:121 +#: ../../include/nav.php:114 +msgid "Network Reset" +msgstr "Síťový Reset" + +#: ../../include/nav.php:114 +msgid "Load Network page with no filters" +msgstr "Načíst stránku Síť bez filtrů" + +#: ../../include/nav.php:122 msgid "Friend Requests" msgstr "Žádosti přátel" -#: ../../include/nav.php:123 +#: ../../include/nav.php:124 msgid "See all notifications" msgstr "Zobrazit všechny upozornění" -#: ../../include/nav.php:124 +#: ../../include/nav.php:125 msgid "Mark all system notifications seen" msgstr "Označit všechny upozornění systému jako přečtené" -#: ../../include/nav.php:128 +#: ../../include/nav.php:129 msgid "Private mail" msgstr "Soukromá pošta" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Inbox" msgstr "Doručená pošta" -#: ../../include/nav.php:130 +#: ../../include/nav.php:131 msgid "Outbox" msgstr "Odeslaná pošta" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage" msgstr "Spravovat" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage other pages" msgstr "Spravovat jiné stránky" -#: ../../include/nav.php:138 ../../boot.php:1201 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "Profily" -#: ../../include/nav.php:138 ../../boot.php:1201 -msgid "Manage/edit profiles" -msgstr "Spravovat/upravit profily" +#: ../../include/nav.php:140 +msgid "Manage/Edit Profiles" +msgstr "Spravovat/Editovat Profily" -#: ../../include/nav.php:139 +#: ../../include/nav.php:142 msgid "Manage/edit friends and contacts" msgstr "Spravovat/upravit přátelé a kontakty" -#: ../../include/nav.php:146 +#: ../../include/nav.php:149 msgid "Site setup and configuration" msgstr "Nastavení webu a konfigurace" -#: ../../include/nav.php:170 +#: ../../include/nav.php:173 msgid "Nothing new here" msgstr "Zde není nic nového" @@ -8659,37 +8767,37 @@ msgstr "Příklady: Robert Morgenstein, rybaření" msgid "Random Profile" msgstr "Náhodný Profil" -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:70 msgid "Networks" msgstr "Sítě" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:73 msgid "All Networks" msgstr "Všechny sítě" -#: ../../include/contact_widgets.php:98 +#: ../../include/contact_widgets.php:103 ../../include/features.php:59 msgid "Saved Folders" msgstr "Uložené složky" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 +#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138 msgid "Everything" msgstr "Všechno" -#: ../../include/contact_widgets.php:126 +#: ../../include/contact_widgets.php:135 msgid "Categories" msgstr "Kategorie" -#: ../../include/auth.php:35 +#: ../../include/auth.php:36 msgid "Logged out." msgstr "Odhlášen." -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. " -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "The error message was:" msgstr "Chybová zpráva byla:" @@ -8750,42 +8858,190 @@ msgstr "sekund" msgid "%1$d %2$s ago" msgstr "před %1$d %2$s" -#: ../../include/datetime.php:472 ../../include/items.php:1689 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "%s má narozeniny" -#: ../../include/datetime.php:473 ../../include/items.php:1690 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "Veselé narozeniny %s" -#: ../../include/onepoll.php:414 +#: ../../include/onepoll.php:421 msgid "From: " msgstr "Od:" -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "Obrázek/fotografie" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "$1 napsal:" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 msgid "Encrypted content" msgstr "Šifrovaný obsah" +#: ../../include/features.php:23 +msgid "General Features" +msgstr "Obecné funkčnosti" + +#: ../../include/features.php:25 +msgid "Multiple Profiles" +msgstr "Vícenásobné profily" + +#: ../../include/features.php:25 +msgid "Ability to create multiple profiles" +msgstr "Schopnost vytvořit vícenásobné profily" + +#: ../../include/features.php:30 +msgid "Post Composition Features" +msgstr "Nastavení vytváření příspěvků" + +#: ../../include/features.php:31 +msgid "Richtext Editor" +msgstr "Richtext Editor" + +#: ../../include/features.php:31 +msgid "Enable richtext editor" +msgstr "Povolit richtext editor" + +#: ../../include/features.php:32 +msgid "Post Preview" +msgstr "Náhled příspěvku" + +#: ../../include/features.php:32 +msgid "Allow previewing posts and comments before publishing them" +msgstr "Povolit náhledy příspěvků a komentářů před jejich zveřejněním" + +#: ../../include/features.php:37 +msgid "Network Sidebar Widgets" +msgstr "Síťové postranní widgety" + +#: ../../include/features.php:38 +msgid "Search by Date" +msgstr "Vyhledávat dle Data" + +#: ../../include/features.php:38 +msgid "Ability to select posts by date ranges" +msgstr "Možnost označit příspěvky dle časového intervalu" + +#: ../../include/features.php:39 +msgid "Group Filter" +msgstr "Skupinový Filtr" + +#: ../../include/features.php:39 +msgid "Enable widget to display Network posts only from selected group" +msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny" + +#: ../../include/features.php:40 +msgid "Network Filter" +msgstr "Síťový Filtr" + +#: ../../include/features.php:40 +msgid "Enable widget to display Network posts only from selected network" +msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě" + +#: ../../include/features.php:41 +msgid "Save search terms for re-use" +msgstr "Uložit kritéria vyhledávání pro znovupoužití" + +#: ../../include/features.php:46 +msgid "Network Tabs" +msgstr "Síťové záložky" + +#: ../../include/features.php:47 +msgid "Network Personal Tab" +msgstr "Osobní síťový záložka " + +#: ../../include/features.php:47 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval " + +#: ../../include/features.php:48 +msgid "Network New Tab" +msgstr "Nová záložka síť" + +#: ../../include/features.php:48 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" +msgstr "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)" + +#: ../../include/features.php:49 +msgid "Network Shared Links Tab" +msgstr "záložka Síťové sdílené odkazy " + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts with links in them" +msgstr "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně" + +#: ../../include/features.php:54 +msgid "Post/Comment Tools" +msgstr "Nástroje Příspěvků/Komentářů" + +#: ../../include/features.php:55 +msgid "Multiple Deletion" +msgstr "Násobné mazání" + +#: ../../include/features.php:55 +msgid "Select and delete multiple posts/comments at once" +msgstr "Označit a smazat více " + +#: ../../include/features.php:56 +msgid "Edit Sent Posts" +msgstr "Editovat Odeslané příspěvky" + +#: ../../include/features.php:56 +msgid "Edit and correct posts and comments after sending" +msgstr "Editovat a opravit příspěvky a komentáře po odeslání" + +#: ../../include/features.php:57 +msgid "Tagging" +msgstr "Štítkování" + +#: ../../include/features.php:57 +msgid "Ability to tag existing posts" +msgstr "Schopnost přidat štítky ke stávajícím příspvěkům" + +#: ../../include/features.php:58 +msgid "Post Categories" +msgstr "Kategorie příspěvků" + +#: ../../include/features.php:58 +msgid "Add categories to your posts" +msgstr "Přidat kategorie k Vašim příspěvkům" + +#: ../../include/features.php:59 +msgid "Ability to file posts under folders" +msgstr "Možnost řadit příspěvky do složek" + +#: ../../include/features.php:60 +msgid "Dislike Posts" +msgstr "Označit příspěvky jako neoblíbené" + +#: ../../include/features.php:60 +msgid "Ability to dislike posts/comments" +msgstr "Možnost označit příspěvky/komentáře jako neoblíbené" + +#: ../../include/features.php:61 +msgid "Star Posts" +msgstr "Příspěvky s hvězdou" + +#: ../../include/features.php:61 +msgid "Ability to mark special posts with a star indicator" +msgstr "Možnost označit příspěvky s indikátorem hvězdy" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Nelze nalézt záznam v DNS pro databázový server '%s'" -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "[bez předmětu]" -#: ../../include/acl_selectors.php:286 +#: ../../include/acl_selectors.php:311 msgid "Visible to everybody" msgstr "Viditelné pro všechny" @@ -9030,15 +9286,15 @@ msgstr "Nepodařilo se získat kontaktní informace." msgid "following" msgstr "následující" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "Nový člověk si s vámi sdílí na" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "Máte nového následovníka na" -#: ../../include/items.php:4038 +#: ../../include/items.php:4047 msgid "Archives" msgstr "Archív" @@ -9122,7 +9378,7 @@ msgstr "Prosím nahrejte profilovou fotografii" msgid "Welcome back " msgstr "Vítejte zpět " -#: ../../include/security.php:354 +#: ../../include/security.php:357 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." @@ -9177,11 +9433,11 @@ 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:599 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:226 msgid "Categories:" msgstr "Kategorie:" -#: ../../include/conversation.php:600 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:227 msgid "Filed under:" msgstr "Vyplněn pod:" @@ -9221,46 +9477,46 @@ msgstr "%2$d lidem se to nelíbí." msgid "and" msgstr "a" -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:875 #, php-format msgid ", and %d other people" msgstr ", a %d dalších lidí" -#: ../../include/conversation.php:873 +#: ../../include/conversation.php:877 #, php-format msgid "%s like this." msgstr "%s se to líbí." -#: ../../include/conversation.php:873 +#: ../../include/conversation.php:877 #, php-format msgid "%s don't like this." msgstr "%s se to nelíbí." -#: ../../include/conversation.php:897 ../../include/conversation.php:915 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "Viditelné pro všechny" -#: ../../include/conversation.php:899 ../../include/conversation.php:917 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "Prosím zadejte URL adresu videa:" -#: ../../include/conversation.php:900 ../../include/conversation.php:918 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "Prosím zadejte URL adresu zvukového záznamu:" -#: ../../include/conversation.php:901 ../../include/conversation.php:919 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "Štítek:" -#: ../../include/conversation.php:903 ../../include/conversation.php:921 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "Kde právě jste?" -#: ../../include/conversation.php:904 +#: ../../include/conversation.php:911 msgid "Delete item(s)?" msgstr "Smazat položku(y)?" -#: ../../include/conversation.php:983 +#: ../../include/conversation.php:990 msgid "permissions" msgstr "oprávnění" @@ -9276,105 +9532,117 @@ msgstr "Tato akce překročí limit nastavené Vaším předplatným." msgid "This action is not available under your subscription plan." msgstr "Tato akce není v rámci Vašeho předplatného dostupná." -#: ../../boot.php:588 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "Odstranit tuto položku?" -#: ../../boot.php:591 +#: ../../boot.php:610 msgid "show fewer" msgstr "zobrazit méně" -#: ../../boot.php:798 +#: ../../boot.php:819 #, php-format msgid "Update %s failed. See error logs." msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb." -#: ../../boot.php:800 +#: ../../boot.php:821 #, php-format msgid "Update Error at %s" msgstr "Chyba aktualizace na %s" -#: ../../boot.php:901 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "Vytvořit nový účet" -#: ../../boot.php:929 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "Přezdívka nebo e-mailová adresa:" -#: ../../boot.php:930 +#: ../../boot.php:952 msgid "Password: " msgstr "Heslo: " -#: ../../boot.php:933 +#: ../../boot.php:953 +msgid "Remember me" +msgstr "Pamatuj si mne" + +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "Nebo přihlášení pomocí OpenID: " -#: ../../boot.php:939 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "Zapomněli jste své heslo?" -#: ../../boot.php:1050 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "Požadovaný účet není dostupný." -#: ../../boot.php:1127 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "Upravit profil" -#: ../../boot.php:1193 +#: ../../boot.php:1230 msgid "Message" msgstr "Zpráva" -#: ../../boot.php:1315 ../../boot.php:1401 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "Spravovat/upravit profily" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "g A l F d" -#: ../../boot.php:1316 ../../boot.php:1402 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "d. F" -#: ../../boot.php:1361 ../../boot.php:1442 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "[Dnes]" -#: ../../boot.php:1373 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "Připomínka narozenin" -#: ../../boot.php:1374 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "Narozeniny tento týden:" -#: ../../boot.php:1435 +#: ../../boot.php:1472 msgid "[No description]" msgstr "[Žádný popis]" -#: ../../boot.php:1453 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "Připomenutí událostí" -#: ../../boot.php:1454 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "Události tohoto týdne:" -#: ../../boot.php:1690 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "Statusové zprávy a příspěvky " -#: ../../boot.php:1697 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "Detaily profilu" -#: ../../boot.php:1714 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "Události a kalendář" -#: ../../boot.php:1721 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "Toto můžete vidět jen Vy" -#: ../../index.php:380 +#: ../../object/Item.php:238 +msgid "via" +msgstr "přes" + +#: ../../index.php:398 msgid "toggle mobile" msgstr "přepnout mobil" @@ -9433,3 +9701,11 @@ msgstr "Použití OEmbed pro videa na YouTube" #: ../../addon.old/oembed.old/oembed.php:71 msgid "URL to embed:" msgstr "URL adresa k vložení:" + +#: ../../addon.old/tumblr/tumblr.php:74 +msgid "Tumblr login" +msgstr "Tumbir přihlašovací jméno" + +#: ../../addon.old/tumblr/tumblr.php:79 +msgid "Tumblr password" +msgstr "Tumbir heslo" diff --git a/view/cs/strings.php b/view/cs/strings.php index cf5b9281c9..65b365115e 100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php @@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "Veřejný přístup odepřen."; $a->strings["No photos selected"] = "Není vybrána žádná fotografie"; $a->strings["Access to this item is restricted."] = "Přístup k této položce je omezen."; $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií."; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Použil jste %1$.2f Mbytes kapacity úložiště fotografií."; $a->strings["Upload Photos"] = "Nahrání fotografií "; $a->strings["New album name: "] = "Název nového alba: "; $a->strings["or existing album name: "] = "nebo stávající název alba: "; @@ -457,10 +456,12 @@ $a->strings["Forgot your Password?"] = "Zapomněli jste heslo?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce."; $a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: "; $a->strings["Reset"] = "Reset"; +$a->strings["Additional features"] = "Další funkčnosti"; $a->strings["Missing some important data!"] = "Chybí některé důležité údaje!"; $a->strings["Update"] = "Aktualizace"; $a->strings["Failed to connect with email account using the settings provided."] = "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."; $a->strings["Email settings updated."] = "Nastavení e-mailu aktualizována."; +$a->strings["Features updated"] = "Aktualizované funkčnosti"; $a->strings["Passwords do not match. Password unchanged."] = "Hesla se neshodují. Heslo nebylo změněno."; $a->strings["Empty passwords are not allowed. Password unchanged."] = "Prázdné hesla nejsou povolena. Heslo nebylo změněno."; $a->strings["Password changed."] = "Heslo bylo změněno."; @@ -484,6 +485,9 @@ $a->strings["No name"] = "Bez názvu"; $a->strings["Remove authorization"] = "Odstranit oprávnění"; $a->strings["No Plugin settings configured"] = "Žádný doplněk není nastaven"; $a->strings["Plugin Settings"] = "Nastavení doplňku"; +$a->strings["Off"] = "Vypnuto"; +$a->strings["On"] = "Zapnuto"; +$a->strings["Additional Features"] = "Další Funkčnosti"; $a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s"; $a->strings["enabled"] = "povoleno"; $a->strings["disabled"] = "zakázáno"; @@ -593,10 +597,10 @@ $a->strings["Sort by Post Date"] = "Řadit podle data příspěvku"; $a->strings["Posts that mention or involve you"] = "Příspěvky, které Vás zmiňují nebo zahrnují"; $a->strings["New"] = "Nové"; $a->strings["Activity Stream - by date"] = "Proud aktivit - dle data"; -$a->strings["Starred"] = "S hvězdičkou"; -$a->strings["Favourite Posts"] = "Oblíbené přízpěvky"; $a->strings["Shared Links"] = "Sdílené odkazy"; $a->strings["Interesting Links"] = "Zajímavé odkazy"; +$a->strings["Starred"] = "S hvězdičkou"; +$a->strings["Favourite Posts"] = "Oblíbené přízpěvky"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Upozornění: Tato skupina obsahuje %s člena z nezabezpečené sítě.", 1 => "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě.", @@ -608,9 +612,10 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Neplatný kontakt."; $a->strings["Personal Notes"] = "Osobní poznámky"; $a->strings["Save"] = "Uložit"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to zítra znovu."; $a->strings["Import"] = "Import"; $a->strings["Move account"] = "Přesunout účet"; -$a->strings["You can move here an account from another Friendica server.
\r\n You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Zde si můžete přesunout účet z jiného serveru Friendika.
\n Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory"; +$a->strings["You can import an account from another Friendica server.
\r\n You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "Je možné importovat účet z jiného Friendica serveru.
\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.
\nTato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory."; $a->strings["Account file"] = "Soubor s účtem"; $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\""; $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena."; @@ -688,7 +693,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] = $a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat."; $a->strings["Registration request at %s"] = "Žádost o registraci na %s"; $a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru."; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to zítra znovu."; $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'."; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."; $a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): "; @@ -812,6 +816,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De $a->strings["JPEG image quality"] = "JPEG kvalita obrázku"; $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Defaultní je 100, což znamená plnou kvalitu."; $a->strings["Register policy"] = "Politika registrace"; +$a->strings["Maximum Daily Registrations"] = "Maximální počet denních registrací"; +$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."] = "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt."; $a->strings["Register text"] = "Registrace textu"; $a->strings["Will be displayed prominently on the registration page."] = "Bude zřetelně zobrazeno na registrační stránce."; $a->strings["Accounts abandoned after x days"] = "Účet je opuštěn po x dnech"; @@ -969,6 +975,7 @@ $a->strings["New profile created."] = "Nový profil vytvořen."; $a->strings["Profile unavailable to clone."] = "Profil není možné naklonovat."; $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?"; $a->strings["Edit Profile Details"] = "Upravit podrobnosti profilu "; +$a->strings["Change Profile Photo"] = "Změna Profilové fotky"; $a->strings["View this profile"] = "Zobrazit tento profil"; $a->strings["Create a new profile using these settings"] = "Vytvořit nový profil pomocí tohoto nastavení"; $a->strings["Clone this profile"] = "Klonovat tento profil"; @@ -1147,6 +1154,8 @@ $a->strings["Facebook Post disabled"] = "Příspěvky na Facebook zakázán."; $a->strings["Facebook Post"] = "Facebook příspěvek"; $a->strings["Install Facebook Post connector for this account."] = "Instalovat pro tento účet konektor pro příspěvky na Facebook."; $a->strings["Remove Facebook Post connector"] = "Odstranit konektor pro příspěvky na Facebook"; +$a->strings["Suppress \"View on friendica\""] = "Potlačit \"Zobrazit na friendica\""; +$a->strings["Post to page/group:"] = "Příspěvek na stránku/skupinu"; $a->strings["Facebook Post Settings"] = "Nastavení konektoru pro příspěvky na Facebook"; $a->strings["%d person likes this"] = array( 0 => "%d člověku se toto líbí", @@ -1227,6 +1236,7 @@ $a->strings["Randomise Page/Forum list"] = "Náhodný stránka/fórum seznam"; $a->strings["Show pages/forums on profile page"] = "Zobrazit stránky/fóra na profilové stránce"; $a->strings["Planets Settings"] = "Nastavení Planets"; $a->strings["Enable Planets Plugin"] = "Povolit Planets plugin"; +$a->strings["Forum Directory"] = "Adresář Fór"; $a->strings["Login"] = "Přihlásit se"; $a->strings["OpenID"] = "OpenID"; $a->strings["Latest users"] = "Poslední uživatelé"; @@ -1450,7 +1460,7 @@ $a->strings["Tile Server URL"] = "URL adresa Tile serveru"; $a->strings["A list of public tile servers"] = "Seznam veřejných tile serverů"; $a->strings["Default zoom"] = "Defaultní přiblížení"; $a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)"; -$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno"; +$a->strings["Group Text settings updated."] = "Nastavení textu skupiny aktualizováno."; $a->strings["Group Text"] = "Skupinový text"; $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Použijte pouze textový (neobrázkový) výběr skupiny v menu editace skupin."; $a->strings["Could NOT install Libravatar successfully.
It requires PHP >= 5.3"] = "Libravatar není možné úspěšně nainstalovat .
Vyžaduje PHP >= 5.3"; @@ -1475,10 +1485,13 @@ $a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree"; $a->strings["Altpager settings updated."] = "Nastavení Altpager aktualizováno."; $a->strings["Alternate Pagination Setting"] = "Alternate Pagination nastavení"; $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?"; +$a->strings["Force global use of the alternate pager"] = "Vynutit globální použití alternativního stránkování"; +$a->strings["Each user chooses whether to use the alternate pager"] = "Každý uživatel si vybere, zda-li použije alternativní stránkování."; $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\" v příspěvcích na Vaší zdi, záložce síť a soukromých zprávách."; $a->strings["Use the MathJax renderer"] = "Použít Mathjax vykreslování"; $a->strings["MathJax Base URL"] = "Základní MathJax adresa URL"; $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax."; +$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno"; $a->strings["Editplain Settings"] = "Nastavení Editplain"; $a->strings["Disable richtext status editor"] = "Zakázat richtext status editor"; $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.
Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno."; @@ -1537,12 +1550,15 @@ $a->strings["Send linked #-tags and @-names to StatusNet"] = "Poslat propojené $a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth"; $a->strings["API URL"] = "API URL"; $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive"; +$a->strings["You are now authenticated to tumblr."] = "Nyní jste přihlášen k tumblr."; +$a->strings["return to the connector page"] = "návrat ke stránce konektor"; $a->strings["Post to Tumblr"] = "Příspěvek na Tumbir"; $a->strings["Tumblr Post Settings"] = "Nastavení příspěvků na Tumbir"; +$a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce"; $a->strings["Enable Tumblr Post Plugin"] = "Povolit rozšíření Tumbir"; -$a->strings["Tumblr login"] = "Tumbir přihlašovací jméno"; -$a->strings["Tumblr password"] = "Tumbir heslo"; $a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir"; +$a->strings["Post to page:"] = "Příspěvek ke stránce:"; +$a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr."; $a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno"; $a->strings["Numfriends Settings"] = "Nastavení Numfriends"; $a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu"; @@ -1685,6 +1701,7 @@ $a->strings["Zot!"] = "Zot!"; $a->strings["LinkedIn"] = "LinkedIn"; $a->strings["XMPP/IM"] = "XMPP/IM"; $a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = "Google+"; $a->strings["Male"] = "Muž"; $a->strings["Female"] = "Žena"; $a->strings["Currently Male"] = "V současné době muž"; @@ -1818,6 +1835,8 @@ $a->strings["Embedding disabled"] = "Vkládání zakázáno"; $a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu"; $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?"; $a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní."; +$a->strings["Error! Cannot check nickname"] = "Chyba! Nelze ověřit přezdívku"; +$a->strings["User '%s' already exists on this server!"] = "Uživatel '%s' již na tomto serveru existuje!"; $a->strings["User creation error"] = "Chyba vytváření uživatele"; $a->strings["User profile creation error"] = "Chyba vytváření uživatelského účtu"; $a->strings["%d contact not imported"] = array( @@ -1847,6 +1866,8 @@ $a->strings["Conversations on this site"] = "Konverzace na tomto webu"; $a->strings["Directory"] = "Adresář"; $a->strings["People directory"] = "Adresář"; $a->strings["Conversations from your friends"] = "Konverzace od Vašich přátel"; +$a->strings["Network Reset"] = "Síťový Reset"; +$a->strings["Load Network page with no filters"] = "Načíst stránku Síť bez filtrů"; $a->strings["Friend Requests"] = "Žádosti přátel"; $a->strings["See all notifications"] = "Zobrazit všechny upozornění"; $a->strings["Mark all system notifications seen"] = "Označit všechny upozornění systému jako přečtené"; @@ -1856,7 +1877,7 @@ $a->strings["Outbox"] = "Odeslaná pošta"; $a->strings["Manage"] = "Spravovat"; $a->strings["Manage other pages"] = "Spravovat jiné stránky"; $a->strings["Profiles"] = "Profily"; -$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily"; +$a->strings["Manage/Edit Profiles"] = "Spravovat/Editovat Profily"; $a->strings["Manage/edit friends and contacts"] = "Spravovat/upravit přátelé a kontakty"; $a->strings["Site setup and configuration"] = "Nastavení webu a konfigurace"; $a->strings["Nothing new here"] = "Zde není nic nového"; @@ -1901,6 +1922,43 @@ $a->strings["From: "] = "Od:"; $a->strings["Image/photo"] = "Obrázek/fotografie"; $a->strings["$1 wrote:"] = "$1 napsal:"; $a->strings["Encrypted content"] = "Šifrovaný obsah"; +$a->strings["General Features"] = "Obecné funkčnosti"; +$a->strings["Multiple Profiles"] = "Vícenásobné profily"; +$a->strings["Ability to create multiple profiles"] = "Schopnost vytvořit vícenásobné profily"; +$a->strings["Post Composition Features"] = "Nastavení vytváření příspěvků"; +$a->strings["Richtext Editor"] = "Richtext Editor"; +$a->strings["Enable richtext editor"] = "Povolit richtext editor"; +$a->strings["Post Preview"] = "Náhled příspěvku"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Povolit náhledy příspěvků a komentářů před jejich zveřejněním"; +$a->strings["Network Sidebar Widgets"] = "Síťové postranní widgety"; +$a->strings["Search by Date"] = "Vyhledávat dle Data"; +$a->strings["Ability to select posts by date ranges"] = "Možnost označit příspěvky dle časového intervalu"; +$a->strings["Group Filter"] = "Skupinový Filtr"; +$a->strings["Enable widget to display Network posts only from selected group"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny"; +$a->strings["Network Filter"] = "Síťový Filtr"; +$a->strings["Enable widget to display Network posts only from selected network"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě"; +$a->strings["Save search terms for re-use"] = "Uložit kritéria vyhledávání pro znovupoužití"; +$a->strings["Network Tabs"] = "Síťové záložky"; +$a->strings["Network Personal Tab"] = "Osobní síťový záložka "; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval "; +$a->strings["Network New Tab"] = "Nová záložka síť"; +$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)"; +$a->strings["Network Shared Links Tab"] = "záložka Síťové sdílené odkazy "; +$a->strings["Enable tab to display only Network posts with links in them"] = "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně"; +$a->strings["Post/Comment Tools"] = "Nástroje Příspěvků/Komentářů"; +$a->strings["Multiple Deletion"] = "Násobné mazání"; +$a->strings["Select and delete multiple posts/comments at once"] = "Označit a smazat více "; +$a->strings["Edit Sent Posts"] = "Editovat Odeslané příspěvky"; +$a->strings["Edit and correct posts and comments after sending"] = "Editovat a opravit příspěvky a komentáře po odeslání"; +$a->strings["Tagging"] = "Štítkování"; +$a->strings["Ability to tag existing posts"] = "Schopnost přidat štítky ke stávajícím příspvěkům"; +$a->strings["Post Categories"] = "Kategorie příspěvků"; +$a->strings["Add categories to your posts"] = "Přidat kategorie k Vašim příspěvkům"; +$a->strings["Ability to file posts under folders"] = "Možnost řadit příspěvky do složek"; +$a->strings["Dislike Posts"] = "Označit příspěvky jako neoblíbené"; +$a->strings["Ability to dislike posts/comments"] = "Možnost označit příspěvky/komentáře jako neoblíbené"; +$a->strings["Star Posts"] = "Příspěvky s hvězdou"; +$a->strings["Ability to mark special posts with a star indicator"] = "Možnost označit příspěvky s indikátorem hvězdy"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Nelze nalézt záznam v DNS pro databázový server '%s'"; $a->strings["[no subject]"] = "[bez předmětu]"; $a->strings["Visible to everybody"] = "Viditelné pro všechny"; @@ -2018,11 +2076,13 @@ $a->strings["Update Error at %s"] = "Chyba aktualizace na %s"; $a->strings["Create a New Account"] = "Vytvořit nový účet"; $a->strings["Nickname or Email address: "] = "Přezdívka nebo e-mailová adresa:"; $a->strings["Password: "] = "Heslo: "; +$a->strings["Remember me"] = "Pamatuj si mne"; $a->strings["Or login using OpenID: "] = "Nebo přihlášení pomocí OpenID: "; $a->strings["Forgot your password?"] = "Zapomněli jste své heslo?"; $a->strings["Requested account is not available."] = "Požadovaný účet není dostupný."; $a->strings["Edit profile"] = "Upravit profil"; $a->strings["Message"] = "Zpráva"; +$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily"; $a->strings["g A l F d"] = "g A l F d"; $a->strings["F d"] = "d. F"; $a->strings["[today]"] = "[Dnes]"; @@ -2035,6 +2095,7 @@ $a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky "; $a->strings["Profile Details"] = "Detaily profilu"; $a->strings["Events and Calendar"] = "Události a kalendář"; $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy"; +$a->strings["via"] = "přes"; $a->strings["toggle mobile"] = "přepnout mobil"; $a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno."; $a->strings["Bg Settings"] = "Nastavení Bg"; @@ -2050,3 +2111,5 @@ $a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal "; $a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno"; $a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube"; $a->strings["URL to embed:"] = "URL adresa k vložení:"; +$a->strings["Tumblr login"] = "Tumbir přihlašovací jméno"; +$a->strings["Tumblr password"] = "Tumbir heslo"; From 96ed0a77912e049799dc81761f1dbe4a9eec5757 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sat, 22 Dec 2012 12:57:29 -0700 Subject: [PATCH 07/40] Implement Smarty3 --- boot.php | 44 ++- include/conversation.php | 67 +++- include/friendica_smarty.php | 36 ++ include/text.php | 114 ++++-- mod/admin.php | 33 +- mod/contacts.php | 17 +- mod/content.php | 59 ++- mod/directory.php | 15 +- mod/display.php | 2 +- mod/fbrowser.php | 20 +- mod/filer.php | 6 + mod/group.php | 14 +- mod/hostxrd.php | 16 +- mod/install.php | 17 +- mod/message.php | 132 +++++-- mod/nogroup.php | 9 +- mod/notifications.php | 64 ++- mod/notify.php | 11 +- mod/photos.php | 115 +++++- mod/poco.php | 10 +- mod/profile.php | 1 + mod/profile_photo.php | 4 +- mod/settings.php | 67 +++- mod/uimport.php | 14 +- mod/viewcontacts.php | 8 +- mod/xrd.php | 6 +- mods/friendica-to-smarty-tpl.py | 198 ++++++++++ object/Item.php | 41 +- view/admin_logs.tpl | 6 +- view/admin_remoteupdate.tpl | 8 +- view/admin_site.tpl | 70 ++-- view/api_friends_xml.tpl | 6 +- view/api_timeline_xml.tpl | 2 +- view/ca/smarty3/cmnt_received_eml.tpl | 18 + view/ca/smarty3/follow_notify_eml.tpl | 13 + view/ca/smarty3/friend_complete_eml.tpl | 19 + view/ca/smarty3/htconfig.tpl | 68 ++++ view/ca/smarty3/intro_complete_eml.tpl | 21 + view/ca/smarty3/lostpass_eml.tpl | 35 ++ .../smarty3/mail_received_html_body_eml.tpl | 24 ++ .../smarty3/mail_received_text_body_eml.tpl | 9 + view/ca/smarty3/passchanged_eml.tpl | 19 + view/ca/smarty3/register_open_eml.tpl | 22 ++ view/ca/smarty3/register_verify_eml.tpl | 23 ++ view/ca/smarty3/request_notify_eml.tpl | 13 + view/ca/smarty3/wall_received_eml.tpl | 18 + view/contact_edit.tpl | 2 +- view/contacts-template.tpl | 4 +- view/cs/smarty3/cmnt_received_eml.tpl | 14 + .../smarty3/cmnt_received_html_body_eml.tpl | 25 ++ .../smarty3/cmnt_received_text_body_eml.tpl | 14 + view/cs/smarty3/follow_notify_eml.tpl | 14 + view/cs/smarty3/friend_complete_eml.tpl | 17 + view/cs/smarty3/htconfig.tpl | 73 ++++ view/cs/smarty3/intro_complete_eml.tpl | 17 + view/cs/smarty3/lostpass_eml.tpl | 23 ++ .../smarty3/mail_received_html_body_eml.tpl | 25 ++ .../smarty3/mail_received_text_body_eml.tpl | 10 + view/cs/smarty3/passchanged_eml.tpl | 14 + view/cs/smarty3/register_open_eml.tpl | 23 ++ view/cs/smarty3/register_verify_eml.tpl | 22 ++ view/cs/smarty3/request_notify_eml.tpl | 15 + view/cs/smarty3/wall_received_eml.tpl | 14 + .../smarty3/wall_received_html_body_eml.tpl | 24 ++ .../smarty3/wall_received_text_body_eml.tpl | 14 + view/de/smarty3/cmnt_received_eml.tpl | 17 + .../smarty3/cmnt_received_html_body_eml.tpl | 25 ++ .../smarty3/cmnt_received_text_body_eml.tpl | 16 + view/de/smarty3/follow_notify_eml.tpl | 14 + view/de/smarty3/friend_complete_eml.tpl | 22 ++ view/de/smarty3/htconfig.tpl | 68 ++++ view/de/smarty3/intro_complete_eml.tpl | 22 ++ view/de/smarty3/lostpass_eml.tpl | 32 ++ .../smarty3/mail_received_html_body_eml.tpl | 26 ++ .../smarty3/mail_received_text_body_eml.tpl | 11 + view/de/smarty3/passchanged_eml.tpl | 20 + view/de/smarty3/register_open_eml.tpl | 34 ++ view/de/smarty3/register_verify_eml.tpl | 25 ++ view/de/smarty3/request_notify_eml.tpl | 17 + view/de/smarty3/update_fail_eml.tpl | 11 + view/de/smarty3/wall_received_eml.tpl | 18 + .../smarty3/wall_received_html_body_eml.tpl | 24 ++ .../smarty3/wall_received_text_body_eml.tpl | 18 + view/directory_item.tpl | 2 +- view/en/smarty3/follow_notify_eml.tpl | 14 + view/en/smarty3/friend_complete_eml.tpl | 22 ++ view/en/smarty3/htconfig.tpl | 71 ++++ view/en/smarty3/intro_complete_eml.tpl | 22 ++ view/en/smarty3/lostpass_eml.tpl | 32 ++ view/en/smarty3/passchanged_eml.tpl | 20 + view/en/smarty3/register_open_eml.tpl | 34 ++ view/en/smarty3/register_verify_eml.tpl | 26 ++ view/en/smarty3/request_notify_eml.tpl | 17 + view/en/smarty3/update_fail_eml.tpl | 11 + view/eo/smarty3/follow_notify_eml.tpl | 14 + view/eo/smarty3/friend_complete_eml.tpl | 22 ++ view/eo/smarty3/intro_complete_eml.tpl | 22 ++ view/eo/smarty3/lostpass_eml.tpl | 32 ++ view/eo/smarty3/passchanged_eml.tpl | 20 + view/eo/smarty3/register_open_eml.tpl | 34 ++ view/eo/smarty3/register_verify_eml.tpl | 25 ++ view/eo/smarty3/request_notify_eml.tpl | 17 + view/eo/smarty3/update_fail_eml.tpl | 11 + view/es/smarty3/cmnt_received_eml.tpl | 18 + view/es/smarty3/follow_notify_eml.tpl | 13 + view/es/smarty3/friend_complete_eml.tpl | 19 + view/es/smarty3/htconfig.tpl | 68 ++++ view/es/smarty3/intro_complete_eml.tpl | 21 + view/es/smarty3/lostpass_eml.tpl | 34 ++ .../smarty3/mail_received_html_body_eml.tpl | 24 ++ .../smarty3/mail_received_text_body_eml.tpl | 9 + view/es/smarty3/passchanged_eml.tpl | 19 + view/es/smarty3/register_open_eml.tpl | 21 + view/es/smarty3/register_verify_eml.tpl | 22 ++ view/es/smarty3/request_notify_eml.tpl | 13 + view/es/smarty3/wall_received_eml.tpl | 18 + view/field.tpl | 2 +- view/filer_dialog.tpl | 2 +- view/fr/smarty3/cmnt_received_eml.tpl | 18 + .../smarty3/cmnt_received_html_body_eml.tpl | 25 ++ .../smarty3/cmnt_received_text_body_eml.tpl | 15 + view/fr/smarty3/follow_notify_eml.tpl | 14 + view/fr/smarty3/friend_complete_eml.tpl | 23 ++ view/fr/smarty3/htconfig.tpl | 68 ++++ view/fr/smarty3/intro_complete_eml.tpl | 22 ++ view/fr/smarty3/lostpass_eml.tpl | 34 ++ .../smarty3/mail_received_html_body_eml.tpl | 25 ++ .../smarty3/mail_received_text_body_eml.tpl | 10 + view/fr/smarty3/passchanged_eml.tpl | 20 + view/fr/smarty3/register_open_eml.tpl | 22 ++ view/fr/smarty3/register_verify_eml.tpl | 27 ++ view/fr/smarty3/request_notify_eml.tpl | 17 + view/fr/smarty3/wall_received_eml.tpl | 18 + view/group_edit.tpl | 6 +- view/install_checks.tpl | 2 +- view/install_db.tpl | 8 +- view/install_settings.tpl | 2 +- view/intros.tpl | 4 +- view/is/smarty3/follow_notify_eml.tpl | 14 + view/is/smarty3/friend_complete_eml.tpl | 22 ++ view/is/smarty3/intro_complete_eml.tpl | 22 ++ view/is/smarty3/lostpass_eml.tpl | 32 ++ view/is/smarty3/passchanged_eml.tpl | 20 + view/is/smarty3/register_open_eml.tpl | 34 ++ view/is/smarty3/register_verify_eml.tpl | 25 ++ view/is/smarty3/request_notify_eml.tpl | 17 + view/is/smarty3/update_fail_eml.tpl | 11 + view/it/smarty3/cmnt_received_eml.tpl | 18 + .../smarty3/cmnt_received_html_body_eml.tpl | 25 ++ .../smarty3/cmnt_received_text_body_eml.tpl | 18 + view/it/smarty3/follow_notify_eml.tpl | 14 + view/it/smarty3/friend_complete_eml.tpl | 22 ++ view/it/smarty3/htconfig.tpl | 68 ++++ view/it/smarty3/intro_complete_eml.tpl | 22 ++ view/it/smarty3/lostpass_eml.tpl | 32 ++ .../smarty3/mail_received_html_body_eml.tpl | 25 ++ .../smarty3/mail_received_text_body_eml.tpl | 10 + view/it/smarty3/passchanged_eml.tpl | 20 + view/it/smarty3/register_open_eml.tpl | 34 ++ view/it/smarty3/register_verify_eml.tpl | 25 ++ view/it/smarty3/request_notify_eml.tpl | 17 + view/it/smarty3/wall_received_eml.tpl | 18 + .../smarty3/wall_received_html_body_eml.tpl | 24 ++ .../smarty3/wall_received_text_body_eml.tpl | 18 + view/login.tpl | 8 +- view/mail_display.tpl | 8 +- view/nb-no/smarty3/follow_notify_eml.tpl | 14 + view/nb-no/smarty3/friend_complete_eml.tpl | 22 ++ view/nb-no/smarty3/intro_complete_eml.tpl | 22 ++ view/nb-no/smarty3/lostpass_eml.tpl | 32 ++ view/nb-no/smarty3/passchanged_eml.tpl | 20 + view/nb-no/smarty3/register_open_eml.tpl | 34 ++ view/nb-no/smarty3/register_verify_eml.tpl | 25 ++ view/nb-no/smarty3/request_notify_eml.tpl | 17 + view/nb-no/smarty3/update_fail_eml.tpl | 11 + view/nogroup-template.tpl | 4 +- view/notifications.tpl | 2 +- view/pagetypes.tpl | 10 +- view/photos_recent.tpl | 4 +- view/pl/smarty3/follow_notify_eml.tpl | 14 + view/pl/smarty3/friend_complete_eml.tpl | 22 ++ view/pl/smarty3/intro_complete_eml.tpl | 22 ++ view/pl/smarty3/lostpass_eml.tpl | 32 ++ view/pl/smarty3/passchanged_eml.tpl | 20 + view/pl/smarty3/register_open_eml.tpl | 36 ++ view/pl/smarty3/register_verify_eml.tpl | 25 ++ view/pl/smarty3/request_notify_eml.tpl | 17 + view/pl/smarty3/update_fail_eml.tpl | 11 + view/poco_xml.tpl | 4 +- view/profile_vcard.tpl | 2 +- view/prv_message.tpl | 24 +- view/pt-br/smarty3/intro_complete_eml.tpl | 22 ++ view/pt-br/smarty3/update_fail_eml.tpl | 11 + view/settings.tpl | 52 +-- view/settings_connectors.tpl | 20 +- view/settings_display.tpl | 10 +- view/settings_oauth_edit.tpl | 10 +- view/smarty3/404.tpl | 1 + view/smarty3/acl_selector.tpl | 26 ++ view/smarty3/admin_aside.tpl | 42 ++ view/smarty3/admin_logs.tpl | 19 + view/smarty3/admin_plugins.tpl | 15 + view/smarty3/admin_plugins_details.tpl | 36 ++ view/smarty3/admin_remoteupdate.tpl | 98 +++++ view/smarty3/admin_site.tpl | 97 +++++ view/smarty3/admin_summary.tpl | 40 ++ view/smarty3/admin_users.tpl | 98 +++++ view/smarty3/album_edit.tpl | 15 + view/smarty3/api_config_xml.tpl | 66 ++++ view/smarty3/api_friends_xml.tpl | 7 + view/smarty3/api_ratelimit_xml.tpl | 6 + view/smarty3/api_status_xml.tpl | 46 +++ view/smarty3/api_test_xml.tpl | 1 + view/smarty3/api_timeline_atom.tpl | 90 +++++ view/smarty3/api_timeline_rss.tpl | 26 ++ view/smarty3/api_timeline_xml.tpl | 20 + view/smarty3/api_user_xml.tpl | 46 +++ view/smarty3/apps.tpl | 7 + view/smarty3/atom_feed.tpl | 29 ++ view/smarty3/atom_feed_dfrn.tpl | 29 ++ view/smarty3/atom_mail.tpl | 17 + view/smarty3/atom_relocate.tpl | 17 + view/smarty3/atom_suggest.tpl | 11 + view/smarty3/auto_request.tpl | 37 ++ view/smarty3/birthdays_reminder.tpl | 10 + view/smarty3/categories_widget.tpl | 12 + view/smarty3/comment_item.tpl | 39 ++ view/smarty3/common_friends.tpl | 12 + view/smarty3/common_tabs.tpl | 5 + view/smarty3/contact_block.tpl | 12 + view/smarty3/contact_edit.tpl | 88 +++++ view/smarty3/contact_end.tpl | 0 view/smarty3/contact_head.tpl | 30 ++ view/smarty3/contact_template.tpl | 25 ++ view/smarty3/contacts-end.tpl | 0 view/smarty3/contacts-head.tpl | 17 + view/smarty3/contacts-template.tpl | 26 ++ view/smarty3/contacts-widget-sidebar.tpl | 6 + view/smarty3/content.tpl | 2 + view/smarty3/conversation.tpl | 29 ++ view/smarty3/crepair.tpl | 46 +++ view/smarty3/cropbody.tpl | 58 +++ view/smarty3/cropend.tpl | 0 view/smarty3/crophead.tpl | 4 + view/smarty3/delegate.tpl | 57 +++ view/smarty3/dfrn_req_confirm.tpl | 21 + view/smarty3/dfrn_request.tpl | 65 +++ view/smarty3/diasp_dec_hdr.tpl | 8 + view/smarty3/diaspora_comment.tpl | 11 + view/smarty3/diaspora_comment_relay.tpl | 12 + view/smarty3/diaspora_conversation.tpl | 29 ++ view/smarty3/diaspora_like.tpl | 12 + view/smarty3/diaspora_like_relay.tpl | 13 + view/smarty3/diaspora_message.tpl | 13 + view/smarty3/diaspora_photo.tpl | 13 + view/smarty3/diaspora_post.tpl | 11 + view/smarty3/diaspora_profile.tpl | 16 + view/smarty3/diaspora_relay_retraction.tpl | 10 + .../smarty3/diaspora_relayable_retraction.tpl | 11 + view/smarty3/diaspora_retract.tpl | 9 + view/smarty3/diaspora_share.tpl | 8 + view/smarty3/diaspora_signed_retract.tpl | 10 + view/smarty3/diaspora_vcard.tpl | 57 +++ view/smarty3/directory_header.tpl | 16 + view/smarty3/directory_item.tpl | 11 + view/smarty3/display-head.tpl | 8 + view/smarty3/email_notify_html.tpl | 27 ++ view/smarty3/email_notify_text.tpl | 13 + view/smarty3/end.tpl | 0 view/smarty3/event.tpl | 10 + view/smarty3/event_end.tpl | 0 view/smarty3/event_form.tpl | 49 +++ view/smarty3/event_head.tpl | 139 +++++++ view/smarty3/events-js.tpl | 6 + view/smarty3/events.tpl | 24 ++ view/smarty3/events_reminder.tpl | 10 + view/smarty3/failed_updates.tpl | 17 + view/smarty3/fake_feed.tpl | 13 + view/smarty3/field.tpl | 4 + view/smarty3/field_checkbox.tpl | 6 + view/smarty3/field_combobox.tpl | 18 + view/smarty3/field_custom.tpl | 6 + view/smarty3/field_input.tpl | 6 + view/smarty3/field_intcheckbox.tpl | 6 + view/smarty3/field_openid.tpl | 6 + view/smarty3/field_password.tpl | 6 + view/smarty3/field_radio.tpl | 6 + view/smarty3/field_richtext.tpl | 6 + view/smarty3/field_select.tpl | 8 + view/smarty3/field_select_raw.tpl | 8 + view/smarty3/field_textarea.tpl | 6 + view/smarty3/field_themeselect.tpl | 9 + view/smarty3/field_yesno.tpl | 13 + view/smarty3/fileas_widget.tpl | 12 + view/smarty3/filebrowser.tpl | 84 ++++ view/smarty3/filer_dialog.tpl | 4 + view/smarty3/follow.tpl | 8 + view/smarty3/follow_slap.tpl | 25 ++ view/smarty3/generic_links_widget.tpl | 11 + view/smarty3/group_drop.tpl | 9 + view/smarty3/group_edit.tpl | 23 ++ view/smarty3/group_selection.tpl | 8 + view/smarty3/group_side.tpl | 33 ++ view/smarty3/groupeditor.tpl | 16 + view/smarty3/head.tpl | 112 ++++++ view/smarty3/hide_comments.tpl | 4 + view/smarty3/install.tpl | 10 + view/smarty3/install_checks.tpl | 24 ++ view/smarty3/install_db.tpl | 30 ++ view/smarty3/install_settings.tpl | 25 ++ view/smarty3/intros.tpl | 28 ++ view/smarty3/invite.tpl | 27 ++ view/smarty3/jot-end.tpl | 0 view/smarty3/jot-header.tpl | 322 +++++++++++++++ view/smarty3/jot.tpl | 88 +++++ view/smarty3/jot_geotag.tpl | 8 + view/smarty3/lang_selector.tpl | 10 + view/smarty3/like_noshare.tpl | 5 + view/smarty3/login.tpl | 35 ++ view/smarty3/login_head.tpl | 0 view/smarty3/logout.tpl | 6 + view/smarty3/lostpass.tpl | 18 + view/smarty3/magicsig.tpl | 9 + view/smarty3/mail_conv.tpl | 14 + view/smarty3/mail_display.tpl | 10 + view/smarty3/mail_head.tpl | 3 + view/smarty3/mail_list.tpl | 16 + view/smarty3/match.tpl | 16 + view/smarty3/message-end.tpl | 0 view/smarty3/message-head.tpl | 17 + view/smarty3/message_side.tpl | 10 + view/smarty3/moderated_comment.tpl | 34 ++ view/smarty3/mood_content.tpl | 20 + view/smarty3/msg-end.tpl | 0 view/smarty3/msg-header.tpl | 97 +++++ view/smarty3/nav.tpl | 68 ++++ view/smarty3/netfriend.tpl | 14 + view/smarty3/nets.tpl | 10 + view/smarty3/nogroup-template.tpl | 12 + view/smarty3/notifications.tpl | 8 + view/smarty3/notifications_comments_item.tpl | 3 + view/smarty3/notifications_dislikes_item.tpl | 3 + view/smarty3/notifications_friends_item.tpl | 3 + view/smarty3/notifications_likes_item.tpl | 3 + view/smarty3/notifications_network_item.tpl | 3 + view/smarty3/notifications_posts_item.tpl | 3 + view/smarty3/notify.tpl | 3 + view/smarty3/oauth_authorize.tpl | 10 + view/smarty3/oauth_authorize_done.tpl | 4 + view/smarty3/oembed_video.tpl | 4 + view/smarty3/oexchange_xrd.tpl | 33 ++ view/smarty3/opensearch.tpl | 13 + view/smarty3/pagetypes.tpl | 5 + view/smarty3/peoplefind.tpl | 14 + view/smarty3/photo_album.tpl | 7 + view/smarty3/photo_drop.tpl | 4 + view/smarty3/photo_edit.tpl | 50 +++ view/smarty3/photo_edit_head.tpl | 11 + view/smarty3/photo_item.tpl | 22 ++ view/smarty3/photo_top.tpl | 8 + view/smarty3/photo_view.tpl | 37 ++ view/smarty3/photos_head.tpl | 26 ++ view/smarty3/photos_recent.tpl | 11 + view/smarty3/photos_upload.tpl | 48 +++ view/smarty3/poco_entry_xml.tpl | 7 + view/smarty3/poco_xml.tpl | 18 + view/smarty3/poke_content.tpl | 32 ++ view/smarty3/posted_date_widget.tpl | 9 + view/smarty3/profed_end.tpl | 0 view/smarty3/profed_head.tpl | 38 ++ view/smarty3/profile-hide-friends.tpl | 16 + view/smarty3/profile-hide-wall.tpl | 16 + view/smarty3/profile-in-directory.tpl | 16 + view/smarty3/profile-in-netdir.tpl | 16 + view/smarty3/profile_advanced.tpl | 170 ++++++++ view/smarty3/profile_edit.tpl | 323 +++++++++++++++ view/smarty3/profile_edlink.tpl | 2 + view/smarty3/profile_entry.tpl | 11 + view/smarty3/profile_listing_header.tpl | 8 + view/smarty3/profile_photo.tpl | 26 ++ view/smarty3/profile_publish.tpl | 16 + view/smarty3/profile_vcard.tpl | 50 +++ view/smarty3/prv_message.tpl | 33 ++ view/smarty3/pwdreset.tpl | 17 + view/smarty3/register.tpl | 63 +++ view/smarty3/remote_friends_common.tpl | 21 + view/smarty3/removeme.tpl | 20 + view/smarty3/saved_searches_aside.tpl | 14 + view/smarty3/search_item.tpl | 64 +++ view/smarty3/settings-end.tpl | 0 view/smarty3/settings-head.tpl | 25 ++ view/smarty3/settings.tpl | 145 +++++++ view/smarty3/settings_addons.tpl | 10 + view/smarty3/settings_connectors.tpl | 35 ++ view/smarty3/settings_display.tpl | 22 ++ view/smarty3/settings_display_end.tpl | 0 view/smarty3/settings_features.tpl | 20 + view/smarty3/settings_nick_set.tpl | 5 + view/smarty3/settings_nick_subdir.tpl | 6 + view/smarty3/settings_oauth.tpl | 31 ++ view/smarty3/settings_oauth_edit.tpl | 17 + view/smarty3/suggest_friends.tpl | 16 + view/smarty3/suggestions.tpl | 21 + view/smarty3/tag_slap.tpl | 30 ++ view/smarty3/threaded_conversation.tpl | 16 + view/smarty3/toggle_mobile_footer.tpl | 2 + view/smarty3/uexport.tpl | 9 + view/smarty3/uimport.tpl | 13 + view/smarty3/vcard-widget.tpl | 5 + view/smarty3/viewcontact_template.tpl | 9 + view/smarty3/voting_fakelink.tpl | 2 + view/smarty3/wall_thread.tpl | 120 ++++++ view/smarty3/wallmessage.tpl | 32 ++ view/smarty3/wallmsg-end.tpl | 0 view/smarty3/wallmsg-header.tpl | 82 ++++ view/smarty3/xrd_diaspora.tpl | 3 + view/smarty3/xrd_host.tpl | 18 + view/smarty3/xrd_person.tpl | 38 ++ view/suggestions.tpl | 2 +- view/sv/smarty3/cmnt_received_eml.tpl | 17 + view/sv/smarty3/follow_notify_eml.tpl | 12 + view/sv/smarty3/friend_complete_eml.tpl | 17 + view/sv/smarty3/htconfig.tpl | 68 ++++ view/sv/smarty3/intro_complete_eml.tpl | 19 + view/sv/smarty3/lostpass_eml.tpl | 29 ++ .../smarty3/mail_received_html_body_eml.tpl | 25 ++ .../smarty3/mail_received_text_body_eml.tpl | 10 + view/sv/smarty3/passchanged_eml.tpl | 18 + view/sv/smarty3/register_open_eml.tpl | 17 + view/sv/smarty3/register_verify_eml.tpl | 17 + view/sv/smarty3/request_notify_eml.tpl | 13 + view/sv/smarty3/wall_received_eml.tpl | 16 + view/theme/cleanzero/config.php | 11 +- view/theme/cleanzero/smarty3/nav.tpl | 85 ++++ .../cleanzero/smarty3/theme_settings.tpl | 10 + view/theme/cleanzero/theme.php | 2 + view/theme/cleanzero/theme_settings.tpl | 8 +- .../comix-plain/smarty3/comment_item.tpl | 33 ++ .../theme/comix-plain/smarty3/search_item.tpl | 54 +++ view/theme/comix-plain/theme.php | 1 + view/theme/comix/smarty3/comment_item.tpl | 33 ++ view/theme/comix/smarty3/search_item.tpl | 54 +++ view/theme/comix/theme.php | 1 + view/theme/darkbubble/theme.php | 1 + view/theme/darkzero/theme.php | 1 + view/theme/diabook/communityhome.tpl | 30 +- view/theme/diabook/config.php | 12 +- view/theme/diabook/directory_item.tpl | 6 +- view/theme/diabook/jot.tpl | 4 +- view/theme/diabook/login.tpl | 6 +- view/theme/diabook/mail_display.tpl | 8 +- view/theme/diabook/profile_vcard.tpl | 2 +- view/theme/diabook/prv_message.tpl | 30 +- view/theme/diabook/smarty3/admin_users.tpl | 88 +++++ view/theme/diabook/smarty3/bottom.tpl | 155 ++++++++ .../diabook/smarty3/ch_directory_item.tpl | 10 + view/theme/diabook/smarty3/comment_item.tpl | 43 ++ view/theme/diabook/smarty3/communityhome.tpl | 172 ++++++++ .../diabook/smarty3/contact_template.tpl | 25 ++ view/theme/diabook/smarty3/directory_item.tpl | 42 ++ view/theme/diabook/smarty3/footer.tpl | 3 + .../diabook/smarty3/generic_links_widget.tpl | 11 + view/theme/diabook/smarty3/group_side.tpl | 34 ++ view/theme/diabook/smarty3/jot.tpl | 87 ++++ view/theme/diabook/smarty3/login.tpl | 33 ++ view/theme/diabook/smarty3/mail_conv.tpl | 60 +++ view/theme/diabook/smarty3/mail_display.tpl | 12 + view/theme/diabook/smarty3/mail_list.tpl | 8 + view/theme/diabook/smarty3/message_side.tpl | 10 + view/theme/diabook/smarty3/nav.tpl | 188 +++++++++ view/theme/diabook/smarty3/nets.tpl | 17 + view/theme/diabook/smarty3/oembed_video.tpl | 4 + view/theme/diabook/smarty3/photo_item.tpl | 65 +++ view/theme/diabook/smarty3/photo_view.tpl | 33 ++ view/theme/diabook/smarty3/profile_side.tpl | 21 + view/theme/diabook/smarty3/profile_vcard.tpl | 64 +++ view/theme/diabook/smarty3/prv_message.tpl | 40 ++ view/theme/diabook/smarty3/right_aside.tpl | 20 + view/theme/diabook/smarty3/search_item.tpl | 111 ++++++ view/theme/diabook/smarty3/theme_settings.tpl | 41 ++ view/theme/diabook/smarty3/wall_thread.tpl | 141 +++++++ view/theme/diabook/theme.php | 20 +- view/theme/diabook/theme_settings.tpl | 36 +- view/theme/diabook/wall_thread.tpl | 11 +- view/theme/dispy/config.php | 11 +- view/theme/dispy/dark/theme.php | 1 + view/theme/dispy/light/theme.php | 1 + view/theme/dispy/profile_vcard.tpl | 2 +- view/theme/dispy/smarty3/bottom.tpl | 71 ++++ view/theme/dispy/smarty3/comment_item.tpl | 70 ++++ view/theme/dispy/smarty3/communityhome.tpl | 35 ++ view/theme/dispy/smarty3/contact_template.tpl | 30 ++ view/theme/dispy/smarty3/conversation.tpl | 29 ++ view/theme/dispy/smarty3/group_side.tpl | 29 ++ view/theme/dispy/smarty3/head.tpl | 100 +++++ view/theme/dispy/smarty3/header.tpl | 0 view/theme/dispy/smarty3/jot-header.tpl | 345 ++++++++++++++++ view/theme/dispy/smarty3/jot.tpl | 79 ++++ view/theme/dispy/smarty3/lang_selector.tpl | 10 + view/theme/dispy/smarty3/mail_head.tpl | 5 + view/theme/dispy/smarty3/nav.tpl | 145 +++++++ view/theme/dispy/smarty3/photo_edit.tpl | 53 +++ view/theme/dispy/smarty3/photo_view.tpl | 36 ++ view/theme/dispy/smarty3/profile_vcard.tpl | 82 ++++ .../dispy/smarty3/saved_searches_aside.tpl | 14 + view/theme/dispy/smarty3/search_item.tpl | 64 +++ view/theme/dispy/smarty3/theme_settings.tpl | 10 + .../dispy/smarty3/threaded_conversation.tpl | 15 + view/theme/dispy/smarty3/wall_thread.tpl | 139 +++++++ view/theme/dispy/theme.php | 1 + view/theme/dispy/threaded_conversation.tpl | 4 +- view/theme/dispy/wall_thread.tpl | 8 +- view/theme/duepuntozero/profile_vcard.tpl | 2 +- view/theme/duepuntozero/prv_message.tpl | 30 +- .../duepuntozero/smarty3/comment_item.tpl | 66 ++++ .../duepuntozero/smarty3/lang_selector.tpl | 10 + .../smarty3/moderated_comment.tpl | 61 +++ view/theme/duepuntozero/smarty3/nav.tpl | 70 ++++ .../duepuntozero/smarty3/profile_vcard.tpl | 51 +++ .../duepuntozero/smarty3/prv_message.tpl | 39 ++ view/theme/duepuntozero/theme.php | 1 + view/theme/facepark/profile_vcard.tpl | 2 +- view/theme/facepark/smarty3/comment_item.tpl | 33 ++ view/theme/facepark/smarty3/group_side.tpl | 28 ++ view/theme/facepark/smarty3/jot.tpl | 85 ++++ view/theme/facepark/smarty3/nav.tpl | 68 ++++ view/theme/facepark/smarty3/profile_vcard.tpl | 47 +++ view/theme/facepark/smarty3/search_item.tpl | 54 +++ view/theme/facepark/theme.php | 1 + view/theme/frost-mobile/admin_site.tpl | 68 ++-- view/theme/frost-mobile/contacts-template.tpl | 4 +- view/theme/frost-mobile/login.tpl | 10 +- view/theme/frost-mobile/profile_vcard.tpl | 2 +- view/theme/frost-mobile/prv_message.tpl | 30 +- view/theme/frost-mobile/settings.tpl | 50 +-- .../frost-mobile/smarty3/acl_selector.tpl | 23 ++ .../frost-mobile/smarty3/admin_aside.tpl | 31 ++ .../theme/frost-mobile/smarty3/admin_site.tpl | 61 +++ .../frost-mobile/smarty3/comment_item.tpl | 78 ++++ .../frost-mobile/smarty3/contact_edit.tpl | 93 +++++ .../frost-mobile/smarty3/contact_head.tpl | 0 .../frost-mobile/smarty3/contact_template.tpl | 30 ++ .../frost-mobile/smarty3/contacts-end.tpl | 4 + .../frost-mobile/smarty3/contacts-head.tpl | 5 + .../smarty3/contacts-template.tpl | 28 ++ .../smarty3/contacts-widget-sidebar.tpl | 2 + .../frost-mobile/smarty3/conversation.tpl | 29 ++ view/theme/frost-mobile/smarty3/cropbody.tpl | 27 ++ view/theme/frost-mobile/smarty3/cropend.tpl | 4 + view/theme/frost-mobile/smarty3/crophead.tpl | 1 + .../frost-mobile/smarty3/display-head.tpl | 4 + view/theme/frost-mobile/smarty3/end.tpl | 17 + view/theme/frost-mobile/smarty3/event_end.tpl | 4 + .../theme/frost-mobile/smarty3/event_head.tpl | 6 + .../frost-mobile/smarty3/field_checkbox.tpl | 6 + .../frost-mobile/smarty3/field_input.tpl | 6 + .../frost-mobile/smarty3/field_openid.tpl | 6 + .../frost-mobile/smarty3/field_password.tpl | 6 + .../smarty3/field_themeselect.tpl | 9 + .../smarty3/generic_links_widget.tpl | 11 + view/theme/frost-mobile/smarty3/head.tpl | 33 ++ view/theme/frost-mobile/smarty3/jot-end.tpl | 5 + .../theme/frost-mobile/smarty3/jot-header.tpl | 17 + view/theme/frost-mobile/smarty3/jot.tpl | 89 +++++ .../theme/frost-mobile/smarty3/jot_geotag.tpl | 11 + .../frost-mobile/smarty3/lang_selector.tpl | 10 + view/theme/frost-mobile/smarty3/login.tpl | 45 +++ .../theme/frost-mobile/smarty3/login_head.tpl | 2 + view/theme/frost-mobile/smarty3/lostpass.tpl | 21 + view/theme/frost-mobile/smarty3/mail_conv.tpl | 18 + .../frost-mobile/smarty3/message-end.tpl | 4 + .../frost-mobile/smarty3/message-head.tpl | 0 .../smarty3/moderated_comment.tpl | 61 +++ .../theme/frost-mobile/smarty3/msg-header.tpl | 9 + view/theme/frost-mobile/smarty3/nav.tpl | 146 +++++++ .../theme/frost-mobile/smarty3/photo_edit.tpl | 53 +++ .../frost-mobile/smarty3/photo_edit_head.tpl | 7 + .../theme/frost-mobile/smarty3/photo_view.tpl | 42 ++ .../frost-mobile/smarty3/photos_head.tpl | 5 + .../frost-mobile/smarty3/photos_upload.tpl | 48 +++ .../theme/frost-mobile/smarty3/profed_end.tpl | 8 + .../frost-mobile/smarty3/profed_head.tpl | 5 + .../frost-mobile/smarty3/profile_edit.tpl | 322 +++++++++++++++ .../frost-mobile/smarty3/profile_photo.tpl | 19 + .../frost-mobile/smarty3/profile_vcard.tpl | 51 +++ .../frost-mobile/smarty3/prv_message.tpl | 39 ++ view/theme/frost-mobile/smarty3/register.tpl | 78 ++++ .../frost-mobile/smarty3/settings-head.tpl | 5 + view/theme/frost-mobile/smarty3/settings.tpl | 144 +++++++ .../smarty3/settings_display_end.tpl | 2 + .../smarty3/threaded_conversation.tpl | 15 + .../frost-mobile/smarty3/voting_fakelink.tpl | 2 + .../frost-mobile/smarty3/wall_thread.tpl | 126 ++++++ .../frost-mobile/smarty3/wallmsg-end.tpl | 5 + .../frost-mobile/smarty3/wallmsg-header.tpl | 6 + view/theme/frost-mobile/theme.php | 1 + .../frost-mobile/threaded_conversation.tpl | 4 +- view/theme/frost-mobile/voting_fakelink.tpl | 2 + view/theme/frost-mobile/wall_thread.tpl | 8 +- view/theme/frost/admin_site.tpl | 70 ++-- view/theme/frost/contacts-template.tpl | 4 +- view/theme/frost/login.tpl | 11 +- view/theme/frost/profile_vcard.tpl | 2 +- view/theme/frost/prv_message.tpl | 30 +- view/theme/frost/smarty3/acl_selector.tpl | 23 ++ view/theme/frost/smarty3/admin_aside.tpl | 31 ++ view/theme/frost/smarty3/admin_site.tpl | 61 +++ view/theme/frost/smarty3/comment_item.tpl | 77 ++++ view/theme/frost/smarty3/contact_end.tpl | 6 + view/theme/frost/smarty3/contact_head.tpl | 0 view/theme/frost/smarty3/contact_template.tpl | 27 ++ view/theme/frost/smarty3/contacts-end.tpl | 4 + view/theme/frost/smarty3/contacts-head.tpl | 5 + .../theme/frost/smarty3/contacts-template.tpl | 28 ++ view/theme/frost/smarty3/cropbody.tpl | 27 ++ view/theme/frost/smarty3/cropend.tpl | 4 + view/theme/frost/smarty3/crophead.tpl | 1 + view/theme/frost/smarty3/display-head.tpl | 4 + view/theme/frost/smarty3/end.tpl | 20 + view/theme/frost/smarty3/event_end.tpl | 7 + view/theme/frost/smarty3/event_head.tpl | 6 + view/theme/frost/smarty3/field_combobox.tpl | 18 + view/theme/frost/smarty3/field_input.tpl | 6 + view/theme/frost/smarty3/field_openid.tpl | 6 + view/theme/frost/smarty3/field_password.tpl | 6 + .../theme/frost/smarty3/field_themeselect.tpl | 9 + view/theme/frost/smarty3/filebrowser.tpl | 84 ++++ view/theme/frost/smarty3/head.tpl | 23 ++ view/theme/frost/smarty3/jot-end.tpl | 5 + view/theme/frost/smarty3/jot-header.tpl | 17 + view/theme/frost/smarty3/jot.tpl | 90 +++++ view/theme/frost/smarty3/jot_geotag.tpl | 11 + view/theme/frost/smarty3/lang_selector.tpl | 10 + view/theme/frost/smarty3/login.tpl | 45 +++ view/theme/frost/smarty3/login_head.tpl | 2 + view/theme/frost/smarty3/lostpass.tpl | 21 + view/theme/frost/smarty3/message-end.tpl | 4 + view/theme/frost/smarty3/message-head.tpl | 0 .../theme/frost/smarty3/moderated_comment.tpl | 61 +++ view/theme/frost/smarty3/msg-end.tpl | 9 + view/theme/frost/smarty3/msg-header.tpl | 9 + view/theme/frost/smarty3/nav.tpl | 148 +++++++ view/theme/frost/smarty3/photo_edit.tpl | 58 +++ view/theme/frost/smarty3/photo_edit_head.tpl | 7 + view/theme/frost/smarty3/photo_view.tpl | 42 ++ view/theme/frost/smarty3/photos_head.tpl | 5 + view/theme/frost/smarty3/photos_upload.tpl | 51 +++ .../frost/smarty3/posted_date_widget.tpl | 9 + view/theme/frost/smarty3/profed_end.tpl | 9 + view/theme/frost/smarty3/profed_head.tpl | 5 + view/theme/frost/smarty3/profile_edit.tpl | 322 +++++++++++++++ view/theme/frost/smarty3/profile_vcard.tpl | 51 +++ view/theme/frost/smarty3/prv_message.tpl | 39 ++ view/theme/frost/smarty3/register.tpl | 78 ++++ view/theme/frost/smarty3/settings-head.tpl | 5 + .../frost/smarty3/settings_display_end.tpl | 2 + .../frost/smarty3/threaded_conversation.tpl | 24 ++ view/theme/frost/smarty3/voting_fakelink.tpl | 2 + view/theme/frost/smarty3/wall_thread.tpl | 125 ++++++ view/theme/frost/smarty3/wallmsg-end.tpl | 5 + view/theme/frost/smarty3/wallmsg-header.tpl | 6 + view/theme/frost/theme.php | 1 + view/theme/frost/threaded_conversation.tpl | 4 +- view/theme/frost/voting_fakelink.tpl | 2 + view/theme/frost/wall_thread.tpl | 8 +- view/theme/greenzero/theme.php | 3 +- view/theme/purplezero/theme.php | 3 +- view/theme/quattro/config.php | 10 +- view/theme/quattro/mail_display.tpl | 8 +- view/theme/quattro/profile_vcard.tpl | 2 +- view/theme/quattro/prv_message.tpl | 24 +- .../quattro/smarty3/birthdays_reminder.tpl | 1 + view/theme/quattro/smarty3/comment_item.tpl | 63 +++ .../quattro/smarty3/contact_template.tpl | 26 ++ view/theme/quattro/smarty3/conversation.tpl | 49 +++ .../theme/quattro/smarty3/events_reminder.tpl | 39 ++ view/theme/quattro/smarty3/fileas_widget.tpl | 12 + .../quattro/smarty3/generic_links_widget.tpl | 11 + view/theme/quattro/smarty3/group_side.tpl | 29 ++ view/theme/quattro/smarty3/jot.tpl | 56 +++ view/theme/quattro/smarty3/mail_conv.tpl | 63 +++ view/theme/quattro/smarty3/mail_display.tpl | 12 + view/theme/quattro/smarty3/mail_list.tpl | 8 + view/theme/quattro/smarty3/message_side.tpl | 10 + view/theme/quattro/smarty3/nav.tpl | 95 +++++ view/theme/quattro/smarty3/nets.tpl | 12 + view/theme/quattro/smarty3/photo_view.tpl | 37 ++ view/theme/quattro/smarty3/profile_vcard.tpl | 68 ++++ view/theme/quattro/smarty3/prv_message.tpl | 33 ++ .../quattro/smarty3/saved_searches_aside.tpl | 15 + view/theme/quattro/smarty3/search_item.tpl | 93 +++++ view/theme/quattro/smarty3/theme_settings.tpl | 32 ++ .../quattro/smarty3/threaded_conversation.tpl | 40 ++ view/theme/quattro/smarty3/wall_item_tag.tpl | 67 ++++ view/theme/quattro/smarty3/wall_thread.tpl | 172 ++++++++ view/theme/quattro/theme.php | 1 + view/theme/quattro/threaded_conversation.tpl | 10 +- view/theme/quattro/wall_thread.tpl | 4 +- .../slackr/smarty3/birthdays_reminder.tpl | 8 + view/theme/slackr/smarty3/events_reminder.tpl | 39 ++ view/theme/slackr/theme.php | 3 +- view/theme/smoothly/login.tpl | 6 +- view/theme/smoothly/smarty3/bottom.tpl | 52 +++ view/theme/smoothly/smarty3/follow.tpl | 8 + view/theme/smoothly/smarty3/jot-header.tpl | 374 ++++++++++++++++++ view/theme/smoothly/smarty3/jot.tpl | 84 ++++ view/theme/smoothly/smarty3/lang_selector.tpl | 10 + view/theme/smoothly/smarty3/login.tpl | 38 ++ view/theme/smoothly/smarty3/nav.tpl | 81 ++++ view/theme/smoothly/smarty3/search_item.tpl | 53 +++ view/theme/smoothly/smarty3/wall_thread.tpl | 160 ++++++++ view/theme/smoothly/theme.php | 1 + view/theme/smoothly/wall_thread.tpl | 8 +- view/theme/testbubble/profile_vcard.tpl | 2 +- .../theme/testbubble/smarty3/comment_item.tpl | 33 ++ view/theme/testbubble/smarty3/group_drop.tpl | 8 + view/theme/testbubble/smarty3/group_edit.tpl | 16 + view/theme/testbubble/smarty3/group_side.tpl | 28 ++ view/theme/testbubble/smarty3/jot-header.tpl | 366 +++++++++++++++++ view/theme/testbubble/smarty3/jot.tpl | 75 ++++ view/theme/testbubble/smarty3/match.tpl | 13 + view/theme/testbubble/smarty3/nav.tpl | 66 ++++ view/theme/testbubble/smarty3/photo_album.tpl | 8 + view/theme/testbubble/smarty3/photo_top.tpl | 8 + view/theme/testbubble/smarty3/photo_view.tpl | 40 ++ .../testbubble/smarty3/profile_entry.tpl | 11 + .../testbubble/smarty3/profile_vcard.tpl | 45 +++ .../smarty3/saved_searches_aside.tpl | 14 + view/theme/testbubble/smarty3/search_item.tpl | 53 +++ view/theme/testbubble/smarty3/wall_thread.tpl | 107 +++++ view/theme/testbubble/theme.php | 2 + view/theme/testbubble/wall_thread.tpl | 4 +- view/theme/vier/smarty3/comment_item.tpl | 50 +++ view/theme/vier/smarty3/mail_list.tpl | 8 + view/theme/vier/smarty3/nav.tpl | 145 +++++++ view/theme/vier/smarty3/search_item.tpl | 91 +++++ .../vier/smarty3/threaded_conversation.tpl | 40 ++ view/theme/vier/smarty3/wall_thread.tpl | 170 ++++++++ view/theme/vier/theme.php | 3 + view/theme/vier/threaded_conversation.tpl | 10 +- view/theme/vier/wall_thread.tpl | 4 +- view/threaded_conversation.tpl | 4 +- view/uimport.tpl | 8 +- view/viewcontact_template.tpl | 4 +- view/voting_fakelink.tpl | 2 + view/wall_thread.tpl | 8 +- view/zh-cn/smarty3/follow_notify_eml.tpl | 14 + view/zh-cn/smarty3/friend_complete_eml.tpl | 22 ++ view/zh-cn/smarty3/intro_complete_eml.tpl | 22 ++ view/zh-cn/smarty3/lostpass_eml.tpl | 32 ++ view/zh-cn/smarty3/passchanged_eml.tpl | 20 + view/zh-cn/smarty3/register_open_eml.tpl | 34 ++ view/zh-cn/smarty3/register_verify_eml.tpl | 25 ++ view/zh-cn/smarty3/request_notify_eml.tpl | 17 + view/zh-cn/smarty3/update_fail_eml.tpl | 11 + 755 files changed, 21646 insertions(+), 637 deletions(-) create mode 100644 include/friendica_smarty.php create mode 100755 mods/friendica-to-smarty-tpl.py create mode 100644 view/ca/smarty3/cmnt_received_eml.tpl create mode 100644 view/ca/smarty3/follow_notify_eml.tpl create mode 100644 view/ca/smarty3/friend_complete_eml.tpl create mode 100644 view/ca/smarty3/htconfig.tpl create mode 100644 view/ca/smarty3/intro_complete_eml.tpl create mode 100644 view/ca/smarty3/lostpass_eml.tpl create mode 100644 view/ca/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/ca/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/ca/smarty3/passchanged_eml.tpl create mode 100644 view/ca/smarty3/register_open_eml.tpl create mode 100644 view/ca/smarty3/register_verify_eml.tpl create mode 100644 view/ca/smarty3/request_notify_eml.tpl create mode 100644 view/ca/smarty3/wall_received_eml.tpl create mode 100644 view/cs/smarty3/cmnt_received_eml.tpl create mode 100644 view/cs/smarty3/cmnt_received_html_body_eml.tpl create mode 100644 view/cs/smarty3/cmnt_received_text_body_eml.tpl create mode 100644 view/cs/smarty3/follow_notify_eml.tpl create mode 100644 view/cs/smarty3/friend_complete_eml.tpl create mode 100644 view/cs/smarty3/htconfig.tpl create mode 100644 view/cs/smarty3/intro_complete_eml.tpl create mode 100644 view/cs/smarty3/lostpass_eml.tpl create mode 100644 view/cs/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/cs/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/cs/smarty3/passchanged_eml.tpl create mode 100644 view/cs/smarty3/register_open_eml.tpl create mode 100644 view/cs/smarty3/register_verify_eml.tpl create mode 100644 view/cs/smarty3/request_notify_eml.tpl create mode 100644 view/cs/smarty3/wall_received_eml.tpl create mode 100644 view/cs/smarty3/wall_received_html_body_eml.tpl create mode 100644 view/cs/smarty3/wall_received_text_body_eml.tpl create mode 100644 view/de/smarty3/cmnt_received_eml.tpl create mode 100644 view/de/smarty3/cmnt_received_html_body_eml.tpl create mode 100644 view/de/smarty3/cmnt_received_text_body_eml.tpl create mode 100644 view/de/smarty3/follow_notify_eml.tpl create mode 100644 view/de/smarty3/friend_complete_eml.tpl create mode 100644 view/de/smarty3/htconfig.tpl create mode 100644 view/de/smarty3/intro_complete_eml.tpl create mode 100644 view/de/smarty3/lostpass_eml.tpl create mode 100644 view/de/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/de/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/de/smarty3/passchanged_eml.tpl create mode 100644 view/de/smarty3/register_open_eml.tpl create mode 100644 view/de/smarty3/register_verify_eml.tpl create mode 100644 view/de/smarty3/request_notify_eml.tpl create mode 100644 view/de/smarty3/update_fail_eml.tpl create mode 100644 view/de/smarty3/wall_received_eml.tpl create mode 100644 view/de/smarty3/wall_received_html_body_eml.tpl create mode 100644 view/de/smarty3/wall_received_text_body_eml.tpl create mode 100644 view/en/smarty3/follow_notify_eml.tpl create mode 100644 view/en/smarty3/friend_complete_eml.tpl create mode 100644 view/en/smarty3/htconfig.tpl create mode 100644 view/en/smarty3/intro_complete_eml.tpl create mode 100644 view/en/smarty3/lostpass_eml.tpl create mode 100644 view/en/smarty3/passchanged_eml.tpl create mode 100644 view/en/smarty3/register_open_eml.tpl create mode 100644 view/en/smarty3/register_verify_eml.tpl create mode 100644 view/en/smarty3/request_notify_eml.tpl create mode 100644 view/en/smarty3/update_fail_eml.tpl create mode 100644 view/eo/smarty3/follow_notify_eml.tpl create mode 100644 view/eo/smarty3/friend_complete_eml.tpl create mode 100644 view/eo/smarty3/intro_complete_eml.tpl create mode 100644 view/eo/smarty3/lostpass_eml.tpl create mode 100644 view/eo/smarty3/passchanged_eml.tpl create mode 100644 view/eo/smarty3/register_open_eml.tpl create mode 100644 view/eo/smarty3/register_verify_eml.tpl create mode 100644 view/eo/smarty3/request_notify_eml.tpl create mode 100644 view/eo/smarty3/update_fail_eml.tpl create mode 100644 view/es/smarty3/cmnt_received_eml.tpl create mode 100644 view/es/smarty3/follow_notify_eml.tpl create mode 100644 view/es/smarty3/friend_complete_eml.tpl create mode 100644 view/es/smarty3/htconfig.tpl create mode 100644 view/es/smarty3/intro_complete_eml.tpl create mode 100644 view/es/smarty3/lostpass_eml.tpl create mode 100644 view/es/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/es/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/es/smarty3/passchanged_eml.tpl create mode 100644 view/es/smarty3/register_open_eml.tpl create mode 100644 view/es/smarty3/register_verify_eml.tpl create mode 100644 view/es/smarty3/request_notify_eml.tpl create mode 100644 view/es/smarty3/wall_received_eml.tpl create mode 100644 view/fr/smarty3/cmnt_received_eml.tpl create mode 100644 view/fr/smarty3/cmnt_received_html_body_eml.tpl create mode 100644 view/fr/smarty3/cmnt_received_text_body_eml.tpl create mode 100644 view/fr/smarty3/follow_notify_eml.tpl create mode 100644 view/fr/smarty3/friend_complete_eml.tpl create mode 100644 view/fr/smarty3/htconfig.tpl create mode 100644 view/fr/smarty3/intro_complete_eml.tpl create mode 100644 view/fr/smarty3/lostpass_eml.tpl create mode 100644 view/fr/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/fr/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/fr/smarty3/passchanged_eml.tpl create mode 100644 view/fr/smarty3/register_open_eml.tpl create mode 100644 view/fr/smarty3/register_verify_eml.tpl create mode 100644 view/fr/smarty3/request_notify_eml.tpl create mode 100644 view/fr/smarty3/wall_received_eml.tpl create mode 100644 view/is/smarty3/follow_notify_eml.tpl create mode 100644 view/is/smarty3/friend_complete_eml.tpl create mode 100644 view/is/smarty3/intro_complete_eml.tpl create mode 100644 view/is/smarty3/lostpass_eml.tpl create mode 100644 view/is/smarty3/passchanged_eml.tpl create mode 100644 view/is/smarty3/register_open_eml.tpl create mode 100644 view/is/smarty3/register_verify_eml.tpl create mode 100644 view/is/smarty3/request_notify_eml.tpl create mode 100644 view/is/smarty3/update_fail_eml.tpl create mode 100644 view/it/smarty3/cmnt_received_eml.tpl create mode 100644 view/it/smarty3/cmnt_received_html_body_eml.tpl create mode 100644 view/it/smarty3/cmnt_received_text_body_eml.tpl create mode 100644 view/it/smarty3/follow_notify_eml.tpl create mode 100644 view/it/smarty3/friend_complete_eml.tpl create mode 100644 view/it/smarty3/htconfig.tpl create mode 100644 view/it/smarty3/intro_complete_eml.tpl create mode 100644 view/it/smarty3/lostpass_eml.tpl create mode 100644 view/it/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/it/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/it/smarty3/passchanged_eml.tpl create mode 100644 view/it/smarty3/register_open_eml.tpl create mode 100644 view/it/smarty3/register_verify_eml.tpl create mode 100644 view/it/smarty3/request_notify_eml.tpl create mode 100644 view/it/smarty3/wall_received_eml.tpl create mode 100644 view/it/smarty3/wall_received_html_body_eml.tpl create mode 100644 view/it/smarty3/wall_received_text_body_eml.tpl create mode 100644 view/nb-no/smarty3/follow_notify_eml.tpl create mode 100644 view/nb-no/smarty3/friend_complete_eml.tpl create mode 100644 view/nb-no/smarty3/intro_complete_eml.tpl create mode 100644 view/nb-no/smarty3/lostpass_eml.tpl create mode 100644 view/nb-no/smarty3/passchanged_eml.tpl create mode 100644 view/nb-no/smarty3/register_open_eml.tpl create mode 100644 view/nb-no/smarty3/register_verify_eml.tpl create mode 100644 view/nb-no/smarty3/request_notify_eml.tpl create mode 100644 view/nb-no/smarty3/update_fail_eml.tpl create mode 100644 view/pl/smarty3/follow_notify_eml.tpl create mode 100644 view/pl/smarty3/friend_complete_eml.tpl create mode 100644 view/pl/smarty3/intro_complete_eml.tpl create mode 100644 view/pl/smarty3/lostpass_eml.tpl create mode 100644 view/pl/smarty3/passchanged_eml.tpl create mode 100644 view/pl/smarty3/register_open_eml.tpl create mode 100644 view/pl/smarty3/register_verify_eml.tpl create mode 100644 view/pl/smarty3/request_notify_eml.tpl create mode 100644 view/pl/smarty3/update_fail_eml.tpl create mode 100644 view/pt-br/smarty3/intro_complete_eml.tpl create mode 100644 view/pt-br/smarty3/update_fail_eml.tpl create mode 100644 view/smarty3/404.tpl create mode 100644 view/smarty3/acl_selector.tpl create mode 100644 view/smarty3/admin_aside.tpl create mode 100644 view/smarty3/admin_logs.tpl create mode 100644 view/smarty3/admin_plugins.tpl create mode 100644 view/smarty3/admin_plugins_details.tpl create mode 100644 view/smarty3/admin_remoteupdate.tpl create mode 100644 view/smarty3/admin_site.tpl create mode 100644 view/smarty3/admin_summary.tpl create mode 100644 view/smarty3/admin_users.tpl create mode 100644 view/smarty3/album_edit.tpl create mode 100644 view/smarty3/api_config_xml.tpl create mode 100644 view/smarty3/api_friends_xml.tpl create mode 100644 view/smarty3/api_ratelimit_xml.tpl create mode 100644 view/smarty3/api_status_xml.tpl create mode 100644 view/smarty3/api_test_xml.tpl create mode 100644 view/smarty3/api_timeline_atom.tpl create mode 100644 view/smarty3/api_timeline_rss.tpl create mode 100644 view/smarty3/api_timeline_xml.tpl create mode 100644 view/smarty3/api_user_xml.tpl create mode 100644 view/smarty3/apps.tpl create mode 100644 view/smarty3/atom_feed.tpl create mode 100644 view/smarty3/atom_feed_dfrn.tpl create mode 100644 view/smarty3/atom_mail.tpl create mode 100644 view/smarty3/atom_relocate.tpl create mode 100644 view/smarty3/atom_suggest.tpl create mode 100644 view/smarty3/auto_request.tpl create mode 100644 view/smarty3/birthdays_reminder.tpl create mode 100644 view/smarty3/categories_widget.tpl create mode 100644 view/smarty3/comment_item.tpl create mode 100644 view/smarty3/common_friends.tpl create mode 100644 view/smarty3/common_tabs.tpl create mode 100644 view/smarty3/contact_block.tpl create mode 100644 view/smarty3/contact_edit.tpl create mode 100644 view/smarty3/contact_end.tpl create mode 100644 view/smarty3/contact_head.tpl create mode 100644 view/smarty3/contact_template.tpl create mode 100644 view/smarty3/contacts-end.tpl create mode 100644 view/smarty3/contacts-head.tpl create mode 100644 view/smarty3/contacts-template.tpl create mode 100644 view/smarty3/contacts-widget-sidebar.tpl create mode 100644 view/smarty3/content.tpl create mode 100644 view/smarty3/conversation.tpl create mode 100644 view/smarty3/crepair.tpl create mode 100644 view/smarty3/cropbody.tpl create mode 100644 view/smarty3/cropend.tpl create mode 100644 view/smarty3/crophead.tpl create mode 100644 view/smarty3/delegate.tpl create mode 100644 view/smarty3/dfrn_req_confirm.tpl create mode 100644 view/smarty3/dfrn_request.tpl create mode 100644 view/smarty3/diasp_dec_hdr.tpl create mode 100644 view/smarty3/diaspora_comment.tpl create mode 100644 view/smarty3/diaspora_comment_relay.tpl create mode 100644 view/smarty3/diaspora_conversation.tpl create mode 100644 view/smarty3/diaspora_like.tpl create mode 100644 view/smarty3/diaspora_like_relay.tpl create mode 100644 view/smarty3/diaspora_message.tpl create mode 100644 view/smarty3/diaspora_photo.tpl create mode 100644 view/smarty3/diaspora_post.tpl create mode 100644 view/smarty3/diaspora_profile.tpl create mode 100644 view/smarty3/diaspora_relay_retraction.tpl create mode 100644 view/smarty3/diaspora_relayable_retraction.tpl create mode 100644 view/smarty3/diaspora_retract.tpl create mode 100644 view/smarty3/diaspora_share.tpl create mode 100644 view/smarty3/diaspora_signed_retract.tpl create mode 100644 view/smarty3/diaspora_vcard.tpl create mode 100644 view/smarty3/directory_header.tpl create mode 100644 view/smarty3/directory_item.tpl create mode 100644 view/smarty3/display-head.tpl create mode 100644 view/smarty3/email_notify_html.tpl create mode 100644 view/smarty3/email_notify_text.tpl create mode 100644 view/smarty3/end.tpl create mode 100644 view/smarty3/event.tpl create mode 100644 view/smarty3/event_end.tpl create mode 100644 view/smarty3/event_form.tpl create mode 100644 view/smarty3/event_head.tpl create mode 100644 view/smarty3/events-js.tpl create mode 100644 view/smarty3/events.tpl create mode 100644 view/smarty3/events_reminder.tpl create mode 100644 view/smarty3/failed_updates.tpl create mode 100644 view/smarty3/fake_feed.tpl create mode 100644 view/smarty3/field.tpl create mode 100644 view/smarty3/field_checkbox.tpl create mode 100644 view/smarty3/field_combobox.tpl create mode 100644 view/smarty3/field_custom.tpl create mode 100644 view/smarty3/field_input.tpl create mode 100644 view/smarty3/field_intcheckbox.tpl create mode 100644 view/smarty3/field_openid.tpl create mode 100644 view/smarty3/field_password.tpl create mode 100644 view/smarty3/field_radio.tpl create mode 100644 view/smarty3/field_richtext.tpl create mode 100644 view/smarty3/field_select.tpl create mode 100644 view/smarty3/field_select_raw.tpl create mode 100644 view/smarty3/field_textarea.tpl create mode 100644 view/smarty3/field_themeselect.tpl create mode 100644 view/smarty3/field_yesno.tpl create mode 100644 view/smarty3/fileas_widget.tpl create mode 100644 view/smarty3/filebrowser.tpl create mode 100644 view/smarty3/filer_dialog.tpl create mode 100644 view/smarty3/follow.tpl create mode 100644 view/smarty3/follow_slap.tpl create mode 100644 view/smarty3/generic_links_widget.tpl create mode 100644 view/smarty3/group_drop.tpl create mode 100644 view/smarty3/group_edit.tpl create mode 100644 view/smarty3/group_selection.tpl create mode 100644 view/smarty3/group_side.tpl create mode 100644 view/smarty3/groupeditor.tpl create mode 100644 view/smarty3/head.tpl create mode 100644 view/smarty3/hide_comments.tpl create mode 100644 view/smarty3/install.tpl create mode 100644 view/smarty3/install_checks.tpl create mode 100644 view/smarty3/install_db.tpl create mode 100644 view/smarty3/install_settings.tpl create mode 100644 view/smarty3/intros.tpl create mode 100644 view/smarty3/invite.tpl create mode 100644 view/smarty3/jot-end.tpl create mode 100644 view/smarty3/jot-header.tpl create mode 100644 view/smarty3/jot.tpl create mode 100644 view/smarty3/jot_geotag.tpl create mode 100644 view/smarty3/lang_selector.tpl create mode 100644 view/smarty3/like_noshare.tpl create mode 100644 view/smarty3/login.tpl create mode 100644 view/smarty3/login_head.tpl create mode 100644 view/smarty3/logout.tpl create mode 100644 view/smarty3/lostpass.tpl create mode 100644 view/smarty3/magicsig.tpl create mode 100644 view/smarty3/mail_conv.tpl create mode 100644 view/smarty3/mail_display.tpl create mode 100644 view/smarty3/mail_head.tpl create mode 100644 view/smarty3/mail_list.tpl create mode 100644 view/smarty3/match.tpl create mode 100644 view/smarty3/message-end.tpl create mode 100644 view/smarty3/message-head.tpl create mode 100644 view/smarty3/message_side.tpl create mode 100644 view/smarty3/moderated_comment.tpl create mode 100644 view/smarty3/mood_content.tpl create mode 100644 view/smarty3/msg-end.tpl create mode 100644 view/smarty3/msg-header.tpl create mode 100644 view/smarty3/nav.tpl create mode 100644 view/smarty3/netfriend.tpl create mode 100644 view/smarty3/nets.tpl create mode 100644 view/smarty3/nogroup-template.tpl create mode 100644 view/smarty3/notifications.tpl create mode 100644 view/smarty3/notifications_comments_item.tpl create mode 100644 view/smarty3/notifications_dislikes_item.tpl create mode 100644 view/smarty3/notifications_friends_item.tpl create mode 100644 view/smarty3/notifications_likes_item.tpl create mode 100644 view/smarty3/notifications_network_item.tpl create mode 100644 view/smarty3/notifications_posts_item.tpl create mode 100644 view/smarty3/notify.tpl create mode 100644 view/smarty3/oauth_authorize.tpl create mode 100644 view/smarty3/oauth_authorize_done.tpl create mode 100644 view/smarty3/oembed_video.tpl create mode 100644 view/smarty3/oexchange_xrd.tpl create mode 100644 view/smarty3/opensearch.tpl create mode 100644 view/smarty3/pagetypes.tpl create mode 100644 view/smarty3/peoplefind.tpl create mode 100644 view/smarty3/photo_album.tpl create mode 100644 view/smarty3/photo_drop.tpl create mode 100644 view/smarty3/photo_edit.tpl create mode 100644 view/smarty3/photo_edit_head.tpl create mode 100644 view/smarty3/photo_item.tpl create mode 100644 view/smarty3/photo_top.tpl create mode 100644 view/smarty3/photo_view.tpl create mode 100644 view/smarty3/photos_head.tpl create mode 100644 view/smarty3/photos_recent.tpl create mode 100644 view/smarty3/photos_upload.tpl create mode 100644 view/smarty3/poco_entry_xml.tpl create mode 100644 view/smarty3/poco_xml.tpl create mode 100644 view/smarty3/poke_content.tpl create mode 100644 view/smarty3/posted_date_widget.tpl create mode 100644 view/smarty3/profed_end.tpl create mode 100644 view/smarty3/profed_head.tpl create mode 100644 view/smarty3/profile-hide-friends.tpl create mode 100644 view/smarty3/profile-hide-wall.tpl create mode 100644 view/smarty3/profile-in-directory.tpl create mode 100644 view/smarty3/profile-in-netdir.tpl create mode 100644 view/smarty3/profile_advanced.tpl create mode 100644 view/smarty3/profile_edit.tpl create mode 100644 view/smarty3/profile_edlink.tpl create mode 100644 view/smarty3/profile_entry.tpl create mode 100644 view/smarty3/profile_listing_header.tpl create mode 100644 view/smarty3/profile_photo.tpl create mode 100644 view/smarty3/profile_publish.tpl create mode 100644 view/smarty3/profile_vcard.tpl create mode 100644 view/smarty3/prv_message.tpl create mode 100644 view/smarty3/pwdreset.tpl create mode 100644 view/smarty3/register.tpl create mode 100644 view/smarty3/remote_friends_common.tpl create mode 100644 view/smarty3/removeme.tpl create mode 100644 view/smarty3/saved_searches_aside.tpl create mode 100644 view/smarty3/search_item.tpl create mode 100644 view/smarty3/settings-end.tpl create mode 100644 view/smarty3/settings-head.tpl create mode 100644 view/smarty3/settings.tpl create mode 100644 view/smarty3/settings_addons.tpl create mode 100644 view/smarty3/settings_connectors.tpl create mode 100644 view/smarty3/settings_display.tpl create mode 100644 view/smarty3/settings_display_end.tpl create mode 100644 view/smarty3/settings_features.tpl create mode 100644 view/smarty3/settings_nick_set.tpl create mode 100644 view/smarty3/settings_nick_subdir.tpl create mode 100644 view/smarty3/settings_oauth.tpl create mode 100644 view/smarty3/settings_oauth_edit.tpl create mode 100644 view/smarty3/suggest_friends.tpl create mode 100644 view/smarty3/suggestions.tpl create mode 100644 view/smarty3/tag_slap.tpl create mode 100644 view/smarty3/threaded_conversation.tpl create mode 100644 view/smarty3/toggle_mobile_footer.tpl create mode 100644 view/smarty3/uexport.tpl create mode 100644 view/smarty3/uimport.tpl create mode 100644 view/smarty3/vcard-widget.tpl create mode 100644 view/smarty3/viewcontact_template.tpl create mode 100644 view/smarty3/voting_fakelink.tpl create mode 100644 view/smarty3/wall_thread.tpl create mode 100644 view/smarty3/wallmessage.tpl create mode 100644 view/smarty3/wallmsg-end.tpl create mode 100644 view/smarty3/wallmsg-header.tpl create mode 100644 view/smarty3/xrd_diaspora.tpl create mode 100644 view/smarty3/xrd_host.tpl create mode 100644 view/smarty3/xrd_person.tpl create mode 100644 view/sv/smarty3/cmnt_received_eml.tpl create mode 100644 view/sv/smarty3/follow_notify_eml.tpl create mode 100644 view/sv/smarty3/friend_complete_eml.tpl create mode 100644 view/sv/smarty3/htconfig.tpl create mode 100644 view/sv/smarty3/intro_complete_eml.tpl create mode 100644 view/sv/smarty3/lostpass_eml.tpl create mode 100644 view/sv/smarty3/mail_received_html_body_eml.tpl create mode 100644 view/sv/smarty3/mail_received_text_body_eml.tpl create mode 100644 view/sv/smarty3/passchanged_eml.tpl create mode 100644 view/sv/smarty3/register_open_eml.tpl create mode 100644 view/sv/smarty3/register_verify_eml.tpl create mode 100644 view/sv/smarty3/request_notify_eml.tpl create mode 100644 view/sv/smarty3/wall_received_eml.tpl create mode 100644 view/theme/cleanzero/smarty3/nav.tpl create mode 100644 view/theme/cleanzero/smarty3/theme_settings.tpl create mode 100644 view/theme/comix-plain/smarty3/comment_item.tpl create mode 100644 view/theme/comix-plain/smarty3/search_item.tpl create mode 100644 view/theme/comix/smarty3/comment_item.tpl create mode 100644 view/theme/comix/smarty3/search_item.tpl create mode 100644 view/theme/diabook/smarty3/admin_users.tpl create mode 100644 view/theme/diabook/smarty3/bottom.tpl create mode 100644 view/theme/diabook/smarty3/ch_directory_item.tpl create mode 100644 view/theme/diabook/smarty3/comment_item.tpl create mode 100644 view/theme/diabook/smarty3/communityhome.tpl create mode 100644 view/theme/diabook/smarty3/contact_template.tpl create mode 100644 view/theme/diabook/smarty3/directory_item.tpl create mode 100644 view/theme/diabook/smarty3/footer.tpl create mode 100644 view/theme/diabook/smarty3/generic_links_widget.tpl create mode 100644 view/theme/diabook/smarty3/group_side.tpl create mode 100644 view/theme/diabook/smarty3/jot.tpl create mode 100644 view/theme/diabook/smarty3/login.tpl create mode 100644 view/theme/diabook/smarty3/mail_conv.tpl create mode 100644 view/theme/diabook/smarty3/mail_display.tpl create mode 100644 view/theme/diabook/smarty3/mail_list.tpl create mode 100644 view/theme/diabook/smarty3/message_side.tpl create mode 100644 view/theme/diabook/smarty3/nav.tpl create mode 100644 view/theme/diabook/smarty3/nets.tpl create mode 100644 view/theme/diabook/smarty3/oembed_video.tpl create mode 100644 view/theme/diabook/smarty3/photo_item.tpl create mode 100644 view/theme/diabook/smarty3/photo_view.tpl create mode 100644 view/theme/diabook/smarty3/profile_side.tpl create mode 100644 view/theme/diabook/smarty3/profile_vcard.tpl create mode 100644 view/theme/diabook/smarty3/prv_message.tpl create mode 100644 view/theme/diabook/smarty3/right_aside.tpl create mode 100644 view/theme/diabook/smarty3/search_item.tpl create mode 100644 view/theme/diabook/smarty3/theme_settings.tpl create mode 100644 view/theme/diabook/smarty3/wall_thread.tpl create mode 100644 view/theme/dispy/smarty3/bottom.tpl create mode 100644 view/theme/dispy/smarty3/comment_item.tpl create mode 100644 view/theme/dispy/smarty3/communityhome.tpl create mode 100644 view/theme/dispy/smarty3/contact_template.tpl create mode 100644 view/theme/dispy/smarty3/conversation.tpl create mode 100644 view/theme/dispy/smarty3/group_side.tpl create mode 100644 view/theme/dispy/smarty3/head.tpl create mode 100644 view/theme/dispy/smarty3/header.tpl create mode 100644 view/theme/dispy/smarty3/jot-header.tpl create mode 100644 view/theme/dispy/smarty3/jot.tpl create mode 100644 view/theme/dispy/smarty3/lang_selector.tpl create mode 100644 view/theme/dispy/smarty3/mail_head.tpl create mode 100644 view/theme/dispy/smarty3/nav.tpl create mode 100644 view/theme/dispy/smarty3/photo_edit.tpl create mode 100644 view/theme/dispy/smarty3/photo_view.tpl create mode 100644 view/theme/dispy/smarty3/profile_vcard.tpl create mode 100644 view/theme/dispy/smarty3/saved_searches_aside.tpl create mode 100644 view/theme/dispy/smarty3/search_item.tpl create mode 100644 view/theme/dispy/smarty3/theme_settings.tpl create mode 100644 view/theme/dispy/smarty3/threaded_conversation.tpl create mode 100644 view/theme/dispy/smarty3/wall_thread.tpl create mode 100644 view/theme/duepuntozero/smarty3/comment_item.tpl create mode 100644 view/theme/duepuntozero/smarty3/lang_selector.tpl create mode 100644 view/theme/duepuntozero/smarty3/moderated_comment.tpl create mode 100644 view/theme/duepuntozero/smarty3/nav.tpl create mode 100644 view/theme/duepuntozero/smarty3/profile_vcard.tpl create mode 100644 view/theme/duepuntozero/smarty3/prv_message.tpl create mode 100644 view/theme/facepark/smarty3/comment_item.tpl create mode 100644 view/theme/facepark/smarty3/group_side.tpl create mode 100644 view/theme/facepark/smarty3/jot.tpl create mode 100644 view/theme/facepark/smarty3/nav.tpl create mode 100644 view/theme/facepark/smarty3/profile_vcard.tpl create mode 100644 view/theme/facepark/smarty3/search_item.tpl create mode 100644 view/theme/frost-mobile/smarty3/acl_selector.tpl create mode 100644 view/theme/frost-mobile/smarty3/admin_aside.tpl create mode 100644 view/theme/frost-mobile/smarty3/admin_site.tpl create mode 100644 view/theme/frost-mobile/smarty3/comment_item.tpl create mode 100644 view/theme/frost-mobile/smarty3/contact_edit.tpl create mode 100644 view/theme/frost-mobile/smarty3/contact_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/contact_template.tpl create mode 100644 view/theme/frost-mobile/smarty3/contacts-end.tpl create mode 100644 view/theme/frost-mobile/smarty3/contacts-head.tpl create mode 100644 view/theme/frost-mobile/smarty3/contacts-template.tpl create mode 100644 view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl create mode 100644 view/theme/frost-mobile/smarty3/conversation.tpl create mode 100644 view/theme/frost-mobile/smarty3/cropbody.tpl create mode 100644 view/theme/frost-mobile/smarty3/cropend.tpl create mode 100644 view/theme/frost-mobile/smarty3/crophead.tpl create mode 100644 view/theme/frost-mobile/smarty3/display-head.tpl create mode 100644 view/theme/frost-mobile/smarty3/end.tpl create mode 100644 view/theme/frost-mobile/smarty3/event_end.tpl create mode 100644 view/theme/frost-mobile/smarty3/event_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/field_checkbox.tpl create mode 100644 view/theme/frost-mobile/smarty3/field_input.tpl create mode 100644 view/theme/frost-mobile/smarty3/field_openid.tpl create mode 100644 view/theme/frost-mobile/smarty3/field_password.tpl create mode 100644 view/theme/frost-mobile/smarty3/field_themeselect.tpl create mode 100644 view/theme/frost-mobile/smarty3/generic_links_widget.tpl create mode 100644 view/theme/frost-mobile/smarty3/head.tpl create mode 100644 view/theme/frost-mobile/smarty3/jot-end.tpl create mode 100644 view/theme/frost-mobile/smarty3/jot-header.tpl create mode 100644 view/theme/frost-mobile/smarty3/jot.tpl create mode 100644 view/theme/frost-mobile/smarty3/jot_geotag.tpl create mode 100644 view/theme/frost-mobile/smarty3/lang_selector.tpl create mode 100644 view/theme/frost-mobile/smarty3/login.tpl create mode 100644 view/theme/frost-mobile/smarty3/login_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/lostpass.tpl create mode 100644 view/theme/frost-mobile/smarty3/mail_conv.tpl create mode 100644 view/theme/frost-mobile/smarty3/message-end.tpl create mode 100644 view/theme/frost-mobile/smarty3/message-head.tpl create mode 100644 view/theme/frost-mobile/smarty3/moderated_comment.tpl create mode 100644 view/theme/frost-mobile/smarty3/msg-header.tpl create mode 100644 view/theme/frost-mobile/smarty3/nav.tpl create mode 100644 view/theme/frost-mobile/smarty3/photo_edit.tpl create mode 100644 view/theme/frost-mobile/smarty3/photo_edit_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/photo_view.tpl create mode 100644 view/theme/frost-mobile/smarty3/photos_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/photos_upload.tpl create mode 100644 view/theme/frost-mobile/smarty3/profed_end.tpl create mode 100644 view/theme/frost-mobile/smarty3/profed_head.tpl create mode 100644 view/theme/frost-mobile/smarty3/profile_edit.tpl create mode 100644 view/theme/frost-mobile/smarty3/profile_photo.tpl create mode 100644 view/theme/frost-mobile/smarty3/profile_vcard.tpl create mode 100644 view/theme/frost-mobile/smarty3/prv_message.tpl create mode 100644 view/theme/frost-mobile/smarty3/register.tpl create mode 100644 view/theme/frost-mobile/smarty3/settings-head.tpl create mode 100644 view/theme/frost-mobile/smarty3/settings.tpl create mode 100644 view/theme/frost-mobile/smarty3/settings_display_end.tpl create mode 100644 view/theme/frost-mobile/smarty3/threaded_conversation.tpl create mode 100644 view/theme/frost-mobile/smarty3/voting_fakelink.tpl create mode 100644 view/theme/frost-mobile/smarty3/wall_thread.tpl create mode 100644 view/theme/frost-mobile/smarty3/wallmsg-end.tpl create mode 100644 view/theme/frost-mobile/smarty3/wallmsg-header.tpl create mode 100644 view/theme/frost-mobile/voting_fakelink.tpl create mode 100644 view/theme/frost/smarty3/acl_selector.tpl create mode 100644 view/theme/frost/smarty3/admin_aside.tpl create mode 100644 view/theme/frost/smarty3/admin_site.tpl create mode 100644 view/theme/frost/smarty3/comment_item.tpl create mode 100644 view/theme/frost/smarty3/contact_end.tpl create mode 100644 view/theme/frost/smarty3/contact_head.tpl create mode 100644 view/theme/frost/smarty3/contact_template.tpl create mode 100644 view/theme/frost/smarty3/contacts-end.tpl create mode 100644 view/theme/frost/smarty3/contacts-head.tpl create mode 100644 view/theme/frost/smarty3/contacts-template.tpl create mode 100644 view/theme/frost/smarty3/cropbody.tpl create mode 100644 view/theme/frost/smarty3/cropend.tpl create mode 100644 view/theme/frost/smarty3/crophead.tpl create mode 100644 view/theme/frost/smarty3/display-head.tpl create mode 100644 view/theme/frost/smarty3/end.tpl create mode 100644 view/theme/frost/smarty3/event_end.tpl create mode 100644 view/theme/frost/smarty3/event_head.tpl create mode 100644 view/theme/frost/smarty3/field_combobox.tpl create mode 100644 view/theme/frost/smarty3/field_input.tpl create mode 100644 view/theme/frost/smarty3/field_openid.tpl create mode 100644 view/theme/frost/smarty3/field_password.tpl create mode 100644 view/theme/frost/smarty3/field_themeselect.tpl create mode 100644 view/theme/frost/smarty3/filebrowser.tpl create mode 100644 view/theme/frost/smarty3/head.tpl create mode 100644 view/theme/frost/smarty3/jot-end.tpl create mode 100644 view/theme/frost/smarty3/jot-header.tpl create mode 100644 view/theme/frost/smarty3/jot.tpl create mode 100644 view/theme/frost/smarty3/jot_geotag.tpl create mode 100644 view/theme/frost/smarty3/lang_selector.tpl create mode 100644 view/theme/frost/smarty3/login.tpl create mode 100644 view/theme/frost/smarty3/login_head.tpl create mode 100644 view/theme/frost/smarty3/lostpass.tpl create mode 100644 view/theme/frost/smarty3/message-end.tpl create mode 100644 view/theme/frost/smarty3/message-head.tpl create mode 100644 view/theme/frost/smarty3/moderated_comment.tpl create mode 100644 view/theme/frost/smarty3/msg-end.tpl create mode 100644 view/theme/frost/smarty3/msg-header.tpl create mode 100644 view/theme/frost/smarty3/nav.tpl create mode 100644 view/theme/frost/smarty3/photo_edit.tpl create mode 100644 view/theme/frost/smarty3/photo_edit_head.tpl create mode 100644 view/theme/frost/smarty3/photo_view.tpl create mode 100644 view/theme/frost/smarty3/photos_head.tpl create mode 100644 view/theme/frost/smarty3/photos_upload.tpl create mode 100644 view/theme/frost/smarty3/posted_date_widget.tpl create mode 100644 view/theme/frost/smarty3/profed_end.tpl create mode 100644 view/theme/frost/smarty3/profed_head.tpl create mode 100644 view/theme/frost/smarty3/profile_edit.tpl create mode 100644 view/theme/frost/smarty3/profile_vcard.tpl create mode 100644 view/theme/frost/smarty3/prv_message.tpl create mode 100644 view/theme/frost/smarty3/register.tpl create mode 100644 view/theme/frost/smarty3/settings-head.tpl create mode 100644 view/theme/frost/smarty3/settings_display_end.tpl create mode 100644 view/theme/frost/smarty3/threaded_conversation.tpl create mode 100644 view/theme/frost/smarty3/voting_fakelink.tpl create mode 100644 view/theme/frost/smarty3/wall_thread.tpl create mode 100644 view/theme/frost/smarty3/wallmsg-end.tpl create mode 100644 view/theme/frost/smarty3/wallmsg-header.tpl create mode 100644 view/theme/frost/voting_fakelink.tpl create mode 100644 view/theme/quattro/smarty3/birthdays_reminder.tpl create mode 100644 view/theme/quattro/smarty3/comment_item.tpl create mode 100644 view/theme/quattro/smarty3/contact_template.tpl create mode 100644 view/theme/quattro/smarty3/conversation.tpl create mode 100644 view/theme/quattro/smarty3/events_reminder.tpl create mode 100644 view/theme/quattro/smarty3/fileas_widget.tpl create mode 100644 view/theme/quattro/smarty3/generic_links_widget.tpl create mode 100644 view/theme/quattro/smarty3/group_side.tpl create mode 100644 view/theme/quattro/smarty3/jot.tpl create mode 100644 view/theme/quattro/smarty3/mail_conv.tpl create mode 100644 view/theme/quattro/smarty3/mail_display.tpl create mode 100644 view/theme/quattro/smarty3/mail_list.tpl create mode 100644 view/theme/quattro/smarty3/message_side.tpl create mode 100644 view/theme/quattro/smarty3/nav.tpl create mode 100644 view/theme/quattro/smarty3/nets.tpl create mode 100644 view/theme/quattro/smarty3/photo_view.tpl create mode 100644 view/theme/quattro/smarty3/profile_vcard.tpl create mode 100644 view/theme/quattro/smarty3/prv_message.tpl create mode 100644 view/theme/quattro/smarty3/saved_searches_aside.tpl create mode 100644 view/theme/quattro/smarty3/search_item.tpl create mode 100644 view/theme/quattro/smarty3/theme_settings.tpl create mode 100644 view/theme/quattro/smarty3/threaded_conversation.tpl create mode 100644 view/theme/quattro/smarty3/wall_item_tag.tpl create mode 100644 view/theme/quattro/smarty3/wall_thread.tpl create mode 100644 view/theme/slackr/smarty3/birthdays_reminder.tpl create mode 100644 view/theme/slackr/smarty3/events_reminder.tpl create mode 100644 view/theme/smoothly/smarty3/bottom.tpl create mode 100644 view/theme/smoothly/smarty3/follow.tpl create mode 100644 view/theme/smoothly/smarty3/jot-header.tpl create mode 100644 view/theme/smoothly/smarty3/jot.tpl create mode 100644 view/theme/smoothly/smarty3/lang_selector.tpl create mode 100644 view/theme/smoothly/smarty3/login.tpl create mode 100644 view/theme/smoothly/smarty3/nav.tpl create mode 100644 view/theme/smoothly/smarty3/search_item.tpl create mode 100644 view/theme/smoothly/smarty3/wall_thread.tpl create mode 100644 view/theme/testbubble/smarty3/comment_item.tpl create mode 100644 view/theme/testbubble/smarty3/group_drop.tpl create mode 100644 view/theme/testbubble/smarty3/group_edit.tpl create mode 100644 view/theme/testbubble/smarty3/group_side.tpl create mode 100644 view/theme/testbubble/smarty3/jot-header.tpl create mode 100644 view/theme/testbubble/smarty3/jot.tpl create mode 100644 view/theme/testbubble/smarty3/match.tpl create mode 100644 view/theme/testbubble/smarty3/nav.tpl create mode 100644 view/theme/testbubble/smarty3/photo_album.tpl create mode 100644 view/theme/testbubble/smarty3/photo_top.tpl create mode 100644 view/theme/testbubble/smarty3/photo_view.tpl create mode 100644 view/theme/testbubble/smarty3/profile_entry.tpl create mode 100644 view/theme/testbubble/smarty3/profile_vcard.tpl create mode 100644 view/theme/testbubble/smarty3/saved_searches_aside.tpl create mode 100644 view/theme/testbubble/smarty3/search_item.tpl create mode 100644 view/theme/testbubble/smarty3/wall_thread.tpl create mode 100644 view/theme/vier/smarty3/comment_item.tpl create mode 100644 view/theme/vier/smarty3/mail_list.tpl create mode 100644 view/theme/vier/smarty3/nav.tpl create mode 100644 view/theme/vier/smarty3/search_item.tpl create mode 100644 view/theme/vier/smarty3/threaded_conversation.tpl create mode 100644 view/theme/vier/smarty3/wall_thread.tpl create mode 100644 view/voting_fakelink.tpl create mode 100644 view/zh-cn/smarty3/follow_notify_eml.tpl create mode 100644 view/zh-cn/smarty3/friend_complete_eml.tpl create mode 100644 view/zh-cn/smarty3/intro_complete_eml.tpl create mode 100644 view/zh-cn/smarty3/lostpass_eml.tpl create mode 100644 view/zh-cn/smarty3/passchanged_eml.tpl create mode 100644 view/zh-cn/smarty3/register_open_eml.tpl create mode 100644 view/zh-cn/smarty3/register_verify_eml.tpl create mode 100644 view/zh-cn/smarty3/request_notify_eml.tpl create mode 100644 view/zh-cn/smarty3/update_fail_eml.tpl diff --git a/boot.php b/boot.php index 563067ad63..e8561a6150 100644 --- a/boot.php +++ b/boot.php @@ -380,9 +380,13 @@ if(! class_exists('App')) { 'videoheight' => 350, 'force_max_items' => 0, 'thread_allow' => true, - 'stylesheet' => '' + 'stylesheet' => '', + 'template_engine' => 'internal', ); + public $smarty3_ldelim = '{{'; + public $smarty3_rdelim = '}}'; + private $scheme; private $hostname; private $baseurl; @@ -613,6 +617,16 @@ if(! class_exists('App')) { if(!isset($this->page['htmlhead'])) $this->page['htmlhead'] = ''; $tpl = get_markup_template('head.tpl'); + + // If we're using Smarty, then doing replace_macros() will replace + // any unrecognized variables with a blank string. Since we delay + // replacing $stylesheet until later, we need to replace it now + // with another variable name + if($this->theme['template_engine'] === 'smarty3') + $stylesheet = $this->smarty3_ldelim . '$stylesheet' . $this->smarty3_rdelim; + else + $stylesheet = '$stylesheet'; + $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! '$local_user' => local_user(), @@ -621,7 +635,8 @@ if(! class_exists('App')) { '$comment' => t('Comment'), '$showmore' => t('show more'), '$showfewer' => t('show fewer'), - '$update_interval' => $interval + '$update_interval' => $interval, + '$stylesheet' => $stylesheet )) . $this->page['htmlhead']; } @@ -955,7 +970,15 @@ if(! function_exists('login')) { } - $o .= replace_macros($tpl,array( + $includes = array( + '$field_input' => 'field_input.tpl', + '$field_password' => 'field_password.tpl', + '$field_openid' => 'field_openid.tpl', + '$field_checkbox' => 'field_checkbox.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$dest_url' => $dest_url, '$logout' => t('Logout'), @@ -1324,16 +1347,25 @@ if(! function_exists('profile_sidebar')) { $tpl = get_markup_template('profile_vcard.tpl'); - $o .= replace_macros($tpl, array( + + $includes = array( + '$diaspora_vcard' => 'diaspora_vcard.tpl' + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + if($a->theme['template_engine'] === 'internal') + $location = template_escape($location); + + $o .= replace_macros($tpl, $includes + array( '$profile' => $profile, '$connect' => $connect, '$wallmessage' => $wallmessage, - '$location' => template_escape($location), + '$location' => $location, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, - '$diaspora' => $diaspora, + '$diaspora_info' => $diaspora, '$contact_block' => $contact_block, )); diff --git a/include/conversation.php b/include/conversation.php index e4f3ec9ff6..9cc6a83427 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -581,33 +581,54 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { list($categories, $folders) = get_cats_and_terms($item); + if($a->theme['template_engine'] === 'internal') { + $profile_name_e = template_escape($profile_name); + $item['title_e'] = template_escape($item['title']); + $body_e = template_escape($body); + $tags_e = template_escape($tags); + $hashtags_e = template_escape($hashtags); + $mentions_e = template_escape($mentions); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $profile_name_e = $profile_name; + $item['title_e'] = $item['title']; + $body_e = $body; + $tags_e = $tags; + $hashtags_e = $hashtags; + $mentions_e = $mentions; + $location_e = $location; + $owner_name_e = $owner_name; + } + $tmp_item = array( 'template' => $tpl, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $profile_name_e, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => $profile_avatar, - 'title' => template_escape($item['title']), - 'body' => template_escape($body), - 'tags' => template_escape($tags), - 'hashtags' => template_escape($hashtags), - 'mentions' => template_escape($mentions), + 'title' => $item['title_e'], + 'body' => $body_e, + 'tags' => $tags_e, + 'hashtags' => $hashtags_e, + 'mentions' => $mentions_e, 'txt_cats' => t('Categories:'), 'txt_folders' => t('Filed under:'), 'has_cats' => ((count($categories)) ? 'true' : ''), 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, - 'text' => strip_tags(template_escape($body)), + 'text' => strip_tags($body_e), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => '', - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, 'plink' => get_plink($item), @@ -682,7 +703,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$live_update' => $live_update_div, - '$remove' => t('remove'), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, @@ -856,12 +876,27 @@ function format_like($cnt,$arr,$type,$id) { if($cnt == 1) $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ; else { - $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"'; - $o .= (($type === 'like') ? - sprintf( t('%2$d people like this.'), $spanatts, $cnt) - : - sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt) ); - $o .= EOL ; + //$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"'; + switch($type) { + case 'like': +// $phrase = sprintf( t('%2$d people like this.'), $spanatts, $cnt); + $mood = t('like this'); + break; + case 'dislike': +// $phrase = sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt); + $mood = t('don\'t like this'); + break; + } + $tpl = get_markup_template("voting_fakelink.tpl"); + $phrase = replace_macros($tpl, array( + '$vote_id' => $type . 'list-' . $id, + '$count' => $cnt, + '$people' => t('people'), + '$vote_mood' => $mood + )); + $o .= $phrase; +// $o .= EOL ; + $total = count($arr); if($total >= MAX_LIKERS) $arr = array_slice($arr, 0, MAX_LIKERS - 1); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php new file mode 100644 index 0000000000..2a294e9e24 --- /dev/null +++ b/include/friendica_smarty.php @@ -0,0 +1,36 @@ +root = $_SERVER['DOCUMENT_ROOT'] . '/'; + $this->root = ''; + + $this->setTemplateDir($this->root . 'view/smarty3/'); + $this->setCompileDir($this->root . 'view/smarty3/compiled/'); + $this->setConfigDir($this->root . 'view/smarty3/config/'); + $this->setCacheDir($this->root . 'view/smarty3/cache/'); + + $this->left_delimiter = $a->smarty3_ldelim; + $this->right_delimiter = $a->smarty3_rdelim; + } + + function parsed($template = '') { + if($template) { + return $this->fetch('string:' . $template); + } + return $this->fetch('file:' . $this->root . $this->filename); + } +} + + + diff --git a/include/text.php b/include/text.php index 4212e23ca4..0591390a84 100644 --- a/include/text.php +++ b/include/text.php @@ -9,19 +9,38 @@ // depending on the order in which they were declared in the array. require_once("include/template_processor.php"); +require_once("include/friendica_smarty.php"); if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - - //$ts = microtime(); - $r = $t->replace($s,$r); - //$tt = microtime() - $ts; - - //$a = get_app(); - //$a->page['debug'] .= "$tt
\n"; - return template_unescape($r); +// $ts = microtime(); + $a = get_app(); + + if($a->theme['template_engine'] === 'smarty3') { + $template = ''; + if(gettype($s) === 'string') { + $template = $s; + $s = new FriendicaSmarty(); + } + foreach($r as $key=>$value) { + if($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + $output = $s->parsed($template); + } + else { + $r = $t->replace($s,$r); + + $output = template_unescape($r); + } +// $tt = microtime() - $ts; +// $a = get_app(); +// $a->page['debug'] .= "$tt
\n"; + return $output; }} @@ -421,29 +440,78 @@ if(! function_exists('get_intltext_template')) { function get_intltext_template($s) { global $lang; + $a = get_app(); + $engine = ''; + if($a->theme['template_engine'] === 'smarty3') + $engine = "/smarty3"; + if(! isset($lang)) $lang = 'en'; - if(file_exists("view/$lang/$s")) - return file_get_contents("view/$lang/$s"); - elseif(file_exists("view/en/$s")) - return file_get_contents("view/en/$s"); + if(file_exists("view/$lang$engine/$s")) + return file_get_contents("view/$lang$engine/$s"); + elseif(file_exists("view/en$engine/$s")) + return file_get_contents("view/en$engine/$s"); else - return file_get_contents("view/$s"); + return file_get_contents("view$engine/$s"); }} if(! function_exists('get_markup_template')) { -function get_markup_template($s) { - $a=get_app(); - $theme = current_theme(); - - if(file_exists("view/theme/$theme/$s")) - return file_get_contents("view/theme/$theme/$s"); - elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s")) - return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s"); - else - return file_get_contents("view/$s"); +function get_markup_template($s, $root = '') { +// $ts = microtime(); + $a = get_app(); + if($a->theme['template_engine'] === 'smarty3') { + $template_file = get_template_file($a, 'smarty3/' . $s, $root); + + $template = new FriendicaSmarty(); + $template->filename = $template_file; + +// $tt = microtime() - $ts; +// $a->page['debug'] .= "$tt
\n"; + return $template; + } + else { + $template_file = get_template_file($a, $s, $root); +// $file_contents = file_get_contents($template_file); +// $tt = microtime() - $ts; +// $a->page['debug'] .= "$tt
\n"; +// return $file_contents; + return file_get_contents($template_file); + } +}} + +if(! function_exists("get_template_file")) { +function get_template_file($a, $filename, $root = '') { + $theme = current_theme(); + + // Make sure $root ends with a slash / + if($root !== '' && $root[strlen($root)-1] !== '/') + $root = $root . '/'; + + if(file_exists($root . "view/theme/$theme/$filename")) + $template_file = $root . "view/theme/$theme/$filename"; + elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename")) + $template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename"; + else + $template_file = $root . "view/$filename"; + + return $template_file; +}} + +if(! function_exists("set_template_includes")) { +function set_template_includes($engine, $includes) { + if($engine === 'smarty3') { + $a = get_app(); + foreach($includes as $name=>$path) { +// $sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path); + $sm_includes[$name] = get_template_file($a, 'smarty3/' . $path); + } + return $sm_includes; + } + else { + return $includes; + } }} diff --git a/mod/admin.php b/mod/admin.php index bd0d14bef7..69b2896772 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -439,7 +439,16 @@ function admin_page_site(&$a) { ); $t = get_markup_template("admin_site.tpl"); - return replace_macros($t, array( + + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + '$field_input' => 'field_input.tpl', + '$field_select' => 'field_select.tpl', + '$field_textarea' => 'field_textarea.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($t, $includes + array( '$title' => t('Administration'), '$page' => t('Site'), '$submit' => t('Submit'), @@ -488,7 +497,7 @@ function admin_page_site(&$a) { '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$form_security_token' => get_form_security_token("admin_site"), - + )); } @@ -1109,7 +1118,14 @@ readable."); } } - return replace_macros($t, array( + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + '$field_input' => 'field_input.tpl', + '$field_select' => 'field_select.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($t, $includes + array( '$title' => t('Administration'), '$page' => t('Logs'), '$submit' => t('Submit'), @@ -1168,7 +1184,14 @@ function admin_page_remoteupdate(&$a) { } $tpl = get_markup_template("admin_remoteupdate.tpl"); - return replace_macros($tpl, array( + + $includes = array( + '$field_input' => 'field_input.tpl', + '$field_password' => 'field_password.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($tpl, $includes + array( '$baseurl' => $a->get_baseurl(true), '$submit' => t("Update now"), '$close' => t("Close"), @@ -1181,7 +1204,7 @@ function admin_page_remoteupdate(&$a) { '$ftppath' => array('ftppath', t("FTP Path"), '/',''), '$ftpuser' => array('ftpuser', t("FTP User"), '',''), '$ftppwd' => array('ftppwd', t("FTP Password"), '',''), - '$remotefile'=>array('remotefile','', $u['2'],'') + '$remotefile'=>array('remotefile','', $u['2'],''), )); } diff --git a/mod/contacts.php b/mod/contacts.php index 3ef7b53043..1a57afbf5a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -346,7 +346,12 @@ function contacts_content(&$a) { $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); - $o .= replace_macros($tpl,array( + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, '$submit' => t('Submit'), @@ -388,7 +393,7 @@ function contacts_content(&$a) { '$dir_icon' => $dir_icon, '$alt_text' => $alt_text, '$sparkle' => $sparkle, - '$url' => $url + '$url' => $url, )); @@ -571,7 +576,13 @@ function contacts_content(&$a) { } $tpl = get_markup_template("contacts-template.tpl"); - $o .= replace_macros($tpl,array( + + $includes = array( + '$contact_template' => 'contact_template.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, '$total' => $total, diff --git a/mod/content.php b/mod/content.php index c4b0ca2f62..4210843dd2 100644 --- a/mod/content.php +++ b/mod/content.php @@ -447,6 +447,23 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { $shareable = false; $body = prepare_body($item,true); + + if($a->theme['template_engine'] === 'internal') { + $name_e = template_escape($profile_name); + $title_e = template_escape($item['title']); + $body_e = template_escape($body); + $text_e = strip_tags(template_escape($body)); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $name_e = $profile_name; + $title_e = $item['title']; + $body_e = $body; + $text_e = strip_tags($body); + $location_e = $location; + $owner_name_e = $owner_name; + } //$tmp_item = replace_macros($tpl,array( $tmp_item = array( @@ -455,17 +472,17 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $name_e, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => $profile_avatar, - 'title' => template_escape($item['title']), - 'body' => template_escape($body), - 'text' => strip_tags(template_escape($body)), + 'title' => $title_e, + 'body' => $body_e, + 'text' => $text_e, 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => '', - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, 'plink' => get_plink($item), @@ -802,6 +819,24 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { $body = prepare_body($item,true); //$tmp_item = replace_macros($template, + + if($a->theme['template_engine'] === 'internal') { + $body_e = template_escape($body); + $text_e = strip_tags(template_escape($body)); + $name_e = template_escape($profile_name); + $title_e = template_escape($item['title']); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $body_e = $body; + $text_e = strip_tags($body); + $name_e = $profile_name; + $title_e = $item['title']; + $location_e = $location; + $owner_name_e = $owner_name; + } + $tmp_item = array( // collapse comments in template. I don't like this much... 'comment_firstcollapsed' => $comment_firstcollapsed, @@ -811,8 +846,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, - 'body' => template_escape($body), - 'text' => strip_tags(template_escape($body)), + 'body' => $body_e, + 'text' => $text_e, 'id' => $item['item_id'], 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), @@ -821,19 +856,19 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'vwall' => t('via Wall-To-Wall:'), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $name_e, 'thumb' => $profile_avatar, 'osparkle' => $osparkle, 'sparkle' => $sparkle, - 'title' => template_escape($item['title']), + 'title' => $title_e, 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => $indent, 'shiny' => $shiny, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'plink' => get_plink($item), 'edpost' => $edpost, 'isstarred' => $isstarred, diff --git a/mod/directory.php b/mod/directory.php index 833a4f81cc..3e138570cb 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -143,16 +143,23 @@ function directory_content(&$a) { $tpl = get_markup_template('directory_item.tpl'); + if($a->theme['template_engine'] === 'internal') { + $location_e = template_escape($location); + } + else { + $location_e = $location; + } + $entry = replace_macros($tpl,array( '$id' => $rr['id'], - '$profile-link' => $profile_link, + '$profile_link' => $profile_link, '$photo' => $a->get_cached_avatar_image($rr[$photo]), - '$alt-text' => $rr['name'], + '$alt_text' => $rr['name'], '$name' => $rr['name'], '$details' => $pdesc . $details, - '$page-type' => $page_type, + '$page_type' => $page_type, '$profile' => $profile, - '$location' => template_escape($location), + '$location' => $location_e, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, diff --git a/mod/display.php b/mod/display.php index 6305dd44e7..32c4bcae9f 100644 --- a/mod/display.php +++ b/mod/display.php @@ -16,7 +16,7 @@ function display_content(&$a, $update = 0) { $o = ''; - $a->page['htmlhead'] .= get_markup_template('display-head.tpl'); + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); if($update) { diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 5ee813b4d6..92c6bd3b4b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -55,9 +55,17 @@ function fbrowser_content($a){ global $a; $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, - template_escape($rr['filename']), + $filename_e, $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext ); } @@ -83,7 +91,15 @@ function fbrowser_content($a){ function files2($rr){ global $a; list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + + return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); } $files = array_map("files2", $files); //echo "
"; var_dump($files); killme();
diff --git a/mod/filer.php b/mod/filer.php
index c0cca9e6df..7b0fd59d58 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -25,6 +25,12 @@ function filer_content(&$a) {
 		$filetags = file_tag_file_to_list($filetags,'file');
                 $filetags = explode(",", $filetags);
 		$tpl = get_markup_template("filer_dialog.tpl");
+
+		$includes = array(
+			'$field_combobox' => 'field_combobox.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
 			'$submit' => t('Save'),
diff --git a/mod/group.php b/mod/group.php
index a282dbccf5..f5a37819ed 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -82,7 +82,16 @@ function group_content(&$a) {
 		$switchtotext = 400;
 
 	$tpl = get_markup_template('group_edit.tpl');
-	$context = array('$submit' => t('Submit'));
+
+	$includes = array(
+			'$field_input' => 'field_input.tpl',
+			'$groupeditortpl' => 'groupeditor.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$context = $includes + array(
+			'$submit' => t('Submit'),
+	);
 
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		
@@ -217,15 +226,16 @@ function group_content(&$a) {
 		}
 	}
 
-	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
+		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
+	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 9b2411f266..4121764f1a 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -14,10 +14,18 @@ function hostxrd_init(&$a) {
 		set_config('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array(
-		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+	//$tpl = file_get_contents('view/xrd_host.tpl');
+	/*echo str_replace(array(
+		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
+	$tpl = get_markup_template('xrd_host.tpl');
+	echo replace_macros($tpl, array(
+		'$zhost' => $a->get_hostname(),
+		'$zroot' => z_root(),
+		'$domain' => z_path(),
+		'$zot_post' => z_root() . '/post',
+		'$bigkey' => salmon_key(get_config('system','site_pubkey')),
+	));
 	session_write_close();
 	exit();
 
-}
\ No newline at end of file
+}
diff --git a/mod/install.php b/mod/install.php
index 91b5e3d2d4..ab6d7d204f 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -220,7 +220,14 @@ function install_content(&$a) {
 			
 
 			$tpl = get_markup_template('install_db.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' 	=> 'field_input.tpl',
+				'$field_password' => 'field_password.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl,$includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Database connection'),
 				'$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@@ -260,7 +267,13 @@ function install_content(&$a) {
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 			
 			$tpl = get_markup_template('install_settings.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Site settings'),
 
diff --git a/mod/message.php b/mod/message.php
index 744a3eb3f7..7ca3fba70a 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -282,23 +282,25 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
-			'$header' => t('Send Private Message'),
-			'$to' => t('To:'),
-			'$showinputs' => 'true', 
-			'$prefill' => $prefill,
-			'$autocomp' => $autocomp,
-			'$preid' => $preid,
-			'$subject' => t('Subject:'),
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait'),
-			'$submit' => t('Submit')
+			'$reply' => array(
+				'header' => t('Send Private Message'),
+				'to' => t('To:'),
+				'showinputs' => 'true', 
+				'prefill' => $prefill,
+				'autocomp' => $autocomp,
+				'preid' => $preid,
+				'subject' => t('Subject:'),
+				'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+				'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+				'readonly' => '',
+				'yourmessage' => t('Your message:'),
+				'select' => $select,
+				'parent' => '',
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'wait' => t('Please wait'),
+				'submit' => t('Submit')
+			)
 		));
 
 		return $o;
@@ -346,6 +348,17 @@ function message_content(&$a) {
 			else {
 				$partecipants = sprintf( t("%s and You"), $rr['from-name']);
 			}
+
+			if($a->theme['template_engine'] === 'internal') {
+				$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''));
+				$body_e = template_escape($rr['body']);
+				$to_name_e = template_escape($rr['name']);
+			}
+			else {
+				$subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '');
+				$body_e = $rr['body'];
+				$to_name_e = $rr['name'];
+			}
 			
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
@@ -353,10 +366,10 @@ function message_content(&$a) {
 				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
 				'$sparkle' => ' sparkle',
 				'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
-				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '')),
+				'$subject' => $subject_e,
 				'$delete' => t('Delete conversation'),
-				'$body' => template_escape($rr['body']),
-				'$to_name' => template_escape($rr['name']),
+				'$body' => $body_e,
+				'$to_name' => $to_name_e,
 				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
                                 '$ago' => relative_date($rr['mailcreated']),
 				'$seen' => $rr['mailseen'],
@@ -371,6 +384,10 @@ function message_content(&$a) {
 
 		$o .= $header;
 
+		$plaintext = true;
+		if( local_user() && feature_enabled(local_user(),'richtext') )
+			$plaintext = false;
+
 		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
 			WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
@@ -408,14 +425,18 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 
@@ -440,16 +461,29 @@ function message_content(&$a) {
 			if($extracted['images'])
 				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
 
+			if($a->theme['template_engine'] === 'internal') {
+				$from_name_e = template_escape($message['from-name']);
+				$subject_e = template_escape($message['title']);
+				$body_e = template_escape(smilies(bbcode($message['body'])));
+				$to_name_e = template_escape($message['name']);
+			}
+			else {
+				$from_name_e = $message['from-name'];
+				$subject_e = $message['title'];
+				$body_e = smilies(bbcode($message['body']));
+				$to_name_e = $message['name'];
+			}
+
 			$mails[] = array(
 				'id' => $message['id'],
-				'from_name' => template_escape($message['from-name']),
+				'from_name' => $from_name_e,
 				'from_url' => $from_url,
 				'sparkle' => $sparkle,
 				'from_photo' => $message['from-photo'],
-				'subject' => template_escape($message['title']),
-				'body' => template_escape(smilies(bbcode($message['body']))),
+				'subject' => $subject_e,
+				'body' => $body_e,
 				'delete' => t('Delete message'),
-				'to_name' => template_escape($message['name']),
+				'to_name' => $to_name_e,
 				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
                                 'ago' => relative_date($message['created']),
 			);
@@ -462,7 +496,21 @@ function message_content(&$a) {
 		$parent = '';
 
 		$tpl = get_markup_template('mail_display.tpl');
-		$o = replace_macros($tpl, array(
+
+		$includes = array(
+			'$mail_conv' => 'mail_conv.tpl',
+			'$prv_message' => 'prv_message.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		if($a->theme['template_engine'] === 'internal') {
+			$subjtxt_e = template_escape($message['title']);
+		}
+		else {
+			$subjtxt_e = $message['title'];
+		}
+
+		$o = replace_macros($tpl, $includes + array(
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
@@ -472,20 +520,22 @@ function message_content(&$a) {
 			'$mails' => $mails,
 			
 			// reply
-			'$header' => t('Send Reply'),
-			'$to' => t('To:'),
-			'$showinputs' => '',
-			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
-			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => t('Your message:'),
-			'$text' => '',
-			'$select' => $select,
-			'$parent' => $parent,
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$submit' => t('Submit'),
-			'$wait' => t('Please wait')
+			'$reply_info' => array(
+				'header' => t('Send Reply'),
+				'to' => t('To:'),
+				'showinputs' => '',
+				'subject' => t('Subject:'),
+				'subjtxt' => $subjtxt_e,
+				'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+				'yourmessage' => t('Your message:'),
+				'text' => '',
+				'select' => $select,
+				'parent' => $parent,
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'submit' => t('Submit'),
+				'wait' => t('Please wait'),
+			),
 
 		));
 
diff --git a/mod/nogroup.php b/mod/nogroup.php
index bd1ec82ed2..885ba62c63 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -53,8 +53,15 @@ function nogroup_content(&$a) {
 			);
 		}
 	}
+
 	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$header' => t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
diff --git a/mod/notifications.php b/mod/notifications.php
index b8029fd03f..03a39a268e 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -144,7 +144,13 @@ function notifications_content(&$a) {
 				if($rr['fid']) {
 
 					$return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-					$notif_content .= replace_macros($sugg,array(
+
+					$includes = array(
+						'$field_checkbox' => 'field_checkbox.tpl',
+					);
+					$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+					$notif_content .= replace_macros($sugg,$includes + array(
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => t('Friend Suggestion'),
 						'$intro_id' => $rr['intro_id'],
@@ -161,7 +167,7 @@ function notifications_content(&$a) {
 						'$note' => $rr['note'],
 						'$request' => $rr['frequest'] . '?addr=' . $return_addr,
 						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard')
+						'$discard' => t('Discard'),
 
 					));
 
@@ -190,7 +196,12 @@ function notifications_content(&$a) {
 					));
 				}			
 
-				$notif_content .= replace_macros($tpl,array(
+				$includes = array(
+					'$field_checkbox' => 'field_checkbox.tpl',
+				);
+				$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+				$notif_content .= replace_macros($tpl,$includes + array(
 					'$str_notifytype' => t('Notification type: '),
 					'$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
 					'$dfrn_text' => $dfrn_text,	
@@ -207,7 +218,7 @@ function notifications_content(&$a) {
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
 					'$ignore' => t('Ignore'),
-					'$discard' => t('Discard')
+					'$discard' => t('Discard'),
 
 				));
 			}
@@ -215,9 +226,14 @@ function notifications_content(&$a) {
 		else
 			info( t('No introductions.') . EOL);
 
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -301,9 +317,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more network notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Network Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -331,9 +352,14 @@ function notifications_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 
@@ -426,9 +452,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more personal notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Personal Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -507,9 +538,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more home notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Home Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 	}
diff --git a/mod/notify.php b/mod/notify.php
index ae8273a1d3..3abc1185cf 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -61,13 +61,18 @@ function notify_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => '', // $tabs,
+			'$tabs_data' => '', // $tabs,
 			'$notif_content' => $notif_content,
 		));
 
 	return $o;
 
 
-}
\ No newline at end of file
+}
diff --git a/mod/photos.php b/mod/photos.php
index efccb0e10a..8ac4d85903 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1039,6 +1039,16 @@ function photos_content(&$a) {
 
 
 		$tpl = get_markup_template('photos_upload.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$albumselect_e = template_escape($albumselect);
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+		}
+		else {
+			$albumselect_e = $albumselect;
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+		}
+
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
 			'$sessid' => session_id(),
@@ -1047,9 +1057,9 @@ function photos_content(&$a) {
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
 			'$nosharetext' => t('Do not show a status post for this upload'),
-			'$albumselect' => template_escape($albumselect),
+			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
+			'$aclselect' => $aclselect_e,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? $default_upload : ''),
 			'$uploadurl' => $ret['post_url']
@@ -1092,10 +1102,18 @@ function photos_content(&$a) {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
 					$edit_tpl = get_markup_template('album_edit.tpl');
+
+					if($a->theme['template_engine'] === 'internal') {
+						$album_e = template_escape($album);
+					}
+					else {
+						$album_e = $album;
+					}
+
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
 						'$nickname' => $a->data['user']['nickname'],
-						'$album' => template_escape($album),
+						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
 						'$dropsubmit' => t('Delete Album')
@@ -1135,6 +1153,15 @@ function photos_content(&$a) {
 				
 				$ext = $phototypes[$rr['type']];
 
+				if($a->theme['template_engine'] === 'internal') {
+					$imgalt_e = template_escape($rr['filename']);
+					$desc_e = template_escape($rr['desc']);
+				}
+				else {
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['desc'];
+				}
+
 				$o .= replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$twist' => ' ' . $twist . rand(2,4),
@@ -1142,8 +1169,8 @@ function photos_content(&$a) {
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => template_escape($rr['filename']),
-					'$desc'=> template_escape($rr['desc'])
+					'$imgalt' => $imgalt_e,
+					'$desc'=> $desc_e
 				));
 
 		}
@@ -1344,20 +1371,32 @@ function photos_content(&$a) {
 		$edit = Null;
 		if(($cmd === 'edit') && ($can_post)) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
+
+			if($a->theme['template_engine'] === 'internal') {
+				$album_e = template_escape($ph[0]['album']);
+				$caption_e = template_escape($ph[0]['desc']);
+				$aclselect_e = template_escape(populate_acl($ph[0]));
+			}
+			else {
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['desc'];
+				$aclselect_e = populate_acl($ph[0]);
+			}
+
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
 				'$rotatecw' => t('Rotate CW (right)'),
 				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => template_escape($ph[0]['album']),
+				'$album' => $album_e,
 				'$newalbum' => t('New album name'), 
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
 				'$capt_label' => t('Caption'),
-				'$caption' => template_escape($ph[0]['desc']),
+				'$caption' => $caption_e,
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
-				'$aclselect' => template_escape(populate_acl($ph[0])),
+				'$aclselect' => $aclselect_e,
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
@@ -1488,14 +1527,25 @@ function photos_content(&$a) {
 						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
+					if($a->theme['template_engine'] === 'internal') {
+						$name_e = template_escape($profile_name);
+						$title_e = template_escape($item['title']);
+						$body_e = template_escape(bbcode($item['body']));
+					}
+					else {
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						$body_e = bbcode($item['body']);
+					}
+
 					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
-						'$name' => template_escape($profile_name),
+						'$name' => $name_e,
 						'$thumb' => $profile_avatar,
 						'$sparkle' => $sparkle,
-						'$title' => template_escape($item['title']),
-						'$body' => template_escape(bbcode($item['body'])),
+						'$title' => $title_e,
+						'$body' => $body_e,
 						'$ago' => relative_date($item['created']),
 						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 						'$drop' => $drop,
@@ -1531,20 +1581,34 @@ function photos_content(&$a) {
 		}
 		
 		$photo_tpl = get_markup_template('photo_view.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$album_e = array($album_link,template_escape($ph[0]['album']));
+			$tags_e = template_escape($tags);
+			$like_e = template_escape($like);
+			$dislike_e = template_escape($dislike);
+		}
+		else {
+			$album_e = array($album_link,$ph[0]['album']);
+			$tags_e = $tags;
+			$like_e = $like;
+			$dislike_e = $dislike;
+		}
+
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
-			'$album' => array($album_link,template_escape($ph[0]['album'])),
+			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lock,
 			'$photo' => $photo,
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['desc'],
-			'$tags' => template_escape($tags),
+			'$tags' => $tags_e,
 			'$edit' => $edit,	
 			'$likebuttons' => $likebuttons,
-			'$like' => template_escape($like),
-			'$dislike' => template_escape($dislike),
+			'$like' => $like_e,
+			'$dislike' => $dikslike_e,
 			'$comments' => $comments,
 			'$paginate' => $paginate,
 		));
@@ -1588,16 +1652,25 @@ function photos_content(&$a) {
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
 			
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
 			$photos[] = array(
 				'id'       => $rr['id'],
 				'twist'    => ' ' . $twist . rand(2,4),
 				'link'  	=> $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 				'title' 	=> t('View Photo'),
 				'src'     	=> $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'     	=> template_escape($rr['filename']),
+				'alt'     	=> $alt_e,
 				'album'	=> array(
 					'link'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-					'name'  => template_escape($rr['album']),
+					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
 				
@@ -1606,7 +1679,13 @@ function photos_content(&$a) {
 	}
 	
 	$tpl = get_markup_template('photos_recent.tpl'); 
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$photo_top' => 'photo_top.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$title' => t('Recent Photos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
diff --git a/mod/poco.php b/mod/poco.php
index cb9abb340d..abe2c8e35d 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -147,7 +147,13 @@ function poco_init(&$a) {
 
 	if($format === 'xml') {
 		header('Content-type: text/xml');
-		echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
+
+		$includes = array(
+			'$poco_entry_xml' => 'poco_entry_xml.tpl'
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret)));
 		http_status_exit(500);
 	}
 	if($format === 'json') {
@@ -159,4 +165,4 @@ function poco_init(&$a) {
 		http_status_exit(500);
 
 
-}
\ No newline at end of file
+}
diff --git a/mod/profile.php b/mod/profile.php
index 25871c2405..15a0224212 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,6 +33,7 @@ function profile_init(&$a) {
 		auto_redir($a, $which);
 	}
 
+	$a->theme["template_engine"] = 'internal'; // reset the template engine to the default in case the user's theme doesn't specify one
 	profile_load($a,$which,$profile);
 
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index d1f77a3db4..cf99181465 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -313,8 +313,8 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$a->config['imagecrop'] = $hash;
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $ph->getExt();
-	$a->page['htmlhead'] .= get_markup_template("crophead.tpl");
-	$a->page['end'] .= get_markup_template("cropend.tpl");
+	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
+	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
 	return;
 }}
 
diff --git a/mod/settings.php b/mod/settings.php
index 7cfdbb1cd5..09a45f832a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -554,7 +554,13 @@ function settings_content(&$a) {
 		
 		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Submit'),
@@ -580,7 +586,13 @@ function settings_content(&$a) {
 			$app = $r[0];
 			
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Update'),
@@ -663,12 +675,17 @@ function settings_content(&$a) {
 
 
 		$tpl = get_markup_template("settings_features.tpl");
-		$o .= replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_yesno'	=> 'field_yesno.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl, $includes + array(
 			'$form_security_token' => get_form_security_token("settings_features"),
 			'$title'	=> t('Additional Features'),
 			'$features' => $arr,
 			'$submit'   => t('Submit'),
-			'$field_yesno'	=> 'field_yesno.tpl',
 		));
 		return $o;
 	}
@@ -715,7 +732,17 @@ function settings_content(&$a) {
 			$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
 		}
 	
-		$o .= replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_checkbox' => 'field_checkbox.tpl',
+			'$field_input' => 'field_input.tpl',
+			'$field_select'	=> 'field_select.tpl',
+			'$field_custom' => 'field_custom.tpl',
+			'$field_password' => 'field_password.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl, $includes + array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 			
 			'$title'	=> t('Connector Settings'),
@@ -805,7 +832,15 @@ function settings_content(&$a) {
 		}
 		
 		$tpl = get_markup_template("settings_display.tpl");
-		$o = replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_themeselect' => 'field_themeselect.tpl',
+			'$field_checkbox' => 'field_checkbox.tpl',
+			'$field_input' => 'field_input.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o = replace_macros($tpl, $includes + array(
 			'$ptitle' 	=> t('Display Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
 			'$submit' 	=> t('Submit'),
@@ -891,7 +926,13 @@ function settings_content(&$a) {
 
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
-	$pagetype = replace_macros($pageset_tpl,array(
+
+	$includes = array(
+		'$field_radio' => 'field_radio.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$pagetype = replace_macros($pageset_tpl,$includes + array(
 		'$page_normal' 	=> array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
 									t('This account is a normal personal profile'), 
 									($a->user['page-flags'] == PAGE_NORMAL)),
@@ -1012,7 +1053,17 @@ function settings_content(&$a) {
 	require_once('include/group.php');
 	$group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
-	$o .= replace_macros($stpl,array(
+	$includes = array(
+		'$field_password' => 'field_password.tpl',
+		'$field_input' => 'field_input.tpl',
+		'$field_custom' => 'field_custom.tpl',
+		'$field_checkbox' => 'field_checkbox.tpl',
+		'$field_yesno' => 'field_yesno.tpl',
+		'$field_intcheckbox' => 'field_intcheckbox.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($stpl,$includes + array(
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Submit'),
diff --git a/mod/uimport.php b/mod/uimport.php
index 3f11023df2..d28198f69a 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -60,13 +60,19 @@ function uimport_content(&$a) {
 	
 	
     $tpl = get_markup_template("uimport.tpl");
-    return replace_macros($tpl, array(
+
+	$includes = array(
+		'$field_custom' => 'field_custom.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+    return replace_macros($tpl, $includes + array(
         '$regbutt' => t('Import'),
         '$import' => array(
             'title' => t("Move account"),
-            'text' => t("You can import an account from another Friendica server. 

-                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.

-                            This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"),
+			'intro' => t("You can import an account from another Friendica server."),
+			'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
+			'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"),
             'field' => array('accountfile', t('Account file'),'', t('To export your accont, go to "Settings->Export your porsonal data" and select "Export account"')),
         ),  
     ));
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 8e261e7115..f54a76be4c 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -72,7 +72,13 @@ function viewcontacts_content(&$a) {
 
 
 	$tpl = get_markup_template("viewcontact_template.tpl");
-	$o .= replace_macros($tpl, array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl, $includes + array(
 		'$title' => t('View Contacts'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
diff --git a/mod/xrd.php b/mod/xrd.php
index 2fa6bcd99b..7cfb643df1 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -28,7 +28,8 @@ function xrd_init(&$a) {
 	header("Content-type: text/xml");
 
 	if(get_config('system','diaspora_enabled')) {
-		$tpl = file_get_contents('view/xrd_diaspora.tpl');
+		//$tpl = file_get_contents('view/xrd_diaspora.tpl');
+		$tpl = get_markup_template('xrd_diaspora.tpl');
 		$dspr = replace_macros($tpl,array(
 			'$baseurl' => $a->get_baseurl(),
 			'$dspr_guid' => $r[0]['guid'],
@@ -38,7 +39,8 @@ function xrd_init(&$a) {
 	else
 		$dspr = '';
 
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	//$tpl = file_get_contents('view/xrd_person.tpl');
+	$tpl = get_markup_template('xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
 		'$nick'        => $r[0]['nickname'],
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
new file mode 100755
index 0000000000..6037d04ea2
--- /dev/null
+++ b/mods/friendica-to-smarty-tpl.py
@@ -0,0 +1,198 @@
+#!/usr/bin/python
+#
+# Script to convert Friendica internal template files into Smarty template files
+# Copyright 2012 Zach Prezkuta
+# Licensed under GPL v3
+
+import os, re, string
+
+ldelim = '{{'
+rdelim = '}}'
+
+def fToSmarty(matches):
+	match = matches.group(0)
+	if match == '$j':
+		return match
+	match = string.replace(match, '[', '')
+	match = string.replace(match, ']', '')
+
+	ldel = ldelim
+	rdel = rdelim
+	if match.find("'") > -1:
+		match = string.replace(match, "'", '')
+		ldel = "'" + ldel
+		rdel = rdel + "'"
+	elif match.find('"') > -1:
+		match = string.replace(match, '"', '')
+		ldel = '"' + ldel
+		rdel = rdel + '"'
+
+	return ldel + match + rdel
+
+
+def fix_element(element):
+	# Much of the positioning here is important, e.g. if you do element.find('if ') before you do
+	# element.find('endif'), then you may get some multiply-replaced delimiters
+
+	if element.find('endif') > -1:
+		element = ldelim + '/if' + rdelim
+		return element
+
+	if element.find('if ') > -1:
+		element = string.replace(element, '{{ if', ldelim + 'if')
+		element = string.replace(element, '{{if', ldelim + 'if')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('else') > -1:
+		element = ldelim + 'else' + rdelim
+		return element
+
+	if element.find('endfor') > -1:
+		element = ldelim + '/foreach' + rdelim
+		return element
+
+	if element.find('for ') > -1:
+		element = string.replace(element, '{{ for ', ldelim + 'foreach ')
+		element = string.replace(element, '{{for ', ldelim + 'foreach ')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('endinc') > -1:
+		element = ''
+		return element
+
+	if element.find('inc ') > -1:
+		parts = element.split(' ')
+		element = ldelim + 'include file="'
+
+		# We need to find the file name. It'll either be in parts[1] if the element was written as {{ inc file.tpl }}
+		# or it'll be in parts[2] if the element was written as {{inc file.tpl}}
+		if parts[0].find('inc') > -1:
+			first = 0
+		else:
+			first = 1
+
+		if parts[first+1][0] == '$':
+			# This takes care of elements where the filename is a variable, e.g. {{ inc $file }}
+			element += 'file:' + ldelim + parts[first+1].rstrip('}') + rdelim
+		else:
+			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
+			element += parts[first+1].rstrip('}') 
+
+		element += '"'
+
+		if len(parts) > first + 1 and parts[first+2] == 'with':
+			# Take care of variable substitutions, e.g. {{ inc file.tpl with $var=this_var }}
+			element += ' ' + parts[first+3].rstrip('}')[1:]
+
+		element += rdelim
+		return element
+
+
+def convert(filename, tofilename, php_tpl):
+	for line in filename:
+		newline = ''
+		st_pos = 0
+		brack_pos = line.find('{{')
+
+		if php_tpl:
+			# If php_tpl is True, this script will only convert variables in quotes, like '$variable'
+			# or "$variable". This is for .tpl files that produce PHP scripts, where you don't want
+			# all the PHP variables converted into Smarty variables
+			pattern1 = re.compile(r"""
+([\'\"]\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\][\'\"])
+""", re.VERBOSE)
+			pattern2 = re.compile(r"""
+([\'\"]\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+[\'\"])
+""", re.VERBOSE)
+		else:
+			# Compile the pattern for bracket-style variables, e.g. $[variable.key|filter:arg1:arg2|filter2:arg1:arg2]
+			# Note that dashes are only allowed in array keys if the key doesn't start
+			# with a number, e.g. $[variable.key-id] is ok but $[variable.12-id] isn't
+			#
+			# Doesn't currently process the argument position key 'x', i.e. filter:arg1:x:arg2 doesn't get
+			# changed to arg1|filter:variable:arg2 like Smarty requires
+			#
+			# Filter arguments can be variables, e.g. $variable, but currently can't have array keys with dashes
+			# like filter:$variable.key-name
+			pattern1 = re.compile(r"""
+(\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\])
+""", re.VERBOSE)
+
+			# Compile the pattern for normal style variables, e.g. $variable.key
+			pattern2 = re.compile(r"""
+(\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+)
+""", re.VERBOSE)
+
+		while brack_pos > -1:
+			if brack_pos > st_pos:
+				line_segment = line[st_pos:brack_pos]
+				line_segment = pattern2.sub(fToSmarty, line_segment)
+				newline += pattern1.sub(fToSmarty, line_segment)
+
+			end_brack_pos = line.find('}}', brack_pos)
+			if end_brack_pos < 0:
+				print "Error: no matching bracket found"
+
+			newline += fix_element(line[brack_pos:end_brack_pos + 2])
+			st_pos = end_brack_pos + 2
+
+			brack_pos = line.find('{{', st_pos)
+
+		line_segment = line[st_pos:]
+		line_segment = pattern2.sub(fToSmarty, line_segment)
+		newline += pattern1.sub(fToSmarty, line_segment)
+		newline = newline.replace("{#", ldelim + "*")
+		newline = newline.replace("#}", "*" + rdelim)
+		tofilename.write(newline)
+
+
+path = raw_input('Path to template folder to convert: ')
+if path[-1:] != '/':
+	path = path + '/'
+
+outpath = path + 'smarty3/'
+
+if not os.path.exists(outpath):
+	os.makedirs(outpath)
+
+files = os.listdir(path)
+for a_file in files:
+	if a_file == 'htconfig.tpl':
+		php_tpl = True
+	else:
+		php_tpl = False
+
+	filename = os.path.join(path,a_file)
+	ext = a_file.split('.')[-1]
+	if os.path.isfile(filename) and ext == 'tpl':
+		with open(filename, 'r') as f:
+			newfilename = os.path.join(outpath,a_file)
+			with open(newfilename, 'w') as outf:
+				print "Converting " + filename + " to " + newfilename
+				convert(f, outf, php_tpl)
+
+
diff --git a/object/Item.php b/object/Item.php
index 0c84146f9b..4da5b8a59f 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -216,6 +216,23 @@ class Item extends BaseObject {
 
         list($categories, $folders) = get_cats_and_terms($item);
 
+		if($a->theme['template_engine'] === 'internal') {
+			$body_e = template_escape($body);
+			$text_e = strip_tags(template_escape($body));
+			$name_e = template_escape($profile_name);
+			$title_e = template_escape($item['title']);
+			$location_e = template_escape($location);
+			$owner_name_e = template_escape($this->get_owner_name());
+		}
+		else {
+			$body_e = $body;
+			$text_e = strip_tags($body);
+			$name_e = $profile_name;
+			$title_e = $item['title'];
+			$location_e = $location;
+			$owner_name_e = $this->get_owner_name();
+		}
+
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			
@@ -229,8 +246,8 @@ class Item extends BaseObject {
 			'has_folders' => ((count($folders)) ? 'true' : ''),
             'categories' => $categories,
             'folders' => $folders,            
-			'body' => template_escape($body),
-			'text' => strip_tags(template_escape($body)),
+			'body' => $body_e,
+			'text' => $text_e,
 			'id' => $this->get_id(),
 			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
@@ -240,20 +257,20 @@ class Item extends BaseObject {
 			'vwall' => t('via Wall-To-Wall:'),
 			'profile_url' => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
-			'name' => template_escape($profile_name),
+			'name' => $name_e,
 			'thumb' => $profile_avatar,
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
-			'title' => template_escape($item['title']),
+			'title' => $title_e,
 			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 			'lock' => $lock,
-			'location' => template_escape($location),
+			'location' => $location_e,
 			'indent' => $indent,
 			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
 			'owner_photo' => $this->get_owner_photo(),
-			'owner_name' => template_escape($this->get_owner_name()),
+			'owner_name' => $owner_name_e,
 			'plink' => get_plink($item),
 			'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
 			'isstarred' => $isstarred,
@@ -268,6 +285,7 @@ class Item extends BaseObject {
 			'comment' => $this->get_comment_box($indent),
 			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
 			'wait' => t('Please wait'),
+			'remove' => t('remove'),
 			'thread_level' => $thread_level
 		);
 
@@ -467,11 +485,20 @@ class Item extends BaseObject {
 	 * Set template
 	 */
 	private function set_template($name) {
+		$a = get_app();
+
 		if(!x($this->available_templates, $name)) {
 			logger('[ERROR] Item::set_template : Template not available ("'. $name .'").', LOGGER_DEBUG);
 			return false;
 		}
-		$this->template = $this->available_templates[$name];
+
+		if($a->theme['template_engine'] === 'smarty3') {
+			$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
+		}
+		else {
+			$template_file = $this->available_templates[$name];
+		}
+		$this->template = $template_file;
 	}
 
 	/**
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
index b777cf4201..db1b00c112 100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@@ -4,9 +4,9 @@
 	

     
 
-	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$debugging }}{{ endinc }}
+	{{ inc $field_input with $field=$logfile }}{{ endinc }}
+	{{ inc $field_select with $field=$loglevel }}{{ endinc }}
 	
 	

 	
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 874c6e6267..844cbad272 100644
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
@@ -84,10 +84,10 @@
 		
Your friendica installation is not writable by web server.

 		{{ if $canftp }}
 			
You can try to update via FTP

-			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
-			{{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
+			{{ inc $field_input with $field=$ftphost }}{{ endinc }}
+			{{ inc $field_input with $field=$ftppath }}{{ endinc }}
+			{{ inc $field_input with $field=$ftpuser }}{{ endinc }}
+			{{ inc $field_password with $field=$ftppwd }}{{ endinc }}
 			

 		{{ endif }}
 	{{ endif }}
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 11122cb474..16f5b580de 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -41,55 +41,55 @@
 	
     
 
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	{{ inc $field_input with $field=$sitename }}{{ endinc }}
+	{{ inc $field_textarea with $field=$banner }}{{ endinc }}
+	{{ inc $field_select with $field=$language }}{{ endinc }}
+	{{ inc $field_select with $field=$theme }}{{ endinc }}
+	{{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
+	{{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
 	
 	

 	
 	
$registration

-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	{{ inc $field_input with $field=$register_text }}{{ endinc }}
+	{{ inc $field_select with $field=$register_policy }}{{ endinc }}
+	{{ inc $field_input with $field=$daily_registrations }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
 	
 	

 
 	
$upload

-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
+	{{ inc $field_input with $field=$maximagesize }}{{ endinc }}
+	{{ inc $field_input with $field=$maximagelength }}{{ endinc }}
+	{{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
 	
 	
$corporate

-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
+	{{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
+	{{ inc $field_input with $field=$allowed_email }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
+	{{ inc $field_input with $field=$global_directory }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
 	
 	

 	
 	
$advanced

-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
+	{{ inc $field_input with $field=$proxy }}{{ endinc }}
+	{{ inc $field_input with $field=$proxyuser }}{{ endinc }}
+	{{ inc $field_input with $field=$timeout }}{{ endinc }}
+	{{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$poll_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
+	{{ inc $field_input with $field=$abandon_days }}{{ endinc }}
 	
 	

 	
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
index 0ea7eb13b7..1cabd295da 100644
--- a/view/api_friends_xml.tpl
+++ b/view/api_friends_xml.tpl
@@ -1,5 +1,7 @@
+
+
 
-	{{for $users as $user }}
-	{{inc api_user_xml.tpl }}{{endinc}}
+	{{for $users as $u }}
+	{{inc $api_user_xml with $user=$u }}{{endinc}}
 	{{endfor}}
 
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 4a32b411b5..df55d807ad 100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -10,7 +10,7 @@
   $status.in_reply_to_screen_name
   $status.geo
   $status.favorited
-{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  $status.statusnet_html
+{{ inc $api_user_xml with $user=$status.user }}{{ endinc }}  $status.statusnet_html
   $status.statusnet_conversation_id
   $status.url
   $status.coordinates
diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..082efc7458
--- /dev/null
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da {{$username}},
+
+	'{{$from}}' ha comentat un element/conversació que estàs seguint.
+
+-----
+{{$body}}
+-----
+
+Accedeix a {{$siteurl}} per a veure la conversa completa:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..6958365209
--- /dev/null
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da {{$myname}},
+
+Tens un nou seguidor en {{$sitename}} -  '{{$requestor}}'.
+
+Pots visitar el seu perfil en {{$url}}.
+
+Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}} 
diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..58bd14fea0
--- /dev/null
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da {{$username}},
+
+	Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'.
+
+Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic
+sense cap restricció.
+
+Visita la teva pàgina de 'Contactes' en {{$sitename}} si desitja realizar qualsevol canvi en aquesta relació.
+
+{{$siteurl}}
+
+[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general 
+- i assignar drets de visualització a '{{$fn}}'].
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..c0fa7b3e09
--- /dev/null
+++ b/view/ca/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Meva Xarxa d'Amics";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..bc26e3eb1b
--- /dev/null
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Apreciat/da {{$username}},
+
+	'{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició
+connexió a '{{$sitename}}'.
+
+	'{{$fn}}' ha optat per acceptar-te com a "fan", que restringeix certes 
+formes de comunicació, com missatges privats i algunes interaccions 
+amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, 
+aquests ajustos s'aplican automàticament 
+
+	'{{$fn}}' pot optar per extendre aixó en una relació més permisiva
+en el futur.
+
+	Començaràs a rebre les actualizacions públiques de estatus de '{{$fn}}', 
+que apareixeran a la teva pàgina "Xarxa" en
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..469c429da4
--- /dev/null
+++ b/view/ca/smarty3/lostpass_eml.tpl
@@ -0,0 +1,35 @@
+
+Apreciat/da {{$username}},
+	
+	S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir
+la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
+verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+
+Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
+i/o elimina aquest missatge.
+
+La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
+va emetre aquesta sol·licitud.
+
+Segueix aquest enllaç per verificar la teva identitat:
+
+{{$reset_link}}
+
+A continuació rebràs un missatge amb la nova contrasenya.
+
+Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
+configuració.
+
+Les dades d'accés són els següents:
+
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+
+
+
+
+Salutacions,
+	L'administració de {{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..d3c9d7b853
--- /dev/null
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Mensaje de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats.
{{$siteName}}

+
+
diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..a3fa3cd381
--- /dev/null
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats.
+
+	{{$siteName}}
diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..f0d62d9a1c
--- /dev/null
+++ b/view/ca/smarty3/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da {{$username}},
+
+    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
+(o canvía immediatament la contrasenya amb quelcom que recordis).
+
+
+Les teves dades d'accés son les següents:
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+Contrasenya:	{{$new_password}}
+
+Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..7da9a2b888
--- /dev/null
+++ b/view/ca/smarty3/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Apreciat/da {{$username}},
+
+	Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat.
+
+
+Les dades d'accés són les següents:
+
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+Contrasenya:	{{$password}}
+
+
+Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
+
+Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
+
+
+Gràcies i benvingut/da {{$sitename}}.
+
+ 
diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..651e8eff78
--- /dev/null
+++ b/view/ca/smarty3/register_verify_eml.tpl
@@ -0,0 +1,23 @@
+
+S'ha rebut la sol·licitud de registre d'un nou usuari en
+{{$sitename}} que requereix la teva aprovació.
+
+Les dades d'accés són els següents:
+
+Nom Complet: {{$username}}
+Lloc: {{$siteurl}}
+Nom: {{$email}}
+
+
+Per aprovar aquesta sol·licitud, visita el següent enllaç:
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+Per denegar la sol·licitud i eliminar el compte, per favor visita:
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Gràcies.
+
+
diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..18dc3ef0d4
--- /dev/null
+++ b/view/ca/smarty3/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da {{$myname}},
+
+Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}.
+
+Pots visitar el seu perfil en {{$url}}.
+
+Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..cd75464416
--- /dev/null
+++ b/view/ca/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da {{$username}},
+
+	'{{$from}}' ha escrit quelcom en el mur del teu perfil.
+
+-----
+{{$body}}
+-----
+
+Accedeix a  {{$siteurl}} per a veure o esborrar l'element:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index c68ca7f1db..a11e252b4a 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -65,7 +65,7 @@
 	{{ endif }}
 	

 
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+	{{inc $field_checkbox with $field=$hidden }}{{endinc}}
 
 

 
$lbl_info1

diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index ecb342bf44..efd426bba3 100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
@@ -14,8 +14,8 @@
 $tabs
 
 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
+{{ for $contacts as $c }}
+	{{ inc $contact_template with $contact=$c }}{{ endinc }}
 {{ endfor }}
 

 
diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..baa7c180a3
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..867e63332d
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica zpráva
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} okomentoval položku/konverzaci, kterou následujete.
{{$from}}
{{$body}}
Přihlaste se na pro zobrazení kompletní konverzace.
Díky,
{{$sitename}} administrátor

+
+
diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..baa7c180a3
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..1430e83118
--- /dev/null
+++ b/view/cs/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Milý/Milá {{$username}},
+
+Máte nového následovatele na {{$sitename}} -  '{{$requestor}}'.
+
+Můžete si prohlédnout jeho/její profil na {{$url}}.
+
+Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti.
+
+{{$siteurl}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..fc953b76cd
--- /dev/null
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,17 @@
+
+Milý/Milá {{$username}},
+
+        Skvělé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'.
+
+Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení.
+
+Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na {{$sitename}}.
+
+{{$siteurl}}
+
+(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '{{$fn}}').
+
+S pozdravem,
+
+        {{$sitename}} administrátor
+
diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..c9baae798f
--- /dev/null
+++ b/view/cs/smarty3/htconfig.tpl
@@ -0,0 +1,73 @@
+path na 'adresar/podadresar'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Vyberte platnou defaultní časovou zónu. Pokud si nejste jistí, použijte use "Europe/Prague".
+// Toto nastavení lze změnit i později a používá se pouze pro časové značky anonymních čtenářů.
+
+$default_timezone = '{{$timezone}}';
+
+// Jak se jmenuje Váš web?
+
+$a->config['sitename'] = "Moje síť přátel";
+
+// Nastavení defaultního jazyka webu
+
+$a->config['system']['language'] = 'cs';
+
+// Vaše možnosti jsou REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Ujistěte se, že jste si vytvořili Váš osobníúčet dříve, než nastavíte 
+// REGISTER_CLOSED. 'register_text' (pokud je nastaven) se bude zobrazovat jako první text na 
+// registrační stránce. REGISTER_APPROVE vyžaduje aby byl nastaven 'admin_email'
+// na e-mailovou adresu již existující registrované osoby, která může autorizovat
+// a/nebo schvalovat/odmítat žádosti o registraci.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximální velikost importované zprávy, 0 je neomezeno
+
+$a->config['max_import_size'] = 200000;
+
+// maximální velikost nahrávaných fotografií
+
+$a->config['system']['maximagesize'] = 800000;
+
+// cesta k PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// URL adresy globálního adresáře.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - také zvaný jako  pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) je defaultně povolen. 
+// Šifrování bude zajištěno pouze pokud je toto nastaveno na true a
+// PHP mcrypt extension jsou nainstalována na obou systémech 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// defaultní systémové grafické téma
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+
diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..e770362faf
--- /dev/null
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,17 @@
+
+Milý/Milá {{$username}},
+
+
+	'{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'.
+
+	'{{$fn}}' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky. 
+
+	'{{$fn}}' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní.
+
+	Nyní začnete dostávat veřejné aktualizace statusu od '{{$fn}}', které se objeví ve Vaší stránce "Síť" na webu
+
+{{$siteurl}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..28f8517505
--- /dev/null
+++ b/view/cs/smarty3/lostpass_eml.tpl
@@ -0,0 +1,23 @@
+
+Milý/Milá {{$username}},
+	Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.  
+Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte.
+
+Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy.
+
+Klikněte na tento odkaz pro prověření Vaší identity:
+
+{{$reset_link}}
+
+Poté obdržíte další zprávu obsahující nové heslo.
+
+Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení.
+
+Přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..b52abc3b1f
--- /dev/null
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Zpráva
+	
+
+
+
+	
+	
+
+        
+
+
+        
+                
+        
+        
+        
+        
+        
+        
+
Friendica
{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
Díky,
{{$siteName}} administrátor

+
+
diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..0b4c585cf9
--- /dev/null
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
+
+{{$title}}
+
+{{$textversion}}
+
+Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
+
+Díky,
+{{$siteName}} administrátor
diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..75db8ebbff
--- /dev/null
+++ b/view/cs/smarty3/passchanged_eml.tpl
@@ -0,0 +1,14 @@
+
+Milý/Milá {{$username}},
+        Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
+ 
+Vaše přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+Heslo:	 	    {{$new_password}}
+
+Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte.
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..fa1f828c13
--- /dev/null
+++ b/view/cs/smarty3/register_open_eml.tpl
@@ -0,0 +1,23 @@
+Milý/milá {{$username}},
+	Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
+Vaše přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+Heslo:		    {{$password}}
+
+Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte.
+
+Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce.
+
+Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt.
+
+Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. 
+
+Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. 
+Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. 
+
+Díky a vítejte na {{$sitename}}.
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..9186e7332a
--- /dev/null
+++ b/view/cs/smarty3/register_verify_eml.tpl
@@ -0,0 +1,22 @@
+
+Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.
+
+Přihlašovací údaje jsou tato:
+
+Celé jméno:	    {{$username}}
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+
+Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Díky.
diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..f120891e80
--- /dev/null
+++ b/view/cs/smarty3/request_notify_eml.tpl
@@ -0,0 +1,15 @@
+
+Milý/Milá {{$username}},
+
+Právě jste obdržel/obdržela požadavek na spojení na webu {{$sitename}} 
+
+od '{{$requestor}}'.
+
+Můžete navštívit jeho/její profil na následujícím odkazu {{$url}}.
+
+Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost.
+
+{{$siteurl}}
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..2578a4e7c6
--- /dev/null
+++ b/view/cs/smarty3/wall_received_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' obohatil Vaši profilovou zeď.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na  {{$siteurl}} k zobrazení nebo smazání této položky:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..ebbc2a9e1e
--- /dev/null
+++ b/view/cs/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Friendica zpráva
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} obohatil Vaši profilovou zeď.
{{$from}}
{{$body}}
Přihlaste se na {{$siteurl}} k zobrazení nebo smazání této položky.
Díky,
{{$sitename}} administrátor

+
+
diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..c8ac0216c3
--- /dev/null
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' obohatil Vaši profilovou zeď.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na  {{$siteurl}} k zobrazení nebo smazání této položky:
+
+{{$display}}
+
+Díky,
+	{{$sitename}} administrátor
diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..f902d96b4e
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,17 @@
+
+Hallo {{$username}},
+
+'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
+
+-----
+{{$body}}
+-----
+
+Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an:
+
+{{$display}}
+
+Danke für die Aufmerksamkeit
+        {{$sitename}} Administrator
+ 
+
diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..b4b994c640
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} hat einen Beitrag kommentiert dem du auch folgst.
{{$from}}
{{$body}}
Bitte melde dich an um die komplette Unterhaltung anzuzeigen.
Beste Grüße,
{{$sitename}} Administrator

+
+
diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..19f81a5e3a
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,16 @@
+Hallo {{$username}},
+
+'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
+
+-----
+{{$body}}
+-----
+
+Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an:
+
+{{$display}}
+
+Danke fr die Aufmerksamkeit
+        {{$sitename}} Administrator
+ 
+
diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..2fd04bb658
--- /dev/null
+++ b/view/de/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Hallo {{$myname}},
+
+Du hast einen neuen Anhänger auf {{$sitename}} -  '{{$requestor}}'.
+
+Du kannst das Profil unter {{$url}} besuchen.
+
+Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen.
+
+{{$siteurl}}
+
+beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..72234dc67b
--- /dev/null
+++ b/view/de/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Hallo {{$username}},
+
+	Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat 
+deine Kontaktanfrage auf '{{$sitename}}' bestätigt.
+
+Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne Einschränkungen austauschen.
+
+Rufe deine 'Kontakte' Seite auf {{$sitename}} auf, wenn du 
+Änderungen an diesem Kontakt vornehmen willst. 
+
+{{$siteurl}}
+
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
+die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '{{$fn}}' zum Betrachten freigeben].
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..75d6a77e89
--- /dev/null
+++ b/view/de/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..f5eaef66b5
--- /dev/null
+++ b/view/de/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Hallo {{$username}},
+
+	'{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage 
+auf '{{$sitename}}' akzeptiert.
+
+	'{{$fn}}' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen 
+Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen
+automatisch angewandt.
+
+	'{{$fn}}' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
+Beziehung in der Zukunft erweitert wird. 
+
+	Du empfängst ab sofort die öffentlichen Beiträge von '{{$fn}}', 
+auf deiner "Netzwerk" Seite.  
+
+{{$siteurl}}
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..a507afbda4
--- /dev/null
+++ b/view/de/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Hallo {{$username}},
+	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
+Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
+weiter unten oder kopiere ihn in die Adressleiste deines Browsers. 
+
+Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE
+bitte diese Mail und den Link. 
+
+Dein Passwort wird nicht geändert werden solange wir nicht überprüfen
+konnten, dass du die Anfrage gestellt hast. 
+
+Folge diesem Link um deine Identität zu verifizieren:
+
+{{$reset_link}}
+
+Du wirst eine weitere Email erhalten mit dem neuen Passwort.
+
+Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern.
+
+Die Login-Details sind die folgenden:
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+
+
+Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..a769686103
--- /dev/null
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,26 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$fromi}} hat dir eine private Nachricht auf {{$siteName}} gesendet.
{{$from}}
{{$title}}
{{$htmlversion}}
Bitte melde dich auf {{$siteurl}}/message an um die Nachricht zu bearbeiten.
Beste Grüße,
{{$siteName}} Administrator

+
+
diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..7daa6fbf90
--- /dev/null
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,11 @@
+Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
+	
+{{$title}}
+
+{{$textversion}}
+
+Bitte melde dich unter {{$siteurl}} an um deine privaten Nachrichte zu lesen und zu
+beantworten.
+
+Viele Gre,
+{{$siteName}} Administrator
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..eb08c20b7e
--- /dev/null
+++ b/view/de/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Hallo {{$username}},
+	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
+Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
+in etwas, was du dir merken kannst).
+
+
+Deine Login Daten wurden wie folgt geändert:
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+Passwort:	{{$new_password}}
+
+Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
+
+
+Beste Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..af0a0b9bb4
--- /dev/null
+++ b/view/de/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Hallo {{$username}},
+	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
+Hier die Login Details:
+
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+Passwort:	{{$password}}
+
+Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, 
+nachdem du dich erstmalig eingeloggt hast.
+
+Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
+
+Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, 
+damit andere Leute dich einfacher finden können.
+
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
+sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und 
+vielleicht auch in welchen Land du lebst; falls du nicht konkreter
+werden möchtest.
+
+Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. 
+Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
+ein paar neue und interessante Freunde zu finden.  
+
+
+Danke und willkommen auf {{$sitename}}.
+
+Beste Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..78d4aa6b72
--- /dev/null
+++ b/view/de/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Eine Neuanmeldung auf {{$sitename}} benötigt 
+deine Aufmerksamkeit. 
+
+
+Die Login-Einzelheiten sind die folgenden:
+
+Kompletter Name:	{{$username}}
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+Um die Anfrage zu bestätigen besuche bitte:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Danke!
diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..de2182e9db
--- /dev/null
+++ b/view/de/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Hallo {{$myname}},
+
+du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} 
+
+erhalten.
+
+Du kannst sein/ihr Profil unter {{$url}} finden.
+
+Bitte melde dich an um die komplette Vorstellung einzusehen 
+und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
+
+{{$siteurl}}
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..5b614709a7
--- /dev/null
+++ b/view/de/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hi, 
+ich bin {{$sitename}}.   
+Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
+aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
+Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen. 
+Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. 
+
+Die Fehlermeldung lautet '{{$error}}'.   
+
+Tut mir Leid! 
+Deine friendica Instanz auf {{$siteurl}}
\ No newline at end of file
diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..e90d67261f
--- /dev/null
+++ b/view/de/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Hallo {{$username}},
+
+'{{$from}}' hat etwas auf deiner Profilwand gepostet.
+
+-----
+{{$body}}
+-----
+
+Bitte melde dich unter {{$siteurl}} an um den Eintrag anzusehen oder zu löschen.
+
+{{$display}}
+
+Besten Dank!
+        {{$sitename}} Administrator
+
+ 
+
diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..e6e7f27073
--- /dev/null
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} hat etwas auf deine Pinnwand gepostet.
{{$from}}
{{$body}}
Bitte melde dich auf {{$siteurl}} an um den Eintrag anzusehen oder ihn zu löschen.
Beste Grüße,
{{$sitename}} Administrator

+
+
diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..f53dc6c9c3
--- /dev/null
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Hallo {{$username}},
+
+        '{{$from}}' hat etwas auf deiner Pinnwand gepostet.
+
+-----
+{{$body}}
+-----
+
+Bitte melde dich auf {{$siteurl}} an um den Beitrag anzusehen oder ihn zu löschen:
+
+{{$display}}
+
+Besten Dank!
+    {{$sitename}} Administrator
+
+ 
+
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index b45da4465e..d496cb2add 100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
@@ -2,7 +2,7 @@
 

 	
 
 		

-			$alt-text
+			$alt_text
 		

 	

 
diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..ba07b19dad
--- /dev/null
+++ b/view/en/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Dear {{$myname}},
+
+You have a new follower at {{$sitename}} -  '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+	{{$sitename}} administrator
diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..229b4fee86
--- /dev/null
+++ b/view/en/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
+
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
+
+Please visit your 'Contacts' page at {{$sitename}} if you wish to make 
+any changes to this relationship. 
+
+{{$siteurl}}
+
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+
+Sincerely,
+
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..745bf03fe1
--- /dev/null
+++ b/view/en/smarty3/htconfig.tpl
@@ -0,0 +1,71 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// By default allow pseudonyms
+
+$a->config['system']['no_regfullname'] = true;
diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..c3bc4697ec
--- /dev/null
+++ b/view/en/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
+
+	'{{$fn}}' has chosen to accept you a "fan", which restricts 
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
+
+	'{{$fn}}' may choose to extend this into a two-way or more permissive 
+relationship in the future. 
+
+	You will start receiving public status updates from '{{$fn}}', 
+which will appear on your 'Network' page at  
+
+{{$siteurl}}
+
+Sincerely,
+
+	{{$sitename}} Administrator
diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..3b79d27910
--- /dev/null
+++ b/view/en/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Dear {{$username}},
+	A request was recently received at {{$sitename}} to reset your account 
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar. 
+
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email. 
+
+Your password will not be changed unless we can verify that you
+issued this request. 
+
+Follow this link to verify your identity:
+
+{{$reset_link}}
+
+You will then receive a follow-up message containing the new password.
+
+You may change that password from your account settings page after logging in.
+
+The login details are as follows:
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..0d94be3c2b
--- /dev/null
+++ b/view/en/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Dear {{$username}},
+	Your password has been changed as requested. Please retain this 
+information for your records (or change your password immediately to 
+something that you will remember).
+
+
+Your login details are as follows:
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$new_password}}
+
+You may change that password from your account settings page after logging in.
+
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..bfc1082bfb
--- /dev/null
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Dear {{$username}},
+	Thank you for registering at {{$sitename}}. Your account has been created. 
+The login details are as follows:
+
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$password}}
+
+You may change your password from your account "Settings" page after logging 
+in.
+
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..dbdd1a997d
--- /dev/null
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -0,0 +1,26 @@
+
+A new user registration request was received at {{$sitename}} which requires 
+your approval. 
+
+
+The login details are as follows:
+
+Full Name:	{{$username}}
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+To approve this request please visit the following link:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
+
diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..d01b8ff276
--- /dev/null
+++ b/view/en/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Dear {{$myname}},
+
+You have just received a connection request at {{$sitename}} 
+
+from '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to view the complete introduction 
+and approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+	{{$sitename}} administrator
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..a0983b6b90
--- /dev/null
+++ b/view/en/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey, 
+I'm {{$sitename}};   
+The friendica developers released update {{$update}} recently, 
+but when I tried to install it, something went terribly wrong.  
+This needs to be fixed soon and I can't do it alone. Please contact a 
+friendica developer if you can not help me on your own. My database might be invalid. 
+
+The error message is '{{$error}}'.   
+
+I'm sorry, 
+your friendica server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..dd313c1f75
--- /dev/null
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Kara {{$myname}},
+
+Vi havas novan abonanton ĉe {{$sitename}} -  '{{$requestor}}'.
+
+Vi povas viziti ilian profilon ĉe {{$url}}.
+
+Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton.
+
+{{$siteurl}}
+
+Salutoj,
+
+	[{{$sitename}}] administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..2987a8dc57
--- /dev/null
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kara {{$username}},
+
+	Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis 
+vian kontaktpeton ĉe '{{$sitename}}'.
+
+Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn
+senkatene.
+
+Bonvolu viziti vian 'Kontaktoj' paĝon ĉe {{$sitename}} se vi volas 
+ŝangi la rilaton. 
+
+{{$siteurl}}
+
+[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne
+haveblas al la komuna publiko - kaj rajtigi '{{$fn}}' al ĝi]'
+
+Salutoj,
+
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..eab7623a40
--- /dev/null
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kara {{$username}},
+
+	'{{$fn}}' ĉe '{{$dfrn_url}}' akceptis 
+vian kontaktpeton ĉe '{{$sitename}}'.
+
+	'{{$fn}}' elektis vin kiel "admiranto", kio malpermesas 
+kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj
+agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj
+aŭtomate aktiviĝis.
+
+	'{{$fn}}' eblas konverti la rilaton al ambaŭdirekta rilato 
+aŭ apliki pli da permesoj. 
+
+	Vi ekricevos publikajn afiŝojn de '{{$fn}}', 
+kiuj aperos sur via 'Reto' paĝo ĉe  
+
+{{$siteurl}}
+
+Salutoj,
+
+	{{$sitename}} administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..ddde9fe514
--- /dev/null
+++ b/view/eo/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Kara {{$username}},
+	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
+Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon 
+aŭ alglui ĝin en la adreskampo de via retumilo. 
+
+Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la 
+sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. 
+
+Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi
+kiu petis la ŝanĝon. 
+
+Sekvu ĉi tion ligilon por konfirmi vian identecon:
+
+{{$reset_link}}
+
+Poste, vi ricevos mesaĝon enhavonte la novan pasvorton.
+
+Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti.
+
+La akreditaĵoj estas:
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+
+
+
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..173828d561
--- /dev/null
+++ b/view/eo/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Kara {{$username}},
+	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
+informon (aŭ tuj ŝanĝu vian pasvorton al 
+iu kiun vi povas memori).
+
+
+Jen viaj legitimaĵoj:
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+Pasvorto:»{{$new_password}}
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
+
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..84fc9ad908
--- /dev/null
+++ b/view/eo/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Kara {{$username}},
+	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
+Jen viaj legitimaĵoj:
+
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+Pasvorto:»{{$password}}
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas  
+ensalutita.
+
+Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn.
+
+Eble vi volas aldoni kelkajn bazajn informojn al via profilo 
+(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj.
+
+Ni rekomendas agordi vian plenan noman, aldoni profilbildon,
+kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj 
+eble en kiu lando vi loĝas, se vi ne volas pli specifa
+ol tio.
+
+Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. 
+Se vi novas kaj ne konas iun ĉi tie, ili eble helpas 
+vin trovi novajn kaj interesajn amikojn.  
+
+
+Dankon kaj bonvenon ĉe {{$sitename}}.
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..4e960b9168
--- /dev/null
+++ b/view/eo/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Nova peto por registrado atendas ĉe {{$sitename}} 
+kaj bezonas vian aprobon. 
+
+
+Jen la detaloj de la peto:
+
+Plena Nomo:»{{$username}}
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+
+
+Aprobonte la peton, bonvolu klaki tiun ligilon:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Malaprobonte kaj forviŝonte la konton, bonvolu klaki:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Dankon!
diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..d026ba66e3
--- /dev/null
+++ b/view/eo/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Kara {{$myname}},
+
+Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} 
+
+de '{{$requestor}}'.
+
+Vi eblas viziti la profilon de la petanto ĉe {{$url}}.
+
+Bonvolu ensaluti en la retejo por vidi la plenan prezenton 
+kaj aprobi aŭ ignori/nuligi la peton.
+
+{{$siteurl}}
+
+Salutoj,
+
+	{{$sitename}} administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..4b7f240f91
--- /dev/null
+++ b/view/eo/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Saluton! 
+Mi estas {{$sitename}}.   
+La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
+sed kiam mi provis instali ĝin, io terure malsukcesis.  
+Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti 
+Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. 
+
+La erarmesaĝo estas '{{$error}}'.   
+
+Mi bedaŭras, 
+via Friendica servilo ĉe {{$siteurl}}
\ No newline at end of file
diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..d78eae2179
--- /dev/null
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a {{$username}},
+
+	'{{$from}}' ha comentado un elemento/conversación que estás siguiendo.
+
+-----
+{{$body}}
+-----
+
+Accede a {{$siteurl}} para ver la conversación completa:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..86e09003ad
--- /dev/null
+++ b/view/es/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a {{$myname}},
+
+Tienes un nuevo seguidor en {{$sitename}} -  '{{$requestor}}'.
+
+Puedes visitar su perfil en {{$url}}.
+
+Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}} 
diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..be3c817771
--- /dev/null
+++ b/view/es/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a {{$username}},
+
+	Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'.
+
+Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico
+sin restricción alguna.
+
+Visita tu página de 'Contactos' en {{$sitename}} si desear realizar cualquier cambio en esta relación.
+
+{{$siteurl}}
+
+[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general 
+- y asignar derechos de visualización a '{{$fn}}'].
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/es/smarty3/htconfig.tpl b/view/es/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..5696245c77
--- /dev/null
+++ b/view/es/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Mia Rete di Amici";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..3add926fe5
--- /dev/null
+++ b/view/es/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a {{$username}},
+
+	'{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición
+conexión a '{{$sitename}}'.
+
+	'{{$fn}}' ha optado por aceptarte come "fan", que restringe ciertas 
+formas de comunicación, como mensajes privados y algunas interacciones 
+con el perfil. Si eres una "celebridad" o una página de comunidad, 
+estos ajustes se aplican automáticamente 
+
+	'{{$fn}}' puede optar por extender esto en una relación más permisiva
+en el futuro.
+
+	Empezarás a recibir las actualizaciones públicas de estado de '{{$fn}}', 
+que aparecerán en tu página "Red" en
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..41545bf2d6
--- /dev/null
+++ b/view/es/smarty3/lostpass_eml.tpl
@@ -0,0 +1,34 @@
+
+Estimado/a {{$username}},
+	
+	Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer
+tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de
+verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador.
+
+Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora
+y/o elimina este mensaje.
+
+Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien
+emitió esta solicitud.
+
+Sigue este enlace para verificar tu identidad:
+
+{{$reset_link}}
+
+A continuación recibirás un mensaje con la nueva contraseña.
+
+Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de 
+configuración.
+
+Los datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+
+
+
+
+Saludos,
+	La administración de {{$sitename}}
+
+ 
diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..4f80df28fc
--- /dev/null
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Mensaje de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accede a {{$siteurl}} para leer y responder a tus mensajes privados.
{{$siteName}}

+
+
diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..22b77b7246
--- /dev/null
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accede a {{$siteurl}} para leer y responder a tus mensajes privados.
+
+	{{$siteName}}
diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..eb93eb369e
--- /dev/null
+++ b/view/es/smarty3/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a {{$username}},
+
+    Tu contraseña ha sido modificada como has solicitado. Anota esta información
+(o cambia inmediatamente la contraseña con algo que recuerdes).
+
+
+Tus datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+Contraseña:	{{$new_password}}
+
+Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..c65b13497c
--- /dev/null
+++ b/view/es/smarty3/register_open_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a {{$username}},
+
+    Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada.
+
+
+Los datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+Contraseña:	{{$password}}
+
+
+Después de acceder puedes cambiar tu contraseña en la página de "Configuración".
+
+Toma un momento para revisar las otras configuraciones de la cuenta en esa página.
+
+
+Gracias y bienvenido/a {{$sitename}}.
+
+ 
diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..10c35863e6
--- /dev/null
+++ b/view/es/smarty3/register_verify_eml.tpl
@@ -0,0 +1,22 @@
+
+Se ha recibido la solicitud de registro de un nuevo usuario en
+{{$sitename}} que requiere tu aprobación.
+
+Los datos de acceso son los siguientes:
+
+Nombre Completo:	{{$username}}
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+
+
+Para aprobar esta solicitud, visita el siguiente enlace:
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+Para denegar la solicitud y eliminar la cuenta, por favor visita:
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Gracias.
+
diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..cb787a8a69
--- /dev/null
+++ b/view/es/smarty3/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a {{$myname}},
+
+Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}.
+
+Puedes visitar su perfil en {{$url}}.
+
+Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..8f495d9efa
--- /dev/null
+++ b/view/es/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a {{$username}},
+
+	'{{$from}}' ha escrito algo en el muro de tu perfil.
+
+-----
+{{$body}}
+-----
+
+Accede a  {{$siteurl}} para ver o borrar el elemento:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/field.tpl b/view/field.tpl
index 35f5afd39c..6119ccf22b 100644
--- a/view/field.tpl
+++ b/view/field.tpl
@@ -1,4 +1,4 @@
 
  {{ if $field.0==select }}
- {{ inc field_select.tpl }}{{ endinc }}
+ {{ inc $field_select }}{{ endinc }}
  {{ endif }}
diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl
index ae837d6b74..f7a253ba50 100644
--- a/view/filer_dialog.tpl
+++ b/view/filer_dialog.tpl
@@ -1,4 +1,4 @@
-{{ inc field_combobox.tpl }}{{ endinc }}
+{{ inc $field_combobox }}{{ endinc }}
 

 	
 

diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..bd7c441eac
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Cher(e) {{$username}},
+
+	« {{$from}} » a commenté un élément ou une conversation que vous suivez.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète :
+
+{{$display}}
+
+Merci,
+	L'administrateur de {{$sitename}}
+
+ 
+
diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..408b643ec4
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Message de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} a commenté un élément ou une conversation que vous suivez.
{{$from}}
{{$body}}
Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète
Merci,
L'administrateur de {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..76828474bf
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,15 @@
+
+Cher(e) {{$username}},
+
+	 {{$from}}  a comment un lment ou une conversation que vous suivez.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous  {{$siteurl}} si vous souhaitez voir la conversation complte :
+
+{{$display}}
+
+Merci,
+	L'administrateur de {{$sitename}}
\ No newline at end of file
diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..05fec413ea
--- /dev/null
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Cher(e) {{$myname}},
+
+Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}.
+
+Vous pouvez consulter son profil sur {{$url}}.
+
+Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande.
+
+{{$siteurl}}
+
+Cordialement,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..e0c0078e55
--- /dev/null
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,23 @@
+
+Cher(e) {{$username}},
+
+	Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre 
+demande de connexion à « {{$sitename}} ».
+
+Vous êtes désormais dans une relation réciproque et pouvez échanger des 
+photos, des humeurs et des messages sans restriction.
+
+Merci de visiter votre page « Contacts » sur {{$sitename}} pour toute 
+modification que vous souhaiteriez apporter à cette relation.
+
+{{$siteurl}}
+
+[Par exemple, vous pouvez créer un profil spécifique avec des informations
+cachées au grand public - et ainsi assigner des droits privilégiés à 
+« {{$fn}} »]/
+
+Sincèremment,
+
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..75d6a77e89
--- /dev/null
+++ b/view/fr/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..e3ca253258
--- /dev/null
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Cher(e) {{$username}},
+
+	« {{$fn}} » du site « {{$dfrn_url}} » a accepté votre
+demande de mise en relation sur « {{$sitename}} ».
+
+	« {{$fn}} » a décidé de vous accepter comme « fan », ce qui restreint
+certains de vos moyens de communication - tels que les messages privés et
+certaines interactions avec son profil. S'il s'agit de la page d'une
+célébrité et/ou communauté, ces réglages ont été définis automatiquement.
+
+	« {{$fn}} » pourra choisir d'étendre votre relation à quelque chose de 
+plus permissif dans l'avenir.
+
+	Vous allez commencer à recevoir les mises à jour publiques du 
+statut de « {{$fn}} », lesquelles apparaîtront sur votre page « Réseau » sur
+
+{{$siteurl}}
+
+Sincèrement votre,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..0674e08ccd
--- /dev/null
+++ b/view/fr/smarty3/lostpass_eml.tpl
@@ -0,0 +1,34 @@
+
+Cher(e) {{$username}},
+
+	Nous avons récemment reçu, chez {{$sitename}}, une demande de remise
+à zéro du mot de passe protégeant votre compte. Pour confirmer cette 
+demande, merci de cliquer sur le lien de vérification suivant, ou de le
+coller dans la barre d'adresse de votre navigateur web.
+
+Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre
+le lien en question, et d'ignorer/supprimer ce courriel.
+
+Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu
+nous assurer que vous êtes bien à l'origine de cette demande.
+
+Merci de suivre le lien suivant pour confirmer votre identité :
+
+{{$reset_link}}
+
+Vous recevrez en retour un message avec votre nouveau mot de passe.
+
+Vous pourrez ensuite changer ce mot de passe, après connexion, dans la 
+page des réglages du compte.
+
+Les informations du compte concerné sont :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+
+
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..cf1c28627f
--- /dev/null
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Message de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} vous a envoyé un message à {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Veuillez Ouvrir une session sur {{$siteurl}} pour lire et répondre à vos messages privés.
Merci,
{{$siteName}} Administrateur

+
+
diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..71c545ed61
--- /dev/null
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+{{$from}} vous a envoy un message  {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+
+Veuillez ouvrir une session sur {{$siteurl}} pour lire et rpondre  vos messages privs.
+
+Merci,
+{{$siteName}} Administrateur
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..28eed70f15
--- /dev/null
+++ b/view/fr/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Cher(e) {{$username}},
+
+	Votre mot de passe a été modifié comme demandé. Merci de conserver
+cette information pour un usage ultérieur (ou bien de changer votre mot de 
+passe immédiatement en quelque chose dont vous vous souviendrez).
+
+Vos informations de connexion sont désormais :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+Mot de passe :		{{$new_password}}
+
+Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, 
+après connexion
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..373f314b09
--- /dev/null
+++ b/view/fr/smarty3/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Cher(e) {{$username}},
+
+	Merci de votre inscription à {{$sitename}}. Votre compte a été créé.
+Les informations de connexion sont les suivantes :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+Mot de passe :		{{$password}}
+
+Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte,
+après connexion.
+
+Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
+sur cette page.
+
+Merci, et bienvenue sur {{$sitename}}.
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..22b6d8a947
--- /dev/null
+++ b/view/fr/smarty3/register_verify_eml.tpl
@@ -0,0 +1,27 @@
+
+Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle
+nécessite votre approbation.
+
+
+Les informations de connexion sont les suivantes :
+
+Nom complet :		{{$username}}
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+
+
+Pour approuver cette demande, merci de suivre le lien :
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+Pour rejeter cette demande et supprimer le compte associé, 
+merci de suivre le lien :
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+En vous remerçiant.
+
diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..3f5f8a1f44
--- /dev/null
+++ b/view/fr/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Cher(e) {{$myname}},
+
+Vous venez de recevoir une demande de mise en relation sur {{$sitename}}
+
+venant de « {{$requestor}} ».
+
+Vous pouvez visiter son profil sur {{$url}}.
+
+Vous pouvez vous connecter à votre site pour voir la demande
+complète et l'approuver ou l'ignorer/annuler.
+
+{{$siteurl}}
+
+Cordialement,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..991fad8574
--- /dev/null
+++ b/view/fr/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Cher(e) {{$username}},
+
+	« {{$from}} » a posté quelque chose sur le mur de votre profil.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous à {{$siteurl}} pour voir et/ou supprimer l'élément :
+
+{{$display}}
+
+Merci,
+	l'administrateur de {{$sitename}}
+
+ 
+
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 2fa2b1a552..d60a1b0f97 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -5,7 +5,7 @@
 	
 		
 		
-		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
+		{{ inc $field_input with $field=$gname }}{{ endinc }}
 		{{ if $drop }}$drop{{ endif }}
 		

 			
@@ -15,9 +15,9 @@
 

 
 
-{{ if $groupeditor }}
+{{ if $groupedit_info }}
 	

-		{{ inc groupeditor.tpl }}{{ endinc }}
+		{{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }}
 	

 {{ endif }}
 {{ if $desc }}
$desc
{{ endif }}
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
index 176611d4be..a3aa2b2660 100644
--- a/view/install_checks.tpl
+++ b/view/install_checks.tpl
@@ -3,7 +3,7 @@
 
 
 {{ for $checks as $check }}
-	
+	
 	{{if $check.help }}
 	
 	{{endif}}
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 1302b5a708..bf17256ebf 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -18,10 +18,10 @@ $info_03
 
 
-{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
+{{ inc $field_input with $field=$dbhost }}{{endinc}}
+{{ inc $field_input with $field=$dbuser }}{{endinc}}
+{{ inc $field_password with $field=$dbpass }}{{endinc}}
+{{ inc $field_input with $field=$dbdata }}{{endinc}}
 
 
  
diff --git a/view/install_settings.tpl b/view/install_settings.tpl
index 05b87f904e..453e2e5cc3 100644
--- a/view/install_settings.tpl
+++ b/view/install_settings.tpl
@@ -16,7 +16,7 @@
 
 
-{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
+{{ inc $field_input with $field=$adminmail }}{{endinc}}
 $timezone
 
  
diff --git a/view/intros.tpl b/view/intros.tpl
index e7fd53ca4f..2dd684079d 100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -14,8 +14,8 @@
 

-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
+{{inc $field_checkbox with $field=$hidden }}{{endinc}}
+{{inc $field_checkbox with $field=$activity }}{{endinc}}
 
diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..127f05a457
--- /dev/null
+++ b/view/is/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Góðan daginn {{$myname}},
+
+Þú hefur nýjan aðdáanda frá {{$sitename}} - '{{$requestor}}'.
+
+Þú getur heimsótt þeirra heimasvæði á {{$url}}.
+
+Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni.
+
+{{$siteurl}}
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..1bc440269e
--- /dev/null
+++ b/view/is/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Góðan daginn {{$username}}, 
+
+	Frábærar fréttir... '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
+tengibeiðni þína hjá '{{$sitename}}'.
+
+Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti
+án hafta.
+
+Endilega fara á síðunna 'Tengiliðir' á þjóninum {{$sitename}} ef þú villt gera 
+einhverjar breytingar á þessu sambandi. 
+
+{{$siteurl}}
+
+[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki
+að vera aðgengileg almenningi - og veitt aðgang til að sjá '{{$fn}}'].
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..bbf86cf157
--- /dev/null
+++ b/view/is/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Góðan daginn {{$username}},
+
+	'{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
+tengibeiðni þína á '{{$sitename}}'.
+
+	'{{$fn}}' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar 
+ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda
+aðgerðir.  Ef þetta er stjörnu- eða  hópasíða, þá voru þessar stillingar
+settar á sjálfkrafa.
+
+	'{{$fn}}' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni  
+tengingu í framtíðinni. 
+
+	Þú munt byrja að fá opinberar stöðubreytingar frá '{{$fn}}', 
+þær munu birtast á 'Tengslanet' síðunni þinni á  
+
+{{$siteurl}}
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..d2010ac8fe
--- /dev/null
+++ b/view/is/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Góðan dag {{$username}},
+	Beiðni barst á {{$sitename}} um að endursetja 
+aðgangsorðið.  Til að staðfesta þessa beiði, veldu slóðina
+hér fyrir neðan og settu í slóðastiku vafra. 
+
+Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina
+sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. 
+
+Aðgangsorðið verður ekki breytt nama við getum staðfest að þú
+baðst um þessa breytingu. 
+
+Farðu á slóðina til að staðfesta:
+
+{{$reset_link}}
+
+Þú munnt fá annan tölvupóst með nýja aðgangsorðinu.
+
+Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. 
+
+Innskráningar upplýsingarnar eru eftirfarandi:
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+
+
+
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..c19551208e
--- /dev/null
+++ b/view/is/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Góðan daginn {{$username}},
+	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
+upplýsingar (eða skiptu strax um aðgangsorð 
+yfir í eitthvað sem þú mannst).
+
+
+Innskráningar upplýsingar þínar eru:
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+Aðgangsorð:	{{$new_password}}
+
+Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig.
+
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..0673224d1f
--- /dev/null
+++ b/view/is/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Góðan daginn {{$username}},
+	Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. 
+Innskráningar upplýsingarnar þínar eru eftirfarandi:
+
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+Aðgangsorð:	{{$password}}
+
+Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig 
+inn.
+
+Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu.
+
+Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn 
+(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig.
+
+Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd,
+bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og 
+mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari
+en það.
+
+Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. 
+Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk
+sem getur aðstoðað þig við að eignast nýja og áhugaverða vini.  
+
+
+Takk fyrir og velkomin(n) á {{$sitename}}.
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..cf6362c4b7
--- /dev/null
+++ b/view/is/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Beiðni um nýjan notanda barst {{$sitename}} sem krefst 
+þíns samþykkis. 
+
+
+Innskráningar upplýsingarnar eru eftirfarandi:
+
+Fullt nafn:	{{$username}}
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+
+
+Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Til að synja beiðni og eyða notanda þá heimsækir þú slóðina:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Takk fyrir.
diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..36d8f217af
--- /dev/null
+++ b/view/is/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Góðan dag {{$myname}},
+
+Þér hefur borist beiðni um tengingu á {{$sitename}} 
+
+frá '{{$requestor}}'.
+
+Þú getur heimsótt forsíðuna á {{$url}}.
+
+skráðu þig inn á þína síðu til að skoða alla kynninguna 
+og þar getur þú hunsað/hætt við beiðnina.
+
+{{$siteurl}}
+
+Kveðja,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..201f87131d
--- /dev/null
+++ b/view/is/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hæ, 
+Ég er {{$sitename}}.   
+Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
+En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  
+Þetta þarf að laga strax og ég get það ekki ein.  Hafðu samband við 
+þróunarteymi friendica ef þú getur ekki hjálpað mér.  Gagnagrunnurinn minn gæti verið skemmdur 
+
+Villuskilaboðin eru '{{$error}}'.   
+
+Fyrirgefðu, 
+þinn friendica þjónn á {{$siteurl}}
\ No newline at end of file
diff --git a/view/it/smarty3/cmnt_received_eml.tpl b/view/it/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..f35dc3dc9f
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
+
+-----
+{{$body}}
+-----
+
+Accedi a {{$siteurl}} per verdere la conversazione completa:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/cmnt_received_html_body_eml.tpl b/view/it/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..80d6118073
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Messaggio
+	
+
+
+
$check.title {{if $check.required}}(required){{endif}}
$check.title {{if $check.required}}(required){{endif}}
$check.help

 
 
 
 
 
 

+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} ha commentato un elemeto/conversazione che stai seguendo.
{{$from}}
{{$body}}
Accedi a {{$siteurl}} per verdere la conversazione completa:.
Grazie,
L'amministratore di {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/it/smarty3/cmnt_received_text_body_eml.tpl b/view/it/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..f35dc3dc9f
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
+
+-----
+{{$body}}
+-----
+
+Accedi a {{$siteurl}} per verdere la conversazione completa:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..0bfc375520
--- /dev/null
+++ b/view/it/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Ciao {{$myname}},
+
+Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'.
+
+Puoi vedere il suo profilo su {{$url}}.
+
+Accedi sul tuo sito per approvare o ignorare la richiesta.
+
+{{$siteurl}}
+
+Saluti,
+
+	L'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..daeaae9016
--- /dev/null
+++ b/view/it/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Ciao {{$username}},
+
+	Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato 
+la tua richiesta di connessione su '{{$sitename}}'.
+
+Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
+senza restrizioni.
+
+Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare 
+qualche modifica riguardo questa relazione 
+
+{{$siteurl}}
+
+[Ad esempio, potresti creare un profilo separato con le informazioni che non
+sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}'].
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..5696245c77
--- /dev/null
+++ b/view/it/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Mia Rete di Amici";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..69fce81411
--- /dev/null
+++ b/view/it/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Ciao {{$username}},
+
+	'{{$fn}}' di '{{$dfrn_url}}' ha accettato 
+la tua richiesta di connessione a '{{$sitename}}'.
+
+	'{{$fn}}' ha deciso di accettarti come "fan", il che restringe 
+alcune forme di comunicazione - come i messaggi privati e alcune
+interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
+applicate automaticamente.
+
+	'{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva 
+. 
+
+	Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', 
+che apparirà nella tua pagina 'Rete'  
+
+{{$siteurl}}
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..c336cf3c1d
--- /dev/null
+++ b/view/it/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Ciao {{$username}},
+	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
+Per confermare la richiesta, clicca sul link di verifica
+qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. 
+
+Se NON hai richiesto l'azzeramento, NON seguire il link
+e ignora e/o cancella questa email. 
+
+La tua password non sarà modificata finché non avremo verificato che
+hai fatto questa richiesta. 
+
+Per verificare la tua identità clicca su:
+
+{{$reset_link}}
+
+Dopo la verifica riceverai un messaggio di risposta con la nuova password.
+
+Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+
+I dati di accesso sono i seguenti:
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+
+
+
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/mail_received_html_body_eml.tpl b/view/it/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..f0bf679d0e
--- /dev/null
+++ b/view/it/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Messsaggio
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
{{$from}}
{{$title}}
{{$htmlversion}}
Accedi a {{$siteurl}} per leggere e rispondere ai tuoi messaggi privati.
Grazie,
L'amministratore di {{$siteName}}

+
+
diff --git a/view/it/smarty3/mail_received_text_body_eml.tpl b/view/it/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..79e133fcef
--- /dev/null
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accedi a {{$siteurl}} per leggere e rispondere ai tuoi messaggi privati.
+
+Grazie,
+L'amministratore di {{$siteName}}
diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..046588e1f2
--- /dev/null
+++ b/view/it/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Ciao {{$username}},
+	La tua password è cambiata come hai richiesto. Conserva queste 
+informazioni (oppure cambia immediatamente la password con 
+qualcosa che ti è più facile ricordare).
+
+
+I tuoi dati di access sono i seguenti:
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+Password:»{{$new_password}}
+
+Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..23dcaf2c8d
--- /dev/null
+++ b/view/it/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Ciao {{$username}},
+	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
+I dettagli di accesso sono i seguenti
+
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+Password:»{{$password}}
+
+Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso 
+.
+
+Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina.
+
+Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo 
+(nella pagina "Profilo") per rendere agli altri più facile trovarti.
+
+Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto,
+di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e 
+magari il paese dove vivi; se non vuoi essere più dettagliato
+di così.
+
+Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. 
+Se  ancora non conosci nessuno qui, potrebbe esserti di aiuto
+per farti nuovi e interessanti amici.  
+
+
+Grazie. Siamo contenti di darti il benvenuto su {{$sitename}}
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..743370b3df
--- /dev/null
+++ b/view/it/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
+la tua approvazione. 
+
+
+I tuoi dati di accesso sono i seguenti:
+
+Nome completo:»{{$username}}
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+
+
+Per approvare questa richiesta clicca su:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Per negare la richiesta e rimuove il profilo, clicca su:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Grazie.
diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..df3a7323c1
--- /dev/null
+++ b/view/it/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Ciao {{$myname}},
+
+Hai appena ricevuto una richiesta di connessione da {{$sitename}} 
+
+da '{{$requestor}}'.
+
+Puoi visitare il suo profilo su {{$url}}.
+
+Accedi al tuo sito per vedere la richiesta completa 
+e approva o ignora/annulla la richiesta.
+
+{{$siteurl}}
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/wall_received_eml.tpl b/view/it/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..909ec86d44
--- /dev/null
+++ b/view/it/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha scritto qualcosa sulla bachecha del tuo profilo.
+
+-----
+{{$body}}
+-----
+
+Accedi a  {{$siteurl}} per vedere o cancellare l'elemento:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/wall_received_html_body_eml.tpl b/view/it/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..3fa724c3bc
--- /dev/null
+++ b/view/it/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Messaggio da Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} ha scritto sulla tua bacheca.
{{$from}}
{{$body}}
Vai su {{$siteurl}} per vedere o cancellare il post.
Grazie,
L'amministratore di {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/it/smarty3/wall_received_text_body_eml.tpl b/view/it/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..ad7f83abcb
--- /dev/null
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro {{$username}},
+
+	'{{$from}}' ha scritto sulla tua bacheca.
+
+-----
+{{$body}}
+-----
+
+Vai su {{$siteurl}} per vedere o cancellare il post:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/login.tpl b/view/login.tpl
index 297b36c9ac..21ed66a66b 100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -3,17 +3,17 @@
 	
 
 	

-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	{{ inc $field_input with $field=$lname }}{{ endinc }}
+	{{ inc $field_password with $field=$lpassword }}{{ endinc }}
 	

 	
 	{{ if $openid }}
 			

-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			{{ inc $field_openid with $field=$lopenid }}{{ endinc }}
 			

 	{{ endif }}
 
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$lremember }}{{ endinc }}