Tuned up the 'logged in as' / 'not logged in' ...

diff --git a/webcit/po/webcit/bg.po b/webcit/po/webcit/bg.po
index d0163a1eee98b123d55e2f81da95623b2d3cfd34..910b63177dd50e2dcde761286ba651161e7527a0 100644 (file)
--- a/webcit/po/webcit/bg.po
+++ b/webcit/po/webcit/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: citadel\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-16 13:47+0200\n"
 "PO-Revision-Date: 2010-11-17 09:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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/po/webcit/cs.po b/webcit/po/webcit/cs.po
index b8d69760bae5a756e1e00507cc345598f0e8617c..bb41eb88c22fedb070c648daf8cb3555b679c5f4 100644 (file)
--- a/webcit/po/webcit/cs.po
+++ b/webcit/po/webcit/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: citadel\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-16 13:47+0200\n"
 "PO-Revision-Date: 2010-12-09 16:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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/po/webcit/da.po b/webcit/po/webcit/da.po
index 7aeffa61a7a63d32877a49ab7987a9603a7439a1..3e6d9855d1f5375e5ad93e5f92171b17ab5962af 100644 (file)
--- a/webcit/po/webcit/da.po
+++ b/webcit/po/webcit/da.po
@@ -239,8 +239,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
@@ -735,9 +734,9 @@ msgstr ""
 "Du abonnérer <TT>%s</TT> på <b>%s</b> 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.<br /><br />Klik på linketsom er blevet sendt til dig for at "
-"acceptere dit abonnement.<br />\n"
+"forhindrer andre i at abonnere på en liste i dit navn uden din billigelse."
+"<br /><br />Klik på linketsom er blevet sendt til dig for at acceptere dit "
+"abonnement.<br />\n"
 
 #: ../listsub.c:85
 msgid "Go back..."
@@ -1297,8 +1296,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
@@ -1352,8 +1350,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 dd82ba508ab7f2295c3fb75454b810e12b3a6af2..de7ee4574970b6db7658e894f2675c199fe4281f 100644 (file)
--- 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 69f2e6f9613d442f79551d7100c60cd85ee79c44..48b0a25691f8fd5c5f735ed292e784e3278d172c 100644 (file)
--- a/webcit/po/webcit/el.po
+++ b/webcit/po/webcit/el.po
@@ -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 "άγνωστη διαθεσιμότητα"
@@ -1275,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
@@ -1330,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/es.po b/webcit/po/webcit/es.po
index 82632c68a9f25549437081d226c5fdf729188383..5bcb6a6e707b923fee03b1875b25e98c1589801a 100644 (file)
--- a/webcit/po/webcit/es.po
+++ b/webcit/po/webcit/es.po
@@ -154,10 +154,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"
@@ -245,8 +245,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."
 
@@ -738,8 +737,8 @@ msgstr ""
 "Te estás suscribiendo a <TT>%s</TT> en la <b>%s</b> 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.<br /><br "
-"/>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.<br /><br /"
+">Por favor, pulse en el link que se le ha enviadoy su suscripción será "
 "activada.<br />\n"
 
 #: ../listsub.c:85
@@ -1292,8 +1291,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
@@ -1347,8 +1345,8 @@ 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."

diff --git a/webcit/po/webcit/et.po b/webcit/po/webcit/et.po
index 1e76b96a1415d468d58617d422b37b49e3980e12..5e4ad168c1d23432312828c55903ddb84c70cb1e 100644 (file)
--- a/webcit/po/webcit/et.po
+++ b/webcit/po/webcit/et.po
@@ -18,11 +18,6 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: ee\n"
 
-#: ../auth.c:713
-#, c-format
-msgid "Current access level: %d (%s)\n"
-msgstr "Hetke juurdepääsutase: %d (%s)\n"
-
 #: ../addressbook_popup.c:192
 msgid "Add"
 msgstr "Lisa"
@@ -115,6 +110,11 @@ msgstr "käib kah"
 msgid "strong"
 msgstr "tugev"
 
