Changeset 156

Timestamp:

08/25/07 01:53:02 (17 months ago)

Author:

jonas

Message:

Improved: CpVES webinterface is english (#24)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/localization/de_DE (deleted)
• templates/cont_headline.tpl (modified) (2 diffs)
• templates/domain_add.tpl (modified) (1 diff)
• templates/email_view.tpl (modified) (2 diffs)
• templates/error_messages.tpl (modified) (1 diff)
• templates/forward_view.tpl (modified) (3 diffs)
• templates/list_add.tpl (modified) (1 diff)
• templates/navigation.tpl (modified) (2 diffs)
• templates/user_spam.tpl (modified) (1 diff)
• web/index.php (modified) (1 diff)

trunk/ChangeLog

@@ -43 +43 @@
         o Improved: make Spam folder bold in "move known spam to"
         o Improved: check for correct permissions for every user_ site
+        o Improved: CpVES webinterface is english (#24)
 CpVES 0.03 2007-05-01 - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Improved: create forward;copy addresses to form

trunk/templates/cont_headline.tpl

@@ -20 +20 @@
         {$dnsname}: {t}create new forwarding{/t}
 {elseif $template == "forward_catchall.tpl"}
-        {$dnsname}: {$headline.catchall}
+        {$dnsname}: {t}catchall address{/t}
 {elseif $template == "sadmin_passwd.tpl"}
         {t}change password{/t}
@@ -44 +44 @@
         {$forward}: {t}edit{/t}
 {elseif $template == "email_del.tpl"}
-        {$email}: {$labels.email_address} {t}delete{/t}
+        {$email}: {t}delete emailaddress{/t}
 {elseif $template == "forward_del.tpl"}
         {$dnsname}: {t}delete forwarding{/t}

trunk/templates/domain_add.tpl

@@ -12 +12 @@
                 </tr>
                 <tr>
-                        <td>{$labels.prio}</td>
-                        <td>{$labels.mx_address}</td>
-                        <td style="width:230px;">{$labels.da_ip_type}</td>
-                        <td>{$labels.da_goes_to_mailsys}</td>
+                        <td>{t}prio{/t}</td>
+                        <td>{t}MX address{/t}</td>
+                        <td style="width:230px;">{t}ip type{/t}</td>
+                        <td>{t}MX points to our server{/t}</td>
                 </tr>
                 {section name=row loop=$mx_entry} 

trunk/templates/email_view.tpl

@@ -146 +146 @@
         <option value="enable">{t}yes{/t}</option>
         {if $if_mailarchive_value == 0}
-        <option value="disbale" selected="selected">{$labels.opt_no}</option>
+        <option value="disbale" selected="selected">{t}no{/t}</option>
         {else}
         <option value="disbale">{t}no{/t}</option>
@@ -465 +465 @@
 </form>
 <div id="myOnPageContent" style="display:none">
-<span style="color:red;font-weight:bold;font-size:15pt;">{t}- Warning .{/t}</span><br/>
+<span style="color:red;font-weight:bold;font-size:15pt;">{t}- Warning -{/t}</span><br/>
 <br/>
 <span style="font-weight:bold;">{t}This option is dangerous, an wrong value will delete spam and Ham!{/t}</span><br/><br/>

trunk/templates/error_messages.tpl

@@ -1 +1 @@
 {if $if_error_postmaster == 'y' }
-Postmaster-Weiterleitung kann nicht gelöscht oder deaktiviert werden!
+{t}you can not delete or deactivate the postmaster forward!{/t}
 {elseif $if_error_domain_exits == 'y' }
-Domain im Mailsystem schon vorhanden!
+{t}domain already exists!{/t}
 {elseif $if_error_email_exits == 'y' }
-E-Mailadresse schon vorhanden!
+{t}emailaddress already exists!{/t}
 {elseif $if_error_email_max_reached == 'y' }
-Maximale Anzahl an E-Mailadressen erreicht, es k&ouml;nnen keine weiteren E-Mailadressen angelegt werden!<br/> - Bitte wenden sie sich an Ihren Administrator! -
+{t}You have reached the max emailaddresses.{/t}<br/>
+{t}Please contact your admin!{/t}
 {elseif $if_error_missing_input == 'y' }
 {t}missing input{/t}
 {elseif $if_error_password_long == 'y' }
-Passwort muss zwischen 3 und {$max_passwd_len} Zeichen lang sein! 
+{t}password to short.{/t}<br/>
+{t 1=$max_passwd_len}password should contain three between %1 characters{/t}
 {elseif $if_error_password_empty == 'y'}
-Passwort darf nicht leer sein!
+{t}password is empty!{/t}
 {elseif $if_error_password_old_wrong == 'y'}
-Altes Passwort falsch!
+{t}old password is wrong!{/t}
 {elseif $if_error_sadmim_exits == 'y'}
-Superadmin mit diesem Benutzernamen schon vorhanden!
+{t}superadmin already exists!{/t}
 {elseif $if_error_autores_subject_empty == 'y'}
-Betreff des Autoresponders darf nicht leer sein!
+{t}vacation subject ist empty!{/t}
 {elseif $if_error_autores_msg_empty == 'y'}
-Nachricht des Autoresponders darf nicht leer sein! 
+{t}vacation message is empty!{/t}
 {elseif $if_error_autores_subject_to_long == 'y'}
-Betreff des Autoresponders ist zu lang!
+{t}vacaction subject is to long!{/t}
 {elseif $if_error_autores_send_times == 'y'}
-Fehler: Sende Autoresponder bis! INTERNAL ERROR!
+{t}Internal vacaction ERROR!{/t}
 {elseif $if_email_valid == 'y'}
-E-Mailadresse ist nicht konform.
+{t}emailaddress is not valid!{/t}
 {elseif $if_error_forwds_max_reached == 'y'}
-Maximale Anzahl an Weiterleitungen erreicht, es k&ouml;nnen keine weiteren Weiterleitungen angelegt werden!<br/> - Bitte wenden sie sich an Ihren Administrator! -
+{t}You have reached the max forwardings.{/t}<br/>
+{t}Please contact your admin!{/t}
 {elseif $if_error_login_failed == 'y' }
-Benutzername oder Passwort falsch
+{t}username or password wrong!{/t}
 {elseif $if_sadmin_wrong_char == 'y' }
-Benutzername enthaelt ung&uuml;ltige Zeichen!<br/>
-Benutzername darf nur Buchstaben und Zahlen enthalten!<br/>
-Benutzername darf nicht l&auml;nger als 8 Zeichen umfassen!
+{t}username not valid.{/t}<br/>
+{t}username should contain only chars and numbers.{/t}<br/>
+{t}username should only contain 8 chars!{/t}
 {elseif $if_new_passwd_not_same == 'y'}
-Neue Passw&ouml;rter stimmen nicht &uuml;berein!
+{t}new passwords does not match!{/t}
 {elseif $if_submit_email_wrong == 'y' }
-E-Mailadresse ist ung&uuml;ltig
+{t}emailaddress is not valid!{/t}
 {elseif $if_forward_all_del == 'y' }
-Es wurden alle Adressen der Weiterleitung<br/> zum L&ouml;schen markiert.<br/>
-Bitte <a href="?module=forward_del&#038;did={$domainid}&#038;id={$id}">hier klicken</a> um die Weiterleitung zu l&ouml;schen!
+{t escape='off'}all addresses of this forwarding</br>selected to delete.<br/>{/t}
+{t escape='off' 1=$id 2=$domainid}Please <a href="?module=forward_del&#038;did=%2&#038;id=%1">click here</a> to delete the forwarding!{/t}
 {elseif $if_wrong_sa_threshold == 'y'}
-Falsches Format f&uuml;r den Spamassassin-threshold!
+{t}wrong input value for spamassassin threshold!{/t}
 {elseif $if_wrong_sa_subjecttag == 'y' }
-Die Betreffszeile darf nicht l&auml;nger als 15 Zeichen sein!
+{t}subject should only be 15 chars long!{/t}
 {elseif $if_error_autores_date_wrong == 'y'}
-Das Datum hat das falsche Format! (DD.MM.JJJJ)
+{t}wrong date format! (DD.MM.JJJJ){/t}
 {elseif $if_error_autores_time_wrong == 'y'}
-Die Uhrzeit hat das falsche Format! (HH:MM:SS)
+{t}wrong time format! (HH:MM:SS){/t}
 {elseif $if_error_autores_disable_in_past == 'y' }
-Das angegebene Datum + Uhrzeit liegt in der Vergangenheit!
+{t}date and time are in the past!{/t}
 {elseif $if_error_sa_disabled_enable_bogofilter == 'y' }
-Bogofilter ben&ouml;tigt Spamassassin!<br/>
-Bitte erst Spamassassin freischalten.
+{t}bogofilter needs spamassassin!{/t}<br/>
+{t}Please enable spamassassin first!{/t}
 {elseif $if_error_sa_disable_enable_sa_learn == 'y' }
-Spam/Ham lernbar ben&ouml;tigt Spamassassin!<br/>
-Bitte erst Spamassassin freischalten.
+{t}ham/spam learning needs spamassassin!{/t}<br/>
+{t}Please enable spamassassin first!{/t}
 {elseif $if_error_sa_disable_enable_sa_wb_listing == 'y' }
-Whitelisting ben&ouml;tigt Spamassassin!<br/>
-Bitte erst Spamassassin freischalten.
+{t}whitelisting needs spamasassin!{/t}<br/>
+{t}Please enable spamassassin first!{/t}
 {elseif $sa_whitelist_data_add_empty == 'y' }
-Whitelistfeld darf nicht leer sein!
+{t}whitelistfild is empty!{/t}
 {elseif $sa_whitelist_data_add_wrong == 'y'}
-Whitelistfeld enth&auml;lt ung&uuml;ltige Zeichen!
+{t}wrong input value for the whitelist!{/t}
 {elseif $if_wrong_del_known_spam_value == 'y'}
-Falsches Format f&uuml;r die Option "L&ouml;sche erkannten Spam"!<br/>
-Format: XX.Y (z.B. 12.3)
+{t}wrong format for the delete spam option!{/t}<br/>
+{t}correct: XX.Y (e.x. 12.3){/t}
 {elseif $if_wrong_del_known_spam_value_lower == 'y'}
-Option "L&ouml;sche erkannten Spam"<br/> ist niedriger als "Markiere Nachricht" als Spam!
+{t}the value "delete spam" is to low!{/t}
 {elseif $if_error_forwardaddr_valid == 'y' }
-Weiterleitungsadresse ist nicht konform!
-{elseif $if_error_sa_disable_enable_spam_del == 'y' } 
-Diese Option ben&ouml;tigt Spamassassin.<br/>
-Bitte erst Spamassassin aktivieren, danach diese Option!
+{t}forwarding address is not valid!{/t}
+{elseif $if_error_sa_disable_enable_spam_del == 'y' }
+{t}del know spam needs spamassassin!{/t}<br/>
+{t}Please enable spamassassin first!{/t}
 {elseif $if_error_artime == 'y'}
-Archivieren nach n Tagen ist entweder leer oder ung&uuml;ltig!<br/>
-Bitte nur Zahlen verwenden.
+{t}the archive after n days is wrong. Please check!{/t}
 {elseif $fm_missing_error == 'y'}
+{t}Please check all input fields!{/t}
 Bitte alle Felder ausf&uuml;llen!
 {/if}

trunk/templates/forward_view.tpl

@@ -4 +4 @@
 <table>
 <tr>
- <td>Von: </td>
+ <td>{t}forward:{/t} </td>
  <td>{$forward}</td>
 </tr>
 <tr>
- <td valign="top">An: </td>
+ <td valign="top">{t}to:{/t}</td>
  <td>
  <select style="min-width:250px;" name="etos[]" size="8" multiple="true" >
@@ -18 +18 @@
 </tr>
 <tr>
- <td colspan="2" class="domain_view"><h3>Selektierte Adresse l&ouml;schen:</h3></td>
+ <td colspan="2" class="domain_view"><h3>{t}delete selected addresses:{/t}</h3></td>
 </tr>
 <tr>
- <td colspan="2"  style="text-align:right"><input name="del_addr" value="L&ouml;schen" type="submit" /></td>
+ <td colspan="2"  style="text-align:right"><input name="del_addr" value="{t}delete{/t}" type="submit" /></td>
 </tr>
 </form>
 <tr>
- <td colspan="2" class="domain_view"><h3>Adresse hinzuf&uuml;gen:</h3></td>
+ <td colspan="2" class="domain_view"><h3>{t}add new address:{/t}</h3></td>
 </tr>
 <tr>
- <td valign="top">{$labels.email_address}:</td>
- <td style="text-align:right"><form action="?module=forward_view&#038;id={$id}&#038;did={$did}" method="post"><input type="text" name="add_fwd" /><br/><input  type="submit" value="{$labels.create}" name="submit_fwd" /></form><br/>
+ <td valign="top">{t}emailaddress:{/t}</td>
+ <td style="text-align:right"><form action="?module=forward_view&#038;id={$id}&#038;did={$did}" method="post"><input type="text" name="add_fwd" /><br/><input  type="submit" value="{t}add{/t}" name="submit_fwd" /></form><br/>
  
  {if $if_noemail_found != "y" }
@@ -36 +36 @@
  {section name=row loop=$table_addemail}
  <option value="{$table_addemail[row].email}">{$table_addemail[row].email}</option>
- {/section}</select><input type="submit" value="{$labels.create}" name="submit_fwd" />
+ {/section}</select><input type="submit" value="{t}add{/t}" name="submit_fwd" />
  </form> 
  {/if}

trunk/templates/list_add.tpl

@@ -20 +20 @@
 <td></td>
 <td style="width:10px;"></td>
-<td><input type="submit" name="submit" value="{$labels.create}" /></td>
+<td><input type="submit" name="submit" value="{t}create{/t}" /></td>
 </tr>
 </table>

trunk/templates/navigation.tpl

@@ -35 +35 @@
         {/if}
         {if $p_mailarchive == 1}
-        <a class="nav sub" href="?module=user_archivemail">{t}archivemail{/t}</a>
+        <!--
+        <a class="nav sub" href="?module=user_archivemail">{t}archivemail{/t}</a> -->
         {/if}
         {if $p_fetchmail == 1}
@@ -58 +59 @@
         {/if}
         {if $p_mailarchive == 1}
-        <a class="nav" href="?module=user_archivemail">{t}archivemail{/t}</a>
+        <!--
+        <a class="nav" href="?module=user_archivemail">{t}archivemail{/t}</a> -->
         {/if}
         {if $p_fetchmail == 1}

trunk/templates/user_spam.tpl

@@ -113 +113 @@
 </form>
 <div id="myOnPageContent" style="display:none">
-<span style="color:red;font-weight:bold;font-size:15pt;">{t}- Warning .{/t}</span><br/>
+<span style="color:red;font-weight:bold;font-size:15pt;">{t}- Warning -{/t}</span><br/>
 <br/>
 <span style="font-weight:bold;">{t}This option is dangerous, an wrong value will delete spam and Ham!{/t}</span><br/><br/>

trunk/web/index.php

@@ -20 +20 @@
 require_once("../root.php");
 require_once( ROOT . "/includes/config.inc.php");
-include( ROOT . "/includes/localization/de_DE/labels.inc.php");
-$smarty->assign('labels', $labels);
 if (!isset($_POST['login']) && $_GET['module'] != "login"  ) {
         include(ROOT . "/includes/check_access.php");