From 6277ea0af84512845e98d4b7a0fcab94fabacd35 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 27 Feb 2017 11:14:31 -0700 Subject: [PATCH] Some translation improvements from Stefan Unverricht --- addressbook/js/app.js | 2 +- addressbook/lang/egw_de.lang | 1 + admin/js/app.js | 2 +- admin/lang/egw_de.lang | 1 + admin/lang/egw_en.lang | 1 + api/lang/egw_de.lang | 1 + api/lang/egw_en.lang | 1 + filemanager/js/app.js | 2 +- mail/inc/class.mail_compose.inc.php | 2 +- mail/inc/class.mail_ui.inc.php | 2 +- mail/js/app.js | 2 +- mail/lang/egw_cs.lang | 1 - mail/lang/egw_de.lang | 3 +-- mail/lang/egw_en.lang | 4 +--- mail/lang/egw_fr.lang | 3 --- mail/lang/egw_it.lang | 2 -- mail/lang/egw_nl.lang | 1 - mail/lang/egw_pt.lang | 1 - mail/lang/egw_sk.lang | 3 --- resources/lang/egw_de.lang | 4 ++-- resources/lang/egw_en.lang | 5 +++-- resources/templates/default/edit.xet | 2 +- 22 files changed, 19 insertions(+), 27 deletions(-) diff --git a/addressbook/js/app.js b/addressbook/js/app.js index ae6c3eb827..a4a2eb010d 100644 --- a/addressbook/js/app.js +++ b/addressbook/js/app.js @@ -607,7 +607,7 @@ app.classes.addressbook = AppJS.extend( } }, this.egw.lang('Name for the distribution list'), - this.egw.lang('Add a new list...') + this.egw.lang('Add a new list') ); }, diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index 2ffc149ee8..fc569a840f 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -187,6 +187,7 @@ displays a remider for birthdays on the startpage (page you get when you enter e distribution list deleted addressbook de Verteiler gelöscht distribution list renamed addressbook de Verteiler umbenannt distribution lists addressbook de Verteilerlisten +distribution lists as groups addressbook de Verteilerlisten als Gruppen distribution lists, ... addressbook de Verteilerlisten, ... do you really want to delete this contact? addressbook de Diesen Kontakt löschen? do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook? addressbook de Sie können mit dieser Funktion ein privates Adressbuch nutzen, das nicht an andere Benutzer freigegeben werden kann und Ihre Privatsphäre optimal schützt. Aktivieren Sie diese Funktion nach Bedarf. diff --git a/admin/js/app.js b/admin/js/app.js index 3567c91d54..a6db6b46b7 100644 --- a/admin/js/app.js +++ b/admin/js/app.js @@ -609,7 +609,7 @@ app.classes.admin = AppJS.extend( .sendRequest(); } },this), - title: egw.lang('Access control'), + title: this.egw.lang('Access control'), buttons: et2_dialog.BUTTONS_OK_CANCEL, value: { content: content, diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang index 6144aebaf6..c62634b8e9 100644 --- a/admin/lang/egw_de.lang +++ b/admin/lang/egw_de.lang @@ -270,6 +270,7 @@ description can not exceed 255 characters in length ! admin de Die Beschreibung destination account #%1 does exist and is not renamed itself! can not merge accounts, it will violate unique contains. delete with transfer of data instead. admin de Zielkonto #%1 besteht und wurde nicht umbenannt. Konten wurden nicht zusammengeführt, da die eindeutige Kennzeichnung gestört würde. Alternativ sollten Sie löschen mit übertragen des Inhalts anwählen. determines the order the fields are displayed admin de bestimmt die Reihenfolge der angezeigten Felder disable admin de abschalten +disable all admin de Alle Videos deaktivieren disable "auto completion" of the login form admin de Automatisches Vervollständigen der Logindaten abschalten disable minifying of javascript and css files admin de Komprimierung von Javascript und CSS Dateien deaktivieren disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang index e4a3655950..d29c3340aa 100644 --- a/admin/lang/egw_en.lang +++ b/admin/lang/egw_en.lang @@ -270,6 +270,7 @@ description can not exceed 255 characters in length ! admin en Description can n destination account #%1 does exist and is not renamed itself! can not merge accounts, it will violate unique contains. delete with transfer of data instead. admin en Destination account #%1 does exist and is NOT renamed itself! Can not merge accounts, it will violate unique contains. Delete with transfer of data instead. determines the order the fields are displayed admin en Determines the order the fields are displayed disable admin en Disable +disable all admin en Disable all disable "auto completion" of the login form admin en Disable "auto completion" of the login form disable minifying of javascript and css files admin en Disable minifying of javascript and CSS files disable wysiwyg-editor admin en Disable WYSIWYG-editor diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index 672c73c63d..9d1043df61 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -618,6 +618,7 @@ high common de Hoch highest common de Höchste history log common de Versionshistorie hold [%1] and [%2] key to drag %3 to your desktop common de [%1] und [%2] Tasten halten um %3 auf Ihren Schreibtisch (Desktop) zu ziehen +hold [%1] key to select text eg. to copy it common de Zum Kopieren [%1]-Taste beim Auswählen halten holy see (vatican city state) common de VATICAN home common de Home home email common de private E-Mail diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index b43b4fe144..0000f65fe2 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -618,6 +618,7 @@ high common en High highest common en Highest history log common en History log hold [%1] and [%2] key to drag %3 to your desktop common en Hold [%1] and [%2] key to drag %3 to your desktop +hold [%1] key to select text eg. to copy it common en Hold [%1] key to select text eg. to copy it holy see (vatican city state) common en HOLY SEE (VATICAN CITY STATE) home common en Home home email common en Home email diff --git a/filemanager/js/app.js b/filemanager/js/app.js index 51d204f266..8d6917b92b 100644 --- a/filemanager/js/app.js +++ b/filemanager/js/app.js @@ -566,7 +566,7 @@ app.classes.filemanager = AppJS.extend( self._do_action('createdir', dir, true, path); // true=synchronous request self.change_dir((path == '/' ? '' : path)+'/'+ dir); } - },this.egw.lang('New directory'),this.egw.lang('Create directroy')); + },this.egw.lang('New directory'),this.egw.lang('Create directory')); }, /** diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index c68dae93c0..6ff4f6b97d 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -206,7 +206,7 @@ class mail_compose 'hint' => 'Select the message priority tag', ), 'save2vfs' => array ( - 'caption' => 'Save to VFS', + 'caption' => 'Save to filemanager', 'icon' => 'filesave', 'group' => ++$group, 'onExecute' => 'javaScript:app.mail.compose_saveDraft2fm', diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index ea5434db4e..059bd3b378 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -1126,7 +1126,7 @@ class mail_ui ), 'save2filemanager' => array( 'caption' => 'Filemanager', - 'hint' => 'Save message to filemanager', + 'hint' => 'Save to filemanager', 'group' => $group, 'icon' => 'filemanager/navbar', 'onExecute' => 'javaScript:app.mail.mail_save2fm', diff --git a/mail/js/app.js b/mail/js/app.js index cecf5bdaca..3bc7e18a62 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -5132,7 +5132,7 @@ app.classes.mail = AppJS.extend( } else { - et2_dialog.alert('You need to save the message as draft first before to be able to save it into VFS','Save into VFS','info'); + et2_dialog.alert('You need to save the message as draft first before to be able to save it into VFS','Save to filemanager','info'); } }, diff --git a/mail/lang/egw_cs.lang b/mail/lang/egw_cs.lang index 2a0ed34c1e..bce9d13b29 100644 --- a/mail/lang/egw_cs.lang +++ b/mail/lang/egw_cs.lang @@ -159,7 +159,6 @@ save as calendar mail cs Termín uložit do kalendáře save as draft mail cs Uložit jako rozepsané save as infolog mail cs Uložit jako infolog save message to disk mail cs Uložit zprávu na disk -save message to filemanager mail cs Uložení správce souborů EGroupware save to disk mail cs Uložit jako ... select all mail cs Vybrat vše sender mail cs Odesílatel diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index d11227c774..4b393dc1c7 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -408,12 +408,10 @@ save as ticket mail de Als Ticket speichern save as tracker on send mail de Als Ticket speichern save into vfs mail de Im EGroupware Dateimanager speichern save message to disk mail de Nachricht speichern -save message to filemanager mail de Im EGroupware Dateimanager speichern save of message %1 failed. could not save message to folder %2 due to: %3 mail de Das speichern der Nachricht %1 ist fehlgeschlagen. Sie konnte nicht im Ordner %2 abgelegt werden. Grund: %3 save the drafted message as eml file into vfs mail de Speichert diesen Entwurf im EGroupware Dateimanager ab. save to disk mail de Speichern unter save to filemanager mail de Nachricht im Dateimananger speichern -save to vfs mail de Im EGroupware Dateimanager speichern save: mail de Speichern saves subscription changes mail de Änderungen speichern saves this acl mail de Zugriffsrechte speichern @@ -551,6 +549,7 @@ which folders - in general - should not be automatically created, if not existin which method to use when forwarding a message mail de Wählen Sie die Methode zum Weiterleiten von Nachrichten. whole message mail de gesamte Nachricht with message: mail de mit folgender Nachricht: +wizard mail de Assistent writable sharing requires epl version! mail de Beschreibbare Freigaben benötigen die EPL Version! write mail de schreiben wrote mail de schrieb diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 5a5f1c4630..2169f1770a 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -406,14 +406,11 @@ save as infolog mail en Save as Infolog save as infolog on send mail en Save as Infolog on send save as ticket mail en Save as ticket save as tracker on send mail en Save as tracker on send -save into vfs mail en Save into VFS save message to disk mail en Save Message to disk -save message to filemanager mail en Save message to filemanager save of message %1 failed. could not save message to folder %2 due to: %3 mail en Save of message %1 failed. Could not save message to folder %2 due to: %3 save the drafted message as eml file into vfs mail en Save the drafted message as eml file into VFS save to disk mail en Save to disk save to filemanager mail en Save to filemanager -save to vfs mail en Save to VFS save: mail en Save: saves subscription changes mail en Save subscription changes saves this acl mail en Save this ACL @@ -551,6 +548,7 @@ which folders - in general - should not be automatically created, if not existin which method to use when forwarding a message mail en Which method to use when forwarding a message whole message mail en whole message with message: mail en With message: +wizard mail en Wizard writable sharing requires epl version! mail en Writable sharing requires EPL version! write mail en write wrote mail en wrote diff --git a/mail/lang/egw_fr.lang b/mail/lang/egw_fr.lang index 019429d2d3..438cc4866d 100644 --- a/mail/lang/egw_fr.lang +++ b/mail/lang/egw_fr.lang @@ -304,12 +304,9 @@ save as infolog mail fr Enregistrer comme Infolog save as infolog on send mail fr Enregistrer comme Infolog après l'envoi save as ticket mail fr Enregistrer comme ticket save as tracker on send mail fr Enregistrer comme traqueur après l'envoi -save into vfs mail fr Enregistrer dans le VFS save message to disk mail fr Enregistrer message sur le disque -save message to filemanager mail fr Enregistrer le message dans le gestionnaire de fichier save to disk mail fr Enregistrer sur le disque save to filemanager mail fr Enregistrer dans le gestionnaire de fichier -save to vfs mail fr Enregistrer dans le VFS save: mail fr Enregistrer : select all mail fr Tout sélectionner select file to attach to message mail fr Sélectionner le fichier à joindre au message diff --git a/mail/lang/egw_it.lang b/mail/lang/egw_it.lang index 3967282875..7d88d4d549 100644 --- a/mail/lang/egw_it.lang +++ b/mail/lang/egw_it.lang @@ -402,14 +402,12 @@ save as infolog mail it Salva come scheda attività save as infolog on send mail it Salva come scheda attività all'invio save as ticket mail it Salva come ticket save as tracker on send mail it Salva come ticket all'invio -save into vfs mail it Salva in VFS save message to disk mail it Salva messaggio sul disco save message to filemanager mail it Salva il messaggio in Filemanager save of message %1 failed. could not save message to folder %2 due to: %3 mail it Salvataggio del messaggio %1 non riuscito. Non sono riuscito a salvare nella cartella %2. Causa: %3 save the drafted message as eml file into vfs mail it Salva la bozza come file eml nel VFS save to disk mail it Salva su disco save to filemanager mail it Salva in filemanager -save to vfs mail it Salva in VFS save: mail it Salva: saving of message %1 failed. destination folder %2 does not exist. mail it Salvataggio del messaggio %1 non riuscito. La cartella %2 non esiste. saving of message %1 succeeded. check folder %2. mail it Salvataggio del messaggio %1 riuscito. Controlla la cartella %2 diff --git a/mail/lang/egw_nl.lang b/mail/lang/egw_nl.lang index 755cf231c1..030b6ac3c2 100644 --- a/mail/lang/egw_nl.lang +++ b/mail/lang/egw_nl.lang @@ -341,7 +341,6 @@ save as infolog on send mail nl Bewaar als Infolog en verstuur save as ticket mail nl Bewaar als ticket save as tracker on send mail nl Bewaar als tracker en verstuur save message to disk mail nl Bewaar bericht op schijf -save message to filemanager mail nl Bewaar bericht in bestandsbeheer save of message %1 failed. could not save message to folder %2 due to: %3 mail nl Bewaren van bericht %1 is mislukt. Kon het bericht niet opslaan naar map %2 om de volgende reden %3 save to disk mail nl Bewaar op schijf save to filemanager mail nl Bewaar naar bestandeberheer diff --git a/mail/lang/egw_pt.lang b/mail/lang/egw_pt.lang index 60defd635f..75317403bb 100644 --- a/mail/lang/egw_pt.lang +++ b/mail/lang/egw_pt.lang @@ -291,7 +291,6 @@ save as infolog on send mail pt Salvar como Infolog em enviar save as ticket mail pt Salvar como bilhete save as tracker on send mail pt Salvar como rastreador em send save message to disk mail pt Salve Mensagem para o disco -save message to filemanager mail pt Salvar mensagem ao gerenciador de arquivos save to disk mail pt Salvar em disco save to filemanager mail pt Guardar no gerenciador de arquivos save: mail pt Economiza: diff --git a/mail/lang/egw_sk.lang b/mail/lang/egw_sk.lang index 321dca8d7a..58914d0ee1 100644 --- a/mail/lang/egw_sk.lang +++ b/mail/lang/egw_sk.lang @@ -398,14 +398,11 @@ save as infolog mail sk Uložiť ako položku Záznamníka save as infolog on send mail sk Pri odoslaní uložiť ako položku Záznamníka save as ticket mail sk Uložiť ako položku Sledovača save as tracker on send mail sk Pri odoslaní uložiť ako položku Sledovača -save into vfs mail sk Uložiť na VFS save message to disk mail sk Uložiť správu na disk -save message to filemanager mail sk Uložiť správu do Správcu súborov save of message %1 failed. could not save message to folder %2 due to: %3 mail sk Uloženie správy %1 zlyhalo. Nepodarilo sa uložiť správu do priečinka %2 z dôvodu: %3 save the drafted message as eml file into vfs mail sk Uložiť návrh správy na VFS ako súbor typu EML save to disk mail sk Uložiť na disk save to filemanager mail sk Uložiť do Správcu súborov -save to vfs mail sk Uložiť na VFS save: mail sk Uložiť: saving of message %1 failed. destination folder %2 does not exist. mail sk Ukladanie správy %1 zlyhalo. Cieľový priečinok %2 neexistuje. saving of message %1 succeeded. check folder %2. mail sk Ukladanie správy %1 sa podarilo. Pozrite priečinok %2. diff --git a/resources/lang/egw_de.lang b/resources/lang/egw_de.lang index d7e4e1b326..8425da530c 100644 --- a/resources/lang/egw_de.lang +++ b/resources/lang/egw_de.lang @@ -113,6 +113,7 @@ resource resources de Ressource resource %1 deleted! resources de Ressource %1 wurde gelöscht! resource %1 faild to be deleted! resources de Ressource %1 konnte nicht gelöscht werden! resource %1 saved! resources de Ressource %1 wurde gespeichert. +resource / accessories resources de Ressource / Zubehör resource id resources de Ressourcen ID resources common de Ressourcen resources and accessories resources de Ressourcen und Zubehör @@ -145,8 +146,7 @@ use general resources icon resources de Generelles Bild benutzen use own picture resources de Eigenes Bild benutzen use the category's icon resources de Bild der Kategorie benutzen useable resources de Nutzbar -useable: resources de Nutzbar: -view accessories for this resource resources de Zeige das Zubehör der Ressource an +view accessories resources de Zeige Zubehör view calendar resources de Kalender anzeigen view this entry resources de Diesen Eintrag anschauen web-page of resource resources de Ausführliche Beschreibung der Ressource diff --git a/resources/lang/egw_en.lang b/resources/lang/egw_en.lang index 1b2df94f63..23f275d86c 100644 --- a/resources/lang/egw_en.lang +++ b/resources/lang/egw_en.lang @@ -113,6 +113,7 @@ resource resources en Resource resource %1 deleted! resources en Resource %1 deleted! resource %1 faild to be deleted! resources en Resource %1 faild to be deleted! resource %1 saved! resources en Resource %1 saved! +resource / accessories resources en Resource / Accessories resource id resources en Resource ID resources common en Resources resources and accessories resources en Resources and Accessories @@ -145,8 +146,8 @@ use general resources icon resources en Use general resources icon use own picture resources en Use own picture use the category's icon resources en Use the category icon useable resources en Useable -useable: resources en Useable: -view accessories for this resource resources en View accessories +useable resources en Useable +view accessories resources en View accessories view calendar resources en View calendar view this entry resources en View entry web-page of resource resources en Web page of resource diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet index 4f8e55a210..974f226cca 100644 --- a/resources/templates/default/edit.xet +++ b/resources/templates/default/edit.xet @@ -152,7 +152,7 @@ - +