+#: ../auth.c:713
+#, c-format
+msgid "Current access level: %d (%s)\n"
+msgstr "Hetke juurdepääsutase: %d (%s)\n"
+
 #: ../auth.c:721
 msgid "Select access level for this user:"
 msgstr "Määra kasutaja juurdepääsutase:"
@@ -149,10 +149,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"
@@ -240,8 +240,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
@@ -746,8 +745,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: "
@@ -1273,8 +1271,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
@@ -1328,8 +1325,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 54ed24993c0a969e8280f04f0abb41659eaa36f8..7c391ddaa5ecede421a8430d6192e4442c331288 100644 (file)
--- 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"
@@ -246,8 +246,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."
 
@@ -648,8 +647,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:"
@@ -1310,8 +1308,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
@@ -1365,8 +1362,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."
@@ -1984,8 +1981,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 ""
@@ -2177,8 +2174,7 @@ msgstr "Entrez votre adresse OpenID et cliquez sur "Connecter"."
 
 #: ../static/t/openid_login.html:36
 msgid "Click here to learn what OpenID is and how Citadel is using it."
-msgstr ""
-"Cliquez ici pour savoir ce qu'est OpenID et comment Citadel l'utilise."
+msgstr "Cliquez ici pour savoir ce qu'est OpenID et comment Citadel l'utilise."
 
 #: ../static/t/openid_manual_create.html:4
 msgid " - powered by <a href='http://www.citadel.org'>Citadel</a>"

diff --git a/webcit/po/webcit/hu.po b/webcit/po/webcit/hu.po
index cf0c82614babe146259f07663a720943e7875d7d..87b5cdaf18e040839deec5c52d05adaa9ed68611 100644 (file)
--- 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"
@@ -241,8 +241,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."
@@ -274,8 +273,8 @@ msgstr "Visszautasít"
 #: ../calendar.c:276
 msgid "Click <i>Update</i> 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 "
-"<i>Frissítés</i>re"
+"A válasz elfogadásához és a naptár frissítéséhez kattintson a <i>Frissítés</"
+"i>re"
 
 #: ../calendar.c:277
 msgid "Update"
@@ -1064,8 +1063,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."
@@ -1287,8 +1285,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
@@ -1342,8 +1339,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 6f59b8337fd3f472c52ea72053d4ee56f115377a..cef350e71870b8f00053fb6fb254b8590e3e3b96 100644 (file)
--- a/webcit/po/webcit/it.po
+++ b/webcit/po/webcit/it.po
@@ -18,11 +18,6 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: it\n"
 
-#: ../messages.c:1537
-#, c-format
-msgid "An error occurred while retrieving this part: %s/%s\n"
-msgstr "E' avvenuto un errore durante il recupero di questa parte: %s/%s\n"
-
 #: ../addressbook_popup.c:192
 msgid "Add"
 msgstr "Aggiungi"
@@ -154,10 +149,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"
@@ -808,6 +803,11 @@ msgstr "Sposta questo messaggio in:"
 msgid "Move"
 msgstr "Sposta"
 
+#: ../messages.c:1537
+#, c-format
+msgid "An error occurred while retrieving this part: %s/%s\n"
+msgstr "E' avvenuto un errore durante il recupero di questa parte: %s/%s\n"
+
 #: ../messages.c:1597
 #, c-format
 msgid "An error occurred while retrieving this part: %s\n"
@@ -1075,8 +1075,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: "
@@ -1300,8 +1299,7 @@ msgid "Add rule"
 msgstr "Aggiungi regola"
 
 #: ../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
@@ -1355,8 +1353,8 @@ 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."
@@ -1741,8 +1739,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 534cde6accfcb3e6143afe4e184100fb0a004e56..606dd9fec1139f7bfd6e6b5c13cf1c18f1b38b94 100644 (file)
--- 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 <b>not</b> been "
 "updated."
 msgstr ""
