From: Art Cancro Date: Fri, 12 Nov 2010 20:05:40 +0000 (-0500) Subject: New templates for rendering messages as blog posts and comments X-Git-Tag: v8.01~593 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7fa90fafe31afac1096373547dd150686f9f80e4 New templates for rendering messages as blog posts and comments --- diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c index 643d9c5f4..b5c2298d2 100644 --- a/webcit/blogview_renderer.c +++ b/webcit/blogview_renderer.c @@ -48,7 +48,7 @@ void blogpost_render_and_destroy(struct blogpost *bp) { if ( ((p == 0) || (p == bp->top_level_id)) && (bp->num_msgs > 0) ) { /* Show the top level post */ - read_message(WC->WBuf, HKEY("view_message"), bp->msgs[0], NULL, &Mime); + read_message(WC->WBuf, HKEY("view_blog_post"), bp->msgs[0], NULL, &Mime); if (p == 0) { /* Show the number of comments */ @@ -67,7 +67,7 @@ void blogpost_render_and_destroy(struct blogpost *bp) { wc_printf("
\n"); wc_printf("
"); for (i=1; inum_msgs; ++i) { - read_message(WC->WBuf, HKEY("view_message"), bp->msgs[i], NULL, &Mime); + read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime); } wc_printf("
"); } diff --git a/webcit/po/webcit/da.po b/webcit/po/webcit/da.po index 56965b8a8..b5afb918f 100644 --- a/webcit/po/webcit/da.po +++ b/webcit/po/webcit/da.po @@ -148,10 +148,10 @@ msgstr "Afbrudt. Adgangskode blev ikke ændret." msgid "They don't match. Password was not changed." msgstr "Adgangskoder matcher ikke. Adgangskode blev ikke ændret." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "tilgængelighed ukendt" @@ -242,8 +242,7 @@ msgstr "Dette er en opdatering af '%s' som allerede er i din kalender." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "Denne aftale vil konflikte med '%s* som allerede er i din kalender." #: ../calendar.c:232 @@ -755,9 +754,9 @@ msgstr "" "Du abonnérer %s på %s post listen. Listeserveren har sendt " "dig en e-mail med et link som du skal klikke på for at godkende dit " "abonnement. Denne ekstra foranstaltning er din beskyttelse, da det " -"forhindrer andre i at abonnere på en liste i dit navn uden din " -"billigelse.

Klik på linketsom er blevet sendt til dig for at " -"acceptere dit abonnement.
\n" +"forhindrer andre i at abonnere på en liste i dit navn uden din billigelse." +"

Klik på linketsom er blevet sendt til dig for at acceptere dit " +"abonnement.
\n" #: ../listsub.c:85 msgid "Go back..." @@ -1418,8 +1417,8 @@ msgstr "(Ingenting)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" "Du er forbundet til %s, bruger %s med %s, server version %s og lokaliseret i " "%s. Din systemadministrator er %s." diff --git a/webcit/po/webcit/de.po b/webcit/po/webcit/de.po index dd82ba508..de7ee4574 100644 --- a/webcit/po/webcit/de.po +++ b/webcit/po/webcit/de.po @@ -21,15 +21,6 @@ msgstr "" "X-Generator: Launchpad (build Unknown)\n" "Language: de\n" -#: ../summary.c:167 -#, c-format -msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." -msgstr "" -"Sie sind angemeldet auf %s, mit %s über %s, Server-Release %s in %s. Ihr " -"Systemverwalter ist %s." - #: ../addressbook_popup.c:192 msgid "Add" msgstr "Hinzufügen" @@ -161,10 +152,10 @@ msgstr "Abgebrochen. Passwort wurde nicht geändert." msgid "They don't match. Password was not changed." msgstr "Die Passwörter stimmen nicht überein. Passwort nicht geändert." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "Verfügbarkeit unbekannt" @@ -252,8 +243,7 @@ msgstr "Die Änderung '%s', existiert bereits Ihrem Kalender ist." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Dieser Termin würde mit '%s' kollidieren, der bereits in Ihrem Kalender " "vorgemerkt ist." @@ -1311,8 +1301,7 @@ msgid "Add rule" msgstr "Neue Regel" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" "WARNUNG: Konnte die Serverkonfiguration nicht lesen; ist der Citserver neuer " "als WebCit?" @@ -1365,6 +1354,15 @@ msgstr "(Keine)" msgid "(Nothing)" msgstr "(Nichts)" +#: ../summary.c:167 +#, c-format +msgid "" +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." +msgstr "" +"Sie sind angemeldet auf %s, mit %s über %s, Server-Release %s in %s. Ihr " +"Systemverwalter ist %s." + #: ../summary.c:195 msgid "Messages" msgstr "Nachrichten" @@ -1401,9 +1399,9 @@ msgid "" "Enter %s below. Text is formatted to the reader's browser. A newline is " "forced by preceding the next line by a blank." msgstr "" -"Geben sie hier %s ein. Der Text wird auf dem Browser des Lesers " -"formatiert.Eine neue Zeile erzwingt man, indem man die nächste Zeile mit " -"einem Leerschritt beginnt." +"Geben sie hier %s ein. Der Text wird auf dem Browser des Lesers formatiert." +"Eine neue Zeile erzwingt man, indem man die nächste Zeile mit einem " +"Leerschritt beginnt." #: ../sysmsgs.c:70 #, c-format @@ -1682,8 +1680,8 @@ msgid "" "The resource you requested requires a valid username and password. You could " "not be logged in: %s\n" msgstr "" -"Die angeforderte Sektion benötigt einen gültigen Benutzernamen und " -"Passwort.Sie konnten nicht Angemeldet werden: %s\n" +"Die angeforderte Sektion benötigt einen gültigen Benutzernamen und Passwort." +"Sie konnten nicht Angemeldet werden: %s\n" #: ../who.c:151 msgid "Edit your session display" diff --git a/webcit/po/webcit/el.po b/webcit/po/webcit/el.po index 26bc67b26..48b0a2569 100644 --- a/webcit/po/webcit/el.po +++ b/webcit/po/webcit/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: citadel\n" -"Report-Msgid-Bugs-To: FULL NAME \n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-16 13:47+0200\n" "PO-Revision-Date: 2010-10-27 09:24+0000\n" "Last-Translator: Impetus \n" @@ -149,10 +149,10 @@ msgstr "Ακυρώθηκε. Ο κωδικός πρόσβασης δεν άλλα msgid "They don't match. Password was not changed." msgstr "Δεν ταιριάζουν. Ο κωδικός πρόσβασης δεν άλλαξε." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "άγνωστη διαθεσιμότητα" @@ -240,8 +240,7 @@ msgstr "" #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Αυτό το γεγονός έρχεται σε αντίθεση με το '%s' το οποίο υπάρχει ήδη στο " "ημερολόγιό σας." @@ -306,8 +305,7 @@ msgstr "" msgid "" "You have declined this meeting invitation. It has not been entered " "into your calendar." -msgstr "" -"Απορρίψατε την πρόσκληση σε συνάντηση. Δεν εισήχθη στο ημερολόγιό σας." +msgstr "Απορρίψατε την πρόσκληση σε συνάντηση. Δεν εισήχθη στο ημερολόγιό σας." #: ../calendar.c:346 msgid "A reply has been sent to the meeting organizer." @@ -1277,8 +1275,7 @@ msgid "Add rule" msgstr "" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1332,8 +1329,8 @@ msgstr "" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" #: ../summary.c:195 diff --git a/webcit/po/webcit/en_GB.po b/webcit/po/webcit/en_GB.po index 6379244db..f8d7ebdb0 100644 --- a/webcit/po/webcit/en_GB.po +++ b/webcit/po/webcit/en_GB.po @@ -150,10 +150,10 @@ msgstr "" msgid "They don't match. Password was not changed." msgstr "" -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "" @@ -241,8 +241,7 @@ msgstr "" #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" #: ../calendar.c:232 @@ -1271,8 +1270,7 @@ msgid "Add rule" msgstr "" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1326,8 +1324,8 @@ msgstr "" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" #: ../summary.c:195 diff --git a/webcit/po/webcit/es.po b/webcit/po/webcit/es.po index 0e7132947..85a040a84 100644 --- a/webcit/po/webcit/es.po +++ b/webcit/po/webcit/es.po @@ -155,10 +155,10 @@ msgstr "Cancelado. No se cambió la contraseña." msgid "They don't match. Password was not changed." msgstr "No cuadran. La contraseña no se cambia." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "disponibilidad desconocida" @@ -249,8 +249,7 @@ msgstr "Esta es una actualizaciñon de '%s' que está ya en su calendario." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Este evento entrará en conflicto con '%s' que está ya en su calendario." @@ -761,8 +760,8 @@ msgstr "" "Te estás suscribiendo a %s en la %s lista de correo. El " "servidor de la lista te ha enviado un email con un link web y debe pulsarlo " "par confirmar su suscripción. Esta medida se toma por su seguridad, de " -"forma que se impida a otros suscribirle sin su consentimiento.

Por favor, pulse en el link que se le ha enviadoy su suscripción será " +"forma que se impida a otros suscribirle sin su consentimiento.

Por favor, pulse en el link que se le ha enviadoy su suscripción será " "activada.
\n" #: ../listsub.c:85 @@ -1358,8 +1357,7 @@ msgid "Add rule" msgstr "Añadir usuarios" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1417,11 +1415,11 @@ msgstr "(Nada)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" -"Estás conectado a %s, corriendo %s con %s, server build %s, y localizado en %s. Tu " -"administrador de sistema es %s." +"Estás conectado a %s, corriendo %s con %s, server build %s, y localizado en " +"%s. Tu administrador de sistema es %s." #: ../summary.c:195 msgid "Messages" diff --git a/webcit/po/webcit/et.po b/webcit/po/webcit/et.po index 53de89436..cde039af9 100644 --- a/webcit/po/webcit/et.po +++ b/webcit/po/webcit/et.po @@ -150,10 +150,10 @@ msgstr "Katkestatud. Salasõna ei muudetud." msgid "They don't match. Password was not changed." msgstr "Need ei ühti. Salasõna ei muudetud." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "saadavus teadmata" @@ -244,8 +244,7 @@ msgstr "See on uuendus sinu kalendris olevale sündmusele '%s'." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "See sündmus läheks vastuollu juba kalendris oleva sündmusega '%s'." #: ../calendar.c:232 @@ -751,8 +750,7 @@ msgstr "Katkestatud. Sõnumit ei postitatud." #: ../messages.c:1067 #, c-format msgid "Automatically cancelled because you have already saved this message." -msgstr "" -"Automaatselt katkestatud, sest sa oled selle sõnumi juba salvestanud." +msgstr "Automaatselt katkestatud, sest sa oled selle sõnumi juba salvestanud." #: ../messages.c:1119 msgid "Saved to Drafts failed: " @@ -1281,8 +1279,7 @@ msgid "Add rule" msgstr "Lisa reegel" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1336,8 +1333,8 @@ msgstr "(Ei midagi)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" "Sa oled ühendunud võrku %s, mis jookseb tarkvaral %s veebiliidesega %s, " "serveri versioon %s ning asukohaga %s. Sinu süsteemiadministraator on %s." diff --git a/webcit/po/webcit/fr.po b/webcit/po/webcit/fr.po index d494ed350..49ca2ef0c 100644 --- a/webcit/po/webcit/fr.po +++ b/webcit/po/webcit/fr.po @@ -155,10 +155,10 @@ msgid "They don't match. Password was not changed." msgstr "" "Les deux saisies sont différentes. Le mot de passe n'a pas été modifié." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "disponibilité inconnue" @@ -249,8 +249,7 @@ msgstr "Ceci est une mise à jour de '%s' déjà présent dans votre agenda." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Cet événement entre en conflit avec '%s' qui est déjà dans votre agenda." @@ -654,8 +653,7 @@ msgstr "Image téléchargée" #: ../graphics.c:58 msgid "You can upload an image directly from your computer" -msgstr "" -"Vous pouvez télécharger une image directement depuis votre ordinateur" +msgstr "Vous pouvez télécharger une image directement depuis votre ordinateur" #: ../graphics.c:61 msgid "Please select a file to upload:" @@ -1322,8 +1320,7 @@ msgid "Add rule" msgstr "Ajouter une règle" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1377,8 +1374,8 @@ msgstr "(Vide)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" "Vous êtes connecté(e) à %s qui est servi par %s avec %s (révision %s) et " "situé à %s. Votre administrateur système est %s." @@ -2002,8 +1999,8 @@ msgstr "Si vous avez déjà un compte sur" #: ../static/t/login.html:44 msgid "enter your user name and password and click "Login."" msgstr "" -"entrez votre identifiant et votre mot de passe puis cliquez sur " -""Login."" +"entrez votre identifiant et votre mot de passe puis cliquez sur "Login." +""" #: ../static/t/login.html:45 msgid "" diff --git a/webcit/po/webcit/hu.po b/webcit/po/webcit/hu.po index dc295775d..3990a283e 100644 --- a/webcit/po/webcit/hu.po +++ b/webcit/po/webcit/hu.po @@ -150,10 +150,10 @@ msgstr "Megszakítva. A jelszó nem változott." msgid "They don't match. Password was not changed." msgstr "Nem egyeznek. A jelszó nem változott." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "elérhetőség ismeretlen" @@ -244,8 +244,7 @@ msgstr "Az a(z) '%s' frissítése, mely már létezik az ön naptárában." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Ez az esemény ütközik a(z) '%s' eseménnyel, mely már létezik az ön " "naptárában." @@ -277,8 +276,8 @@ msgstr "Visszautasít" #: ../calendar.c:276 msgid "Click Update to accept this reply and update your calendar." msgstr "" -"A válasz elfogadásához és a naptár frissítéséhez kattintson a " -"Frissítésre" +"A válasz elfogadásához és a naptár frissítéséhez kattintson a Frissítésre" #: ../calendar.c:277 msgid "Update" @@ -1071,8 +1070,7 @@ msgstr "Szűrd az alábbi feltételek szerint" #: ../sieve.c:130 msgid "Filter it through a manually edited script (advanced users only)" -msgstr "" -"Szűrd a kézzel szerkesztett szkriptekkel (csak haladó felhasználóknak)" +msgstr "Szűrd a kézzel szerkesztett szkriptekkel (csak haladó felhasználóknak)" #: ../sieve.c:141 msgid "Your incoming mail will not be filtered through any scripts." @@ -1294,8 +1292,7 @@ msgid "Add rule" msgstr "Szabály hozzáadása" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1349,8 +1346,8 @@ msgstr "(Semmi)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" #: ../summary.c:195 diff --git a/webcit/po/webcit/it.po b/webcit/po/webcit/it.po index 5af2980a6..64211b9ce 100644 --- a/webcit/po/webcit/it.po +++ b/webcit/po/webcit/it.po @@ -150,10 +150,10 @@ msgstr "Aziona cancellata. La password non è stata cambiata." msgid "They don't match. Password was not changed." msgstr "Le password non coincidono. Cambiamento non effettuato." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "Disponibilità sconosciuta" @@ -245,8 +245,7 @@ msgstr "" #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Questo evento è in conflitto con l'evento '%s' già presente " "nel tuo calendario." @@ -666,8 +665,7 @@ msgstr "Carica l'immagine" #: ../graphics.c:58 msgid "You can upload an image directly from your computer" -msgstr "" -"Puoi caricare una qualsiasi immagine direttamente dal tuo computer." +msgstr "Puoi caricare una qualsiasi immagine direttamente dal tuo computer." #: ../graphics.c:61 msgid "Please select a file to upload:" @@ -1107,8 +1105,7 @@ msgstr "Crea filtro modificando manualmente lo script (solo utenti esperti)" #: ../sieve.c:141 msgid "Your incoming mail will not be filtered through any scripts." -msgstr "" -"La tua posta in ingresso non verrà filtrata attraverso nessuno script." +msgstr "La tua posta in ingresso non verrà filtrata attraverso nessuno script." #: ../sieve.c:156 msgid "The currently active script is: " @@ -1334,8 +1331,7 @@ msgid "Add rule" msgstr "Aggiungi utenti" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1389,11 +1385,11 @@ msgstr "(Nulla)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" -"Sei connesso a %s, %s è in esecuzione con %s server build %s e localizzato in %s. Il tuo " -"amministratore di sistema è %s." +"Sei connesso a %s, %s è in esecuzione con %s server build %s e localizzato " +"in %s. Il tuo amministratore di sistema è %s." #: ../summary.c:195 msgid "Messages" @@ -1782,8 +1778,7 @@ msgstr "Nessuna pagina chamata '%s'." msgid "" "Select the 'Edit this page' link in the room banner if you would like to " "create this page." -msgstr "" -"Seleziona il collegamento 'Modifica questa pagina' se la vuoi creare." +msgstr "Seleziona il collegamento 'Modifica questa pagina' se la vuoi creare." #: ../wiki.c:167 ../static/t/msg_listview.html:12 #: ../static/t/summary_header.html:10 diff --git a/webcit/po/webcit/nl.po b/webcit/po/webcit/nl.po index 21179d4a5..39ec25e8a 100644 --- a/webcit/po/webcit/nl.po +++ b/webcit/po/webcit/nl.po @@ -150,10 +150,10 @@ msgstr "Geannuleerd: Wachtwoord niet gewijzigd." msgid "They don't match. Password was not changed." msgstr "Ze komen niet overeen. Wachtwoord is niet gewijzigd." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "beschikbaarheid niet bekend" @@ -241,8 +241,7 @@ msgstr "Dit is een update van '%s' die al in uw agenda staat." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "Deze afspraak zou botsen met '%s' , die al in uw agenda staat." #: ../calendar.c:232 @@ -327,8 +326,8 @@ msgid "" "You have chosen to ignore this RSVP. Your calendar has not been " "updated." msgstr "" -"U heeft gekozen dit verzoek om antwoord te negeren. Uw agenda is " -"niet bijgewerkt." +"U heeft gekozen dit verzoek om antwoord te negeren. Uw agenda is niet bijgewerkt." #: ../calendar.c:921 msgid "Calendar day view begins at:" @@ -738,8 +737,8 @@ msgstr "" "U abonneert %s op de %s mailinglijst. De listserver heeft u " "een e-mail gestuurd met een extra link waarop u moet klikken om het " "abonnement te bevestigen. Deze extra stap is voor uw bescherming, want het " -"voorkomt dat anderen zonder uw toestemming u abonneren op mailinglijsten.

Klik alstublieft op de gemailde link om uw abonnement te " +"voorkomt dat anderen zonder uw toestemming u abonneren op mailinglijsten." +"

Klik alstublieft op de gemailde link om uw abonnement te " "bevestigen
\n" #: ../listsub.c:85 @@ -1043,8 +1042,8 @@ msgid "" "\n" msgstr "" "U bent verbonden met een Citadel server draaiend op Citadel %d.%02d. \n" -"Om deze versie van Webcit de kunnen gebruiken moet u ook Citadel versie " -"%d.%02d of nieuwer hebben.\n" +"Om deze versie van Webcit de kunnen gebruiken moet u ook Citadel versie %d.%" +"02d of nieuwer hebben.\n" "\n" "\n" @@ -1306,8 +1305,7 @@ msgid "Add rule" msgstr "Voeg regel toe" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" "LET OP: mislukt Server Config te sturen; loopt er een te nieuwe citserver?" @@ -1362,8 +1360,8 @@ msgstr "(Niets)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" "U bent verbonden met %s, waar %s op draait met %s, server build %s en " "gevestigd in %s. Uw systeembeheerder is %s." diff --git a/webcit/po/webcit/pt_BR.po b/webcit/po/webcit/pt_BR.po index bae6c0317..6ba8e18f0 100644 --- a/webcit/po/webcit/pt_BR.po +++ b/webcit/po/webcit/pt_BR.po @@ -155,10 +155,10 @@ msgstr "Cancelado. A senha não foi modificada." msgid "They don't match. Password was not changed." msgstr "Eles não batem. Senha não foi modificada." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "disponibilidade desconhecida" @@ -249,8 +249,7 @@ msgstr "Essa é uma atualização de '%s' que já está no seu calendário." #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" "Esse evento entrará em conflito com '%s' que já está no seu calendário." @@ -759,8 +758,8 @@ msgid "" msgstr "" "Você está se inscrevendo em %s na lista %s. O servidor da " "lista lhe enviou um link para você confirmar sua inscrição. Esse passo " -"extra previne que outros lhe inscrevam em listas sem seu consentimento.

Clique no link que foi mandado para você e sua inscrição será " +"extra previne que outros lhe inscrevam em listas sem seu consentimento.

Clique no link que foi mandado para você e sua inscrição será " "confirmada.
\n" #: ../listsub.c:85 @@ -1334,8 +1333,7 @@ msgid "Add rule" msgstr "Adicionar regra" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1389,11 +1387,11 @@ msgstr "(Nada)" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" -"Você está conectado à %s, rodando %s com %s, server build %s, e localizado em %s. Seu " -"administrador de sistema é %s." +"Você está conectado à %s, rodando %s com %s, server build %s, e localizado " +"em %s. Seu administrador de sistema é %s." #: ../summary.c:195 msgid "Messages" diff --git a/webcit/po/webcit/ru.po b/webcit/po/webcit/ru.po index 34bc23251..47f74e65a 100644 --- a/webcit/po/webcit/ru.po +++ b/webcit/po/webcit/ru.po @@ -154,10 +154,10 @@ msgstr "Смена пароля отменяется, он остался пре msgid "They don't match. Password was not changed." msgstr "Вы ввели разные пароли, оставляем прежний." -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "" @@ -245,8 +245,7 @@ msgstr "" #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" #: ../calendar.c:232 @@ -1277,8 +1276,7 @@ msgid "Add rule" msgstr "" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1332,8 +1330,8 @@ msgstr "" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" #: ../summary.c:195 diff --git a/webcit/po/webcit/sv.po b/webcit/po/webcit/sv.po index 7cf7a1b25..20bc569c7 100644 --- a/webcit/po/webcit/sv.po +++ b/webcit/po/webcit/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: citadel\n" -"Report-Msgid-Bugs-To: FULL NAME \n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-16 13:47+0200\n" "PO-Revision-Date: 2010-10-26 21:07+0000\n" "Last-Translator: Henric \n" @@ -146,10 +146,10 @@ msgstr "" msgid "They don't match. Password was not changed." msgstr "" -#. +#. #. * Set to 'unknown' right from the beginning. Unless we learn #. * something else, that's what we'll go with. -#. +#. #: ../availability.c:154 msgid "availability unknown" msgstr "" @@ -237,8 +237,7 @@ msgstr "" #: ../calendar.c:227 #, c-format -msgid "" -"This event would conflict with '%s' which is already in your calendar." +msgid "This event would conflict with '%s' which is already in your calendar." msgstr "" #: ../calendar.c:232 @@ -1267,8 +1266,7 @@ msgid "Add rule" msgstr "" #: ../siteconfig.c:254 -msgid "" -"WARNING: Failed to parse Server Config; do you run a to new citserver?" +msgid "WARNING: Failed to parse Server Config; do you run a to new citserver?" msgstr "" #: ../siteconfig.c:313 @@ -1322,8 +1320,8 @@ msgstr "" #: ../summary.c:167 #, c-format msgid "" -"You are connected to %s, running %s with %s, server build %s and located in " -"%s. Your system administrator is %s." +"You are connected to %s, running %s with %s, server build %s and located in %" +"s. Your system administrator is %s." msgstr "" #: ../summary.c:195 diff --git a/webcit/static/t/view_blog_comment.html b/webcit/static/t/view_blog_comment.html new file mode 100644 index 000000000..3a1fffeed --- /dev/null +++ b/webcit/static/t/view_blog_comment.html @@ -0,0 +1,21 @@ +
+
+ + + ">"" <> + "> + @ + + + +
+
+ + + + + + + +
+
diff --git a/webcit/static/t/view_blog_post.html b/webcit/static/t/view_blog_post.html new file mode 100644 index 000000000..7a01f009a --- /dev/null +++ b/webcit/static/t/view_blog_post.html @@ -0,0 +1,24 @@ +
+
+ +
+
+ + + ">"" <> + "> + @ + + + +
+
+ + + + + + + +
+