Merge branch '1.0.16-fixes'

89bfe508 · Benoit Mortier · 5b72296b · 25ab4c0f · 89bfe508 · 89bfe508
Commit 89bfe508 authored Nov 13, 2016 by Benoit Mortier
--- a/alias/admin/alias/class_aliasManagement.inc
+++ b/alias/admin/alias/class_aliasManagement.inc
@@ -3,17 +3,17 @@
  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
  Copyright (C) 2010 Antoine Gallavardin
  Copyright (C) 2012-2016 FusionDirectory
- 
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

--- a/alias/admin/alias/class_mailAliasDistribution.inc
+++ b/alias/admin/alias/class_mailAliasDistribution.inc
@@ -43,12 +43,10 @@ class mailAliasDistribution extends simplePlugin
    );
  }

-  // The main function : information about attributes
  static function getAttributesInfo ()
  {
    global $config;
    return array(
-      // Attributes are grouped by section
      'main' => array(
        'name'  => _('Mail distribution'),
        'attrs' => array(
@@ -76,7 +74,8 @@ class mailAliasDistribution extends simplePlugin
          new DateAttribute(
            _('Expiration date'), _('Date after which the alias should be deleted. Leave empty for no deletion.'),
            'aliasExpirationDate', FALSE,
-            'U', // Unix timestamp
+             // Unix timestamp
+            'U',
            ''
          )
        )

--- a/alias/admin/alias/class_mailAliasRedirection.inc
+++ b/alias/admin/alias/class_mailAliasRedirection.inc
@@ -43,11 +43,9 @@ class mailAliasRedirection extends simplePlugin
    );
  }

-  // The main function : information about attributes
  static function getAttributesInfo ()
  {
    return array(
-      // Attributes are grouped by section
      'main' => array(
        'name'  => _('Mail redirection'),
        'attrs' => array(
@@ -72,7 +70,8 @@ class mailAliasRedirection extends simplePlugin
          new DateAttribute(
            _('Expiration date'), _('Date after which the redirection should be deleted. Leave empty for no deletion.'),
            'aliasExpirationDate', FALSE,
-            'U', // Unix timestamp
+            // Unix timestamp
+            'U',
            ''
          )
        )

--- a/alias/admin/alias/main.inc
+++ b/alias/admin/alias/main.inc
@@ -2,17 +2,17 @@
 /*
  This code is part of FusionDirectory (http://www.fusiondirectory.org)
  Copyright (C) 2013-2016 FusionDirectory
- 
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "الإسم"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "الوصف"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""

 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "الإسم"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "الوصف"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:33
-msgid "Aliases"
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
@@ -17,62 +17,24 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Nom"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr ""
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
 msgstr ""

-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
 msgstr ""

 #: admin/alias/class_mailAliasRedirection.inc:31
@@ -85,10 +47,20 @@ msgstr ""
 msgid "Mail redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Nom"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
@@ -109,40 +81,68 @@ msgstr ""
 msgid "Destination of this redirection"
 msgstr ""

+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr ""
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:33
-msgid "Aliases"
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:34
-msgid "Alias management"
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
 msgstr ""

-#: admin/alias/class_aliasManagement.inc:38
-msgid "Mail aliases"
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:29
-msgid "FusionDirectory alias plugin configuration"
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:42
-msgid "Alias"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:45
-msgid "Alias RDN"
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
 msgstr ""

-#: config/alias/class_aliasConfig.inc:45
-msgid "Branch in which aliases will be stored"
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
 msgstr ""
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-27 18:15+0200\n"
+"POT-Creation-Date: 2016-11-02 23:08+0100\n"
 "PO-Revision-Date: 2016-01-22 16:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
@@ -17,63 +17,25 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

-#: admin/alias/class_mailAliasDistribution.inc:31
-#: admin/alias/class_mailAliasDistribution.inc:32
-#: admin/alias/class_mailAliasDistribution.inc:35
-msgid "Temporary mail distribution"
-msgstr "Dočasná distribuce e-mailů"
-
-#: admin/alias/class_mailAliasDistribution.inc:53
-msgid "Mail distribution"
-msgstr "Distribuce e-mailů"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-#: admin/alias/class_mailAliasRedirection.inc:55
-msgid "Name"
-msgstr "Název"
-
-#: admin/alias/class_mailAliasDistribution.inc:56
-msgid "Name to identify this alias"
-msgstr "Název identifikující tento alternativní název"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-#: admin/alias/class_mailAliasRedirection.inc:57
-msgid "Description"
-msgstr "Popis"
-
-#: admin/alias/class_mailAliasDistribution.inc:58
-msgid "Description of this alias"
-msgstr "Popis tohoto alternativního názvu"
-
-#: admin/alias/class_mailAliasDistribution.inc:62
-msgid "Email address"
-msgstr "E-mailová adresa"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Email aliases"
-msgstr "Alternativní e-mailové adresy"
-
-#: admin/alias/class_mailAliasDistribution.inc:67
-msgid "Aliases for this email address"
-msgstr "Alternativa této e-mailové adresy"
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr "Nastavení alternativního názvu"

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server"
-msgstr "E-mailový server"
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr "Nastavení zásuvného modulu alias pro FusionDirecotry"

-#: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server for this alias"
-msgstr "Poštovní server pro tento alternativní název"
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr "alternativní název (alias)"

-#: admin/alias/class_mailAliasDistribution.inc:77
-#: admin/alias/class_mailAliasRedirection.inc:73
-msgid "Expiration date"
-msgstr "Datum skončení platnosti"
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr "Relativní rozlišený název alternativního názvu"

-#: admin/alias/class_mailAliasDistribution.inc:77
-msgid ""
-"Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Datum po kterém by měl být alternativní název automaticky smazán. Pro nemazání ponechte nevyplněné."
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr "Větev, ve které budou ukládány alternativní názvy"

 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -85,10 +47,20 @@ msgstr "Dočasné přesměrování e-mailů"
 msgid "Mail redirection"
 msgstr "Přesměrování e-mailu"

+#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name"
+msgstr "Název"
+
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Název identifikující toto přesměrování"

+#: admin/alias/class_mailAliasRedirection.inc:57
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description"
+msgstr "Popis"
+
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Popis tohoto přesměrování"
@@ -109,12 +81,60 @@ msgstr "Přesměrovat na"
 msgid "Destination of this redirection"
 msgstr "Cíl tohoto přesměrování"

+#: admin/alias/class_mailAliasRedirection.inc:73
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid "Expiration date"
+msgstr "Datum skončení platnosti"
+
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
 msgstr "Datum, po kterém by mělo být toto přesměrování samočinně smazáno. Pro nemazání ponechte prázdné."

+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr "Dočasná distribuce e-mailů"
+
+#: admin/alias/class_mailAliasDistribution.inc:53
+msgid "Mail distribution"
+msgstr "Distribuce e-mailů"
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Name to identify this alias"
+msgstr "Název identifikující tento alternativní název"
+
+#: admin/alias/class_mailAliasDistribution.inc:58
+msgid "Description of this alias"
+msgstr "Popis tohoto alternativního názvu"
+
+#: admin/alias/class_mailAliasDistribution.inc:62
+msgid "Email address"
+msgstr "E-mailová adresa"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Email aliases"
+msgstr "Alternativní e-mailové adresy"
+
+#: admin/alias/class_mailAliasDistribution.inc:67
+msgid "Aliases for this email address"
+msgstr "Alternativa této e-mailové adresy"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr "E-mailový server"
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server for this alias"
+msgstr "Poštovní server pro tento alternativní název"
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr "Datum po kterém by měl být alternativní název automaticky smazán. Pro nemazání ponechte nevyplněné."
+
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
 msgstr "Alternativní názvy"
@@ -126,23 +146,3 @@ msgstr "Správa alternativních názvů (alias)"
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
 msgstr "Alternativní názvy e-mailu"
-
-#: config/alias/class_aliasConfig.inc:28
-msgid "Alias configuration"
-msgstr "Nastavení alternativního názvu"
-
-#: config/alias/class_aliasConfig.inc:29