-"U heeft gekozen dit verzoek om antwoord te negeren.  Uw agenda is "
-"<b>niet</b> bijgewerkt."
+"U heeft gekozen dit verzoek om antwoord te negeren.  Uw agenda is <b>niet</"
+"b> bijgewerkt."
 
 #: ../calendar.c:921
 msgid "Calendar day view begins at:"
@@ -738,8 +737,8 @@ msgstr ""
 "U abonneert <TT>%s</TT> op de <b>%s</b> 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.<br "
-"/><br /> Klik alstublieft op de gemailde link om uw abonnement te "
+"voorkomt dat anderen zonder uw toestemming u abonneren op mailinglijsten."
+"<br /><br /> Klik alstublieft op de gemailde link om uw abonnement te "
 "bevestigen<br />\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 966fab187fcc7924b818882c4b2f47565f8809d8..f06095c733113a5e324bf91bda152dc73d88ed7e 100644 (file)
--- a/webcit/po/webcit/pt_BR.po
+++ b/webcit/po/webcit/pt_BR.po
@@ -154,10 +154,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"
@@ -245,8 +245,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."
 
@@ -740,8 +739,8 @@ msgid ""
 msgstr ""
 "Você está se inscrevendo em <TT>%s</TT> na lista <b>%s</b>.  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.<br "
-"/><br />Clique no link que foi mandado para você e sua inscrição será "
+"extra previne que outros lhe inscrevam em listas sem seu consentimento.<br /"
+"><br />Clique no link que foi mandado para você e sua inscrição será "
 "confirmada.<br />\n"
 
 #: ../listsub.c:85
@@ -1308,8 +1307,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 ""
 "AVISO: Falha ao analisar a Configuração do Servidor; Você quer executar um  "
 "novo citserver?"
@@ -1365,8 +1363,8 @@ 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."

diff --git a/webcit/po/webcit/ru.po b/webcit/po/webcit/ru.po
index 811eb0433953d0b8feffc96943f22a3e5917a8aa..1ec34b740f66a0581081da58c1b3d75d603aedb4 100644 (file)
--- 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 "Данное событие может конфликтовать с  '%s' в вашем календаре."
 
 #: ../calendar.c:232
@@ -293,8 +292,7 @@ msgstr ""
 msgid ""
 "You have accepted this meeting invitation.  It has been entered into your "
 "calendar."
-msgstr ""
-"Вы приняли приглашение на встречу. Она была добавлена в ваш календарь."
+msgstr "Вы приняли приглашение на встречу. Она была добавлена в ваш календарь."
 
 #: ../calendar.c:337
 msgid ""
@@ -1108,8 +1106,7 @@ msgstr "Удалить скрипты"
 msgid ""
 "To delete an existing script, select the script name from the list and click "
 "'Delete'."
-msgstr ""
-"Для удаления скрипта, выберите скрипт из списка и нажмите \"Удалить\"."
+msgstr "Для удаления скрипта, выберите скрипт из списка и нажмите \"Удалить\"."
 
 #: ../sieve.c:711
 msgid "Delete script"
@@ -1279,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
@@ -1334,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 5d7746b6f999c0dd0283f7ff266ac1e923007466..402bc5b3ac2f87d26181ed8c94d65dc8a19e3c9b 100644 (file)
--- a/webcit/po/webcit/sv.po
+++ b/webcit/po/webcit/sv.po
@@ -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/preferences.c b/webcit/preferences.c
index f337fb196a0549e2819a4a96a6b6104f81a4678b..b2606b938a4f5414172e96cb0247a7fe8a517fea 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -1048,15 +1048,17 @@ void DeleteGVSNHash(HashList **KillMe)
 
 
 /*
- * Offer to make any page the user's "start page."
+ * Offer to make any page the user's "start page" (only if logged in)
  */
 void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
 {
-       wc_printf("<a href=\"change_start_page?startpage=");
-       urlescputs(ChrPtr(WC->Hdr->this_page));
-       wc_printf("\">");
-       wc_printf(_("Make this my start page"));
-       wc_printf("</a>");
+       if (WC->logged_in) {
+               wc_printf("<a href=\"change_start_page?startpage=");
+               urlescputs(ChrPtr(WC->Hdr->this_page));
+               wc_printf("\">");
+               wc_printf(_("Make this my start page"));
+               wc_printf("</a>");
+       };
 }
 
 

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index ab386f7c06fbc1139b4927f1cf83b85f63a7ccd4..4a84bef3eb535e47a9aca557937363217ea8d1ae 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -70,12 +70,14 @@
 <??("X",1)>
 </ul>
 </div>
+<??("COND:LOGGEDIN",2)>
 <div id="ib_logoff" class="ib_button">
 <a class="ib_button_link" href="javascript:ConfirmLogoff()" title="<?_("Log off")>"><span><?_("Log off")></span></a>
 </div>
 <div id="customize" class="iconbar_text">
   <span><a href="do_template?template=iconbar_edit"><?_("customize this menu")></a></span>
 </div>
+<??("X",2)>
 <div class="ctdlTemplate">
 <span id="rmlist_template"><?_("switch to room list")></span>
 <span id="mnlist_template"><?_("switch to menu")></span>

diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index 4a78740bbbb462e654958cacded005a38915648b..14a4d0d791dcf46acf78aabe2b5983ab068fab72 100644 (file)
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -4,7 +4,7 @@
 <div class="banner" id="room_banner">
 <h1><?%("COND:PREF", 1, "roomlistview", "rooms", _("Room list"), "")><?%("COND:PREF", 1, "roomlistview", "folders", _("Folder list"), "")><?%("COND:PREF", 1, "roomlistview", "table", _("Room list"), "")></h1>
 </div>
-
+<?=("loggedinas")>
 <!-- offer the ability to switch views-->
 <div id="actiondiv">
 <ul class="room_actions">

diff --git a/webcit/static/t/loggedinas.html b/webcit/static/t/loggedinas.html
index f6f448fa544ba1e0f66a91f65a9e2f7d0e7586bd..9799d0e506aec3b4c41792012cc34e68d2dfc5aa 100644 (file)
--- a/webcit/static/t/loggedinas.html
+++ b/webcit/static/t/loggedinas.html
@@ -1,3 +1,8 @@
-<div class="infos">
-Logged in as FIXME
+<div class="infos" id="loggedinas">
+<??("COND:LOGGEDIN",1)>
+<?_("Logged in as")> <?CURRENT_USER>.
+<??("X",1)>
+<?!("COND:LOGGEDIN",1)>
+<?_("Not logged in.")>
+<??("X",1)>
 </div>

diff --git a/webcit/static/t/readinfo.html b/webcit/static/t/readinfo.html
index 8fc2a5a09d45e72a02f45bb91783a30d2a4c7858..5c8bcd4c7296b669072343397d8b7b86f539f4e3 100644 (file)
--- a/webcit/static/t/readinfo.html
+++ b/webcit/static/t/readinfo.html
@@ -2,7 +2,7 @@
        onMouseOver="javascript:Effect.Appear('room_infos', { duration: 0.5 });"
        onMouseOut="javascript:Effect.Fade('room_infos', { duration: 0.5 });"
 >
-       <?THISROOM:INFOTEXT(40, "X")>
+       <?THISROOM:INFOTEXT(30, "X")>
 </div>
 <div id="room_infos" style="display:none;">
        <?THISROOM:INFOTEXT(0, "X")>

diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 8ace515af06e7abf0f733eeafa97f46693ecd8cd..25ca3e457abe98bdf73fff99b85ba2dcd8abfb4b 100644 (file)
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -13,6 +13,7 @@ return confirm('<?_("Do you really want to kill this session?")>');
 <h1>
 <?_("Users currently on ")><?SERV:HUMANNODE>
 </h1></div>
+<?=("loggedinas")>
 <div id="actiondiv">
 <ul class="room_actions">
 <li class="start_page">