proper localizations

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@283 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index e7e7c3b794f7033f72263bc1feb12e80423a8ebb..6875d4cad3756c6a705e40e4394ed54926af1e0a 100644 (file)
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-27  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.7
+
+       * English.lproj/default.strings: provided labels
+
+       * UIxContactsListView.wox, UIxContactView.wox, UIxContactEditor.wox:
+         converted static strings into labels
+
 2004-08-27  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxContactsListView: added simple filtering (v0.9.6)

diff --git a/SOGo/UI/Contacts/English.lproj/default.strings b/SOGo/UI/Contacts/English.lproj/default.strings
index 6cf7ce7dba5343e22a46377b3f38504fde88191b..a7ef693ed7add1bbe600bd5d1430de0e3dc30fff 100644 (file)
--- a/SOGo/UI/Contacts/English.lproj/default.strings
+++ b/SOGo/UI/Contacts/English.lproj/default.strings
@@ -1 +1,30 @@
 /* this file is in ISO-8859-1 format! */
+
+"Addressbook"       = "Addressbook";
+"Contact viewer"    = "Contact Viewer";
+"Contact editor"    = "Contact Editor";
+
+"Name"              = "Name";
+"Lastname"          = "Lastname";
+"Firstname"         = "Firstname";
+"EMail"             = "Email";
+"Phone"             = "Phone";
+"Fax"               = "Fax";
+"Location"          = "Location";
+"Organisation"      = "Organisation";
+"Unit"              = "Unit";
+"Common"            = "Common";
+
+"Addresses"         = "Addresses";
+"Postal"            = "Postal";
+"Home"              = "Home";
+"Extended"          = "Extended";
+"URL"               = "URL";
+
+/* button labels */
+
+"new"               = "new";
+"edit"              = "edit";
+"delete"            = "delete";
+"Save"              = "Save";
+"Cancel"            = "Cancel";

diff --git a/SOGo/UI/Contacts/UIxContactEditor.wox b/SOGo/UI/Contacts/UIxContactEditor.wox
index 0bba57ebf478959a1d196601e99cf87bf38f7817..f4a795bd9f090247569ba3420717e8e4aff0490b 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactEditor.wox
+++ b/SOGo/UI/Contacts/UIxContactEditor.wox
@@ -22,7 +22,7 @@
             <tr>
               <td width="5"/>
               <td class="window_label">
-                <var:string label:value="Appointment editor" /></td>
+                <var:string label:value="Contact editor" /></td>
               <td width="36" align="right" valign="center">
                 <var:component className="UIxWinClose" />
               </td>
@@ -33,8 +33,8 @@
       <tr>
         <td>
           <var:if condition="hasErrorText">
-           <div style="background-color: #AA0000;">
-             <var:string value="errorText" />
+            <div style="background-color: #AA0000;">
+                 <var:string value="errorText" />
             </div>
             <hr />
           </var:if>
@@ -105,7 +105,7 @@
             <tr valign="top">
               <td align="right" width="15%">
                 <span class="aptview_text">
-                  <var:string label:value="Facsimile" />:
+                  <var:string label:value="Fax" />:
                 </span>
               </td>
               <td align="left" bgcolor="#FFFFF0">
@@ -168,7 +168,7 @@
             <tr valign="top">
               <td align="right" width="15%">
                 <span class="aptview_text">
-                  <var:string label:value="Email" />:
+                  <var:string label:value="EMail" />:
                 </span>
               </td>
               <td align="left" bgcolor="#FFFFF0">
@@ -200,7 +200,7 @@
         <td>
             <input type="submit" label:value="Save" name="save:method" />
             <span class="button_auto_env"
-            ><a href="../weekoverview"
+            ><a href="../view"
                 var:queryDictionary="queryParameters"
                 class="button_auto"
              ><var:string label:value="Cancel" /></a></span>

diff --git a/SOGo/UI/Contacts/UIxContactView.wox b/SOGo/UI/Contacts/UIxContactView.wox
index acd29bedf2c6c4396ed4d802961b435c4188b623..96205f7b8161332fba56252947ea269a81d6be0d 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactView.wox
+++ b/SOGo/UI/Contacts/UIxContactView.wox
@@ -20,7 +20,8 @@
             <td width="5"/>
             <td class="wintitle">
               <!-- localize me -->
-              <span class="window_label">Address Viewer</span>
+              <span class="window_label"
+              ><var:string label:value="Contact viewer" /></span>
             </td>
             <td width="36" align="right" valign="center">
               <var:component className="UIxWinClose"/>
@@ -43,13 +44,17 @@
                 <tr>
                   <td class="button_auto_env" nowrap="true"
                       valign='middle' align='center'>
-                    <a class="button_auto" href="edit"
-                       var:queryDictionary="queryParameters">edit</a>
+                    <a class="button_auto"
+                       href="edit"
+                       var:queryDictionary="queryParameters"
+                    ><var:string label:value="edit" /></a>
                   </td>
                   <td class="button_auto_env" nowrap="true"
                       valign='middle' align='center'>
