From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 1 Oct 2015 07:41:32 +0000 (+0200)
Subject: E-Mail-Journal: Kosmetik, Übersetzungsanpassungen
X-Git-Tag: release-3.4.1~685
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=47e66090a3082ad029dd99a19b9c3c8624ab7092;p=kivitendo-erp.git

E-Mail-Journal: Kosmetik, Übersetzungsanpassungen
---

diff --git a/SL/Controller/EmailJournal.pm b/SL/Controller/EmailJournal.pm
index 69a155802..3bfc39b96 100644
--- a/SL/Controller/EmailJournal.pm
+++ b/SL/Controller/EmailJournal.pm
@@ -28,7 +28,7 @@ sub action_list {
   my ($self) = @_;
 
   if ( $::instance_conf->get_email_journal == 0 ) {
-      flash('info',  $::locale->text('In client config the mail saving into the journal is actual disabled.'));
+    flash('info',  $::locale->text('Storing the emails in the journal is currently disabled in the client configuration.'));
   }
   $self->render('email_journal/list',
                 title   => $::locale->text('Email journal'),
diff --git a/locale/de/all b/locale/de/all
index 3e2289a56..d2b46558f 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1365,7 +1365,6 @@ $self->{texts} = {
   'Import profiles'             => 'Import-Profil',
   'Import result'               => 'Import-Ergebnis',
   'Import summary'              => 'Import-Zusammenfassung',
-  'In client config the mail saving into the journal is actual disabled.' => 'Das Speichern von versendeten E-Mails ist derzeit in der Mandantenkonfigurierung abgeschaltet.',
   'In order to do that hit the button "Delete transaction".' => 'Drücken Sie dafür auf den Button "Buchung löschen".',
   'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => 'Um die alte Ordnerstruktur in die neue Struktur zu migrieren, müssen Sie festlegen, welchem Mandanten die bisherige Struktur zugewiesen wird.',
   'In order to use kivitendo you have to create at least a client, a user and a group.' => 'Um kivitendo zu nutzen, müssen Sie mindestens einen Mandanten, einen Benutzer und eine Gruppe anlegen.',
@@ -2361,7 +2360,7 @@ $self->{texts} = {
   'Sellprice significant places' => 'Verkaufspreis: Nachkommastellen',
   'Semicolon'                   => 'Semikolon',
   'Sender'                      => 'AbsenderIn',
-  'Sent emails can be stored with or without attachments in database or general not stored' => 'gesendete E-Mails können mit oder ohne Anhänge in der Datenbank gespeichert werden',
+  'Sent emails can be optionally stored in the database with or without their attachments.' => 'Gesendete E-Mails können optional mit oder ohne ihre Anhänge in der Datenbank gespeichert werden.',
   'Sent on'                     => 'Verschickt am',
   'Sep'                         => 'Sep',
   'Separator'                   => 'Trennzeichen',
@@ -2502,6 +2501,7 @@ $self->{texts} = {
   'Stocked Qty'                 => 'Lagermenge',
   'Stop task server'            => 'Task-Server beenden',
   'Stopping the task server failed. Output:' => 'Das Beenden des Task-Servers schlug fehl.',
+  'Storing the emails in the journal is currently disabled in the client configuration.' => 'Das Speichern von versendeten E-Mails ist derzeit in der Mandantenkonfigurierung abgeschaltet.',
   'Storno'                      => 'Storno',
   'Storno (one letter abbreviation)' => 'S',
   'Storno Invoice'              => 'Stornorechnung',
diff --git a/sql/Pg-upgrade2/defaults_enable_email_journal.sql b/sql/Pg-upgrade2/defaults_enable_email_journal.sql
index 6cff2344b..00b39d54d 100644
--- a/sql/Pg-upgrade2/defaults_enable_email_journal.sql
+++ b/sql/Pg-upgrade2/defaults_enable_email_journal.sql
@@ -1,6 +1,6 @@
 -- @tag: defaults_enable_email_journal
--- @description: Email Journal konfigurierbar machen 
--- @depends: email_journal 
+-- @description: Email Journal konfigurierbar machen
+-- @depends: email_journal
 
 ALTER TABLE defaults ADD COLUMN  email_journal integer DEFAULT 2;
 UPDATE defaults SET email_journal = 2;
diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 744f77cbe..de9a9544c 100644
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -116,7 +116,7 @@
    <td>
      [% L.select_tag('defaults.email_journal', [ [ 0, LxERP.t8('No Journal') ],[ 1, LxERP.t8('Without Attachments') ],[ 2, LxERP.t8('With Attachments') ]  ], default=SELF.defaults.email_journal) %]
    </td>
-   <td>[% 'Sent emails can be stored with or without attachments in database or general not stored' | $T8 %]</td>
+   <td>[% 'Sent emails can be optionally stored in the database with or without their attachments.' | $T8 %]</td>
   </tr>
 
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Requirement Specs") %]</td></tr>