From 4ce3947e60cae62a8b04bf69fa8fa4d1064c3da8 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 13 Jan 2016 09:26:21 -0500
Subject: [PATCH] Fix localizable strings (templates, JavaScript)

---
 .../ContactsUI/UIxContactFolderProperties.wox        |  6 +++---
 UI/Templates/PreferencesUI/UIxFilterEditor.wox       |  8 ++++----
 UI/Templates/SchedulerUI/UIxCalMainView.wox          |  2 +-
 UI/Templates/SchedulerUI/UIxCalendarProperties.wox   | 12 ++++++------
 UI/WebServerResources/UIxComponentEditor.js          |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
index cea9954ef..5b359b6c3 100644
--- a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
+++ b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
@@ -27,7 +27,7 @@
         <fieldset>
           <legend><var:string label:value="Properties"/></legend>
           <div>
-            <var:string label:value="Address Book Name:" />
+            <var:string label:value="Address Book Name" />
             <input type="text" name="addressBookName" id="addressBookName" class="textField" var:value="addressBookName" />
           </div>
         </fieldset>
@@ -52,7 +52,7 @@
         <fieldset id="authenticatedLinks">
           <legend><var:string label:value="Authenticated User Access"/></legend>
           <div>
-            <var:string label:value="CardDAV URL: "/>
+            <var:string label:value="CardDAV URL"/>
             <var:string value="cardDavURL" />
           </div>
         </fieldset>
@@ -60,7 +60,7 @@
           <fieldset id="publicLinks">
             <legend><var:string label:value="Public Access"/></legend>
             <div>
-              <var:string label:value="CardDAV URL: "/>
+              <var:string label:value="CardDAV URL"/>
               <var:string value="publicCardDavURL" />
             </div>
           </fieldset>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index b62f77a84..ac33dd422 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -18,7 +18,7 @@
   </script>
   <form id="mainForm" var:href="ownPath">
     <div id="filterNameContainer" class="container">
-      <label><var:string label:value="Filter name:"
+      <label><var:string label:value="Filter name"
           /><input const:name="filterName" class="textField" type="text"
           var:value="filterName"/></label><br/>
     </div>
@@ -26,10 +26,10 @@
       <var:string label:value="For incoming messages that"/>
       <select const:name="matchType" const:id="matchType"
         ><option const:value="all"
-          ><var:string label:value="match all of the following rules:"
+          ><var:string label:value="match all of the following rules"
             /></option
           ><option const:value="any"
-          ><var:string label:value="match any of the following rules:"
+          ><var:string label:value="match any of the following rules"
             /></option
         ><option const:value="allmessages"
           ><var:string label:value="match all messages"
@@ -50,7 +50,7 @@
     </div>
     <!-- <div id="splitter" class="dragHandle"></div> -->
     <div id="filterActionsContainer" class="container">
-      <var:string label:value="Perform these actions:"/><br/>
+      <var:string label:value="Perform these actions"/><br/>
       <div id="filterActions"><!-- empty --></div>
       <div class="bottomToolbar"
         ><a const:id="actionAdd" class="bottomButton" href="#">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 8dc1789d5..3d3541a08 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -189,7 +189,7 @@
                      menuid="taskSearchMenu" />
             </span>
             <span>
-              <var:string label:value="View:" />
+              <var:string label:value="View" />
               <var:popup list="tasksFilters"
                 const:id="tasksFilterpopup"
                 item="taskFilter" string="tasksFilterLabel" value="taskFilter"
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 0e57deb7e..52fca3b5a 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -102,13 +102,13 @@
           <!--<div id="propertiesView">-->
           <fieldset>
             <legend><var:string label:value="Properties"/></legend>
-            <div><span class="label"><var:string label:value="Name:"/></span
+            <div><span class="label"><var:string label:value="Name"/></span
             ><span class="content"><input type="text"
               name="calendarName" id="calendarName"
               class="textField"
               var:value="calendarName"
               /></span></div>
-            <div><span class="label"><var:string label:value="Color:"/></span
+            <div><span class="label"><var:string label:value="Color"/></span
             ><span class="content"
               ><div id="colorButton" class="colorBox" var:data-color="calendarColor"><!-- space --></div
               ><input type="hidden" name="calendarColor" id="calendarColor" var:value="calendarColor"
@@ -171,7 +171,7 @@
                 <div><label
                   ><input type="checkbox" const:class="checkBox"
                   id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
-                  /><var:string label:value="When I modify my calendar, send a mail to:"
+                  /><var:string label:value="When I modify my calendar, send a mail to"
                   /></label></div>
                 <div><span class="label"
                   ><entity name="nbsp"/></span><span class="content">
@@ -187,7 +187,7 @@
         <div id="davLinksView" class="tab">
           <var:if condition="isWebCalendar">
             <fieldset id="webCalendarUrl">
-              <legend><var:string label:value="URL:"/></legend>
+              <legend><var:string label:value="URL"/></legend>
               <div><a const:class="clickableLink" var:href="webCalendarURL" var:title="webCalendarURL"
                 target="_new"><var:string var:value="webCalendarURL"/></a></div>
             </fieldset>
@@ -197,7 +197,7 @@
               <legend><var:string label:value="Authenticated User Access"/></legend>
               <div>
                 <span>
-                  <var:string label:value="CalDAV URL: "/>
+                  <var:string label:value="CalDAV URL"/>
                   <var:string value="calDavURL" />
                 </span><br/>
               <a const:class="clickableLink" var:href="webDavICSURL" var:title="webDavICSURL">
@@ -210,7 +210,7 @@
                 <legend><var:string label:value="Public Access"/></legend>
                 <div>
                   <span>
-                    <var:string label:value="CalDAV URL: "/>
+                    <var:string label:value="CalDAV URL"/>
                     <var:string value="publicCalDavURL"/>
                   </span><br/>
                 <a const:class="clickableLink" var:href="publicWebDavICSURL" var:title="publicWebDavICSURL">
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 8208b597b..24bf16284 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -56,7 +56,7 @@ function onPopupAttachWindow(event) {
         preventDefault(event);
 
     var attachInput = $("attach");
-    var newAttach = window.prompt(_("Target:"), attachInput.value || "http://");
+    var newAttach = window.prompt(_("Target"), attachInput.value || "http://");
     if (newAttach != null) {
         var documentHref = $("documentHref");
         var documentLabel = $("documentLabel");