-                    <a class="button_auto" href="delete"
-                       var:queryDictionary="queryParameters">delete</a>
+                    <a class="button_auto"
+                       href="delete"
+                       var:queryDictionary="queryParameters"
+                    ><var:string label:value="delete" /></a>
                   </td>
                 </tr>
               </table>
@@ -64,7 +69,8 @@
       <!-- general contact info -->
       <tr valign="top">
         <td align="right" width="15%" bgcolor="#E8E8E0">
-            <span class="aptview_text">Name:</span>
+            <span class="aptview_text"
+            ><var:string label:value="Name" />:</span>
         </td>
         <td align="left" bgcolor="#FFFFF0">
             <span class="aptview_text">
@@ -74,7 +80,8 @@
       </tr>
       <tr valign="top">
         <td align="right" width="15%" bgcolor="#E8E8E0">
-          <span class="aptview_text">Location:</span>
+          <span class="aptview_text"
+          ><var:string label:value="Location" />:</span>
         </td>
         <td align="left" bgcolor="#FFFFF0">
           <span class="aptview_text">
@@ -99,7 +106,8 @@
             <table width="100%" border="0" cellpadding="4" cellspacing="0">
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text">E-Mail:</span>
+                  <span class="aptview_text"
+                  ><var:string label:value="EMail" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
@@ -108,7 +116,8 @@
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text">Phone:</span>
+                  <span class="aptview_text"
+                  ><var:string label:value="Phone" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
@@ -117,7 +126,8 @@
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text">Fax:</span>
+                  <span class="aptview_text"
+                  ><var:string label:value="Fax" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
@@ -127,7 +137,8 @@
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text">Organisation:</span>
+                  <span class="aptview_text"
+                  ><var:string label:value="Organisation" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
@@ -136,7 +147,8 @@
               </tr>
               <tr valign="top">
                 <td align="right" width="15%" bgcolor="#E8E8E0">
-                  <span class="aptview_text">Unit:</span>
+                  <span class="aptview_text"
+                  ><var:string label:value="Unit" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">

diff --git a/SOGo/UI/Contacts/UIxContactsListView.wox b/SOGo/UI/Contacts/UIxContactsListView.wox
index 9026cbfb434d6229e6bff8b6213815b2d081c252..5dd82a9cf5764f95f29e16c1990cb00b4d9b0f5e 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactsListView.wox
+++ b/SOGo/UI/Contacts/UIxContactsListView.wox
@@ -35,7 +35,8 @@
             <td width="5"/>
             <td class="wintitle">
               <!-- localize me -->
-              <span class="window_label">Addressbook</span>
+              <span class="window_label"
+              ><var:string label:value="Addressbook"/></span>
             </td>
             <td width="36" align="right" valign="center">
               <var:component className="UIxWinClose"/>
@@ -83,38 +84,44 @@
                     <th>
                       <var:if condition="sortKey" const:value="sn"
                               const:negate="YES">
-                       <a href="view" _sort="sn" 
-                           var:_search="searchText">Lastname</a>
+                        <a href="view"
+                           _sort="sn"
+                           var:_search="searchText"
+                        ><var:string label:value="Lastname" /></a>
                       </var:if>
                       <var:if condition="sortKey" const:value="sn">
-                        <i>Lastname</i>
+                        <i><var:string label:value="Lastname" /></i>
                       </var:if>
                     </th>
                     <th>
                       <var:if condition="sortKey" const:value="givenname"
                               const:negate="YES">
-                       <a href="view" _sort="givenname" 
-                           var:_search="searchText">Firstname</a>
+                        <a href="view"
+                           _sort="givenname"
+                           var:_search="searchText"
+                        ><var:string label:value="Firstname" /></a>
                       </var:if>
                       <var:if condition="sortKey" const:value="givenname">
-                        <i>Firstname</i>
+                        <i><var:string label:value="Firstname" /></i>
                       </var:if>
                     </th>
                     <th>
                       <var:if condition="sortKey" const:value="mail"
                               const:negate="YES">
-                       <a href="view" _sort="mail" 
-                           var:_search="searchText">EMail</a>
+                        <a href="view"
+                           _sort="mail"
+                           var:_search="searchText"
+                        ><var:string label:value="EMail" /></a>
                       </var:if>
                       <var:if condition="sortKey" const:value="mail">
-                        <i>Email</i>
+                        <i><var:string label:value="EMail" /></i>
                       </var:if>
                     </th>
                     <th>
-                     Phone
+                           <var:string label:value="Phone" />
                     </th>
                     <th>
-                     Location
+                           <var:string label:value="Location" />
                     </th>
                   </tr>
                   <var:foreach list="contactInfos" item="contact">

diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version
index 0eb47da345be1d4c8ac5a363234ca3f2c77473cb..cab297dce179f93daddb8c8e20c17af86c0b5d3b 100644 (file)
--- a/SOGo/UI/Contacts/Version
+++ b/SOGo/UI/Contacts/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7