* remove spurious linebreaks

* add _() to not yet i18n'ed texts

diff --git a/webcit/static/t/newstartpage.html b/webcit/static/t/newstartpage.html
index fddf46d460af858583f5b6bc669e14e92d59deee..15ba39218aa95dc804b988efe8542a166b8a1957 100644 (file)
--- a/webcit/static/t/newstartpage.html
+++ b/webcit/static/t/newstartpage.html
@@ -1,16 +1,15 @@
 <! newstartpage.html start>
 <div class="room_banner" >
 <div align=center >
-<h1>New start page</h1>
+<h1><?_("New start page")></h1>
 &nbsp;
 </div></div>
 <div id="content">
 <div align=center>
-<font size=+2>Your start page has been changed.</font> </div>
+<font size=+2><?_("Your start page has been changed.")></font> </div>
 <br /><br />
 <div align=center>
-<i>(Note: this does not change your browser's home page.
-It changes the page you begin on when you log on to <?SERV:HUMANNODE>).</i>
+<i><?_("(Note: this does not change your browser's home page. It changes the page you begin on when you log on to")> <?SERV:HUMANNODE>).</i>
 <br /><br />
 
 <a href="javascript:history.back()">Back...</a>

diff --git a/webcit/static/t/pushemail.html b/webcit/static/t/pushemail.html
index e5db1a53e8da4d2bde12df6dec40d9d0a1296e3d..143fed06634385680308325dc3b483e0fc40ccb9 100644 (file)
--- a/webcit/static/t/pushemail.html
+++ b/webcit/static/t/pushemail.html
@@ -1,5 +1,5 @@
     <div id="banner">
-      <h1>Configure Push Email</h1>
+      <h1><?_("Configure Push Email")></h1>
     </div>
 
     <div id="content" class="config_service">
@@ -12,12 +12,11 @@
 
       <div id="pushemail">
         <div class="instructions">
-          <p>If your administrator has enabled the functionality, Citadel can notify a
-          Funambol server that you haved recieved new email and automatically syncronize
-          any devices you have with the Funambol client installed.</p>
+          <p>
+<?_("If your administrator has enabled the functionality, Citadel can notify a Funambol server that you haved recieved new email and automatically syncronize any devices you have with the Funambol client installed.")></p>
 
-          <p>Alternatively, if the administrator has configured it, Citadel can send a
-          text message to you when new mail arrives.</p>
+          <p>
+<?_("Alternatively, if the administrator has configured it, Citadel can send a text message to you when new mail arrives.")></p>
         </div>
 
         <form id="pushconfig" method="post" action="save_pushemail">
@@ -26,11 +25,10 @@
 
           <p class="option"><input type="radio" name="pushsetting" value=
           "textmessage" <?PUSH_TEXT> ><strong>Send a text message</strong> to... <input type="text"
-          name="user_sms_number" size="20" <?SMSNUM> > (Use international format, without any
-          leading zeros, spaces or hypens, like +61415011501)</p>
+          name="user_sms_number" size="20" <?SMSNUM> > <?_("(Use international format, without any leading zeros, spaces or hypens, like +61415011501)")></p>
 
           <p class="option"><input type="radio" name="pushsetting" value=
-          "none" <?PUSH_NONE> ><strong>Don't send any notifications</strong></p>
+          "none" <?PUSH_NONE> ><strong><?_("Don't send any notifications"></strong></p>
 
           <p><input type="submit" name="submit" value="Save settings"></p>
         </form>

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 01f06bec3fd10fdc25ab363f67b84d95962f9cc2..7273a6c4df0676f76a02045fd2ecab083a13c28f 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -14,8 +14,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
  <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
-   <a href="display_enter
-?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
+   <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
    <a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
    <a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a> 
    <a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a> 

diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html
index cf05e29e0515981ee3ddd361b839d9701c010bf2..4037d2b8e8440b8ad3a0077cb0d35e7949ee8cde 100644 (file)
--- a/webcit/static/t/vnoteitem.html
+++ b/webcit/static/t/vnoteitem.html
@@ -13,7 +13,7 @@
 <td align=left valign=middle>
 <img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/8paint16.gif">
 </td>
-<td></td><!-- nothing in the title bar, it's just for dragging-->
+<td></td><!-- nothing in the title bar, its just for dragging-->
 <td align=right valign=middle>
  <img onclick="DeleteStickyNote(event,'<?VNOTE:UID>','<?_("Delete this note?")>')"
   src="static/closewindow.gif">