diff options
author | Aleksander Machniak <machniak@kolabsys.com> | 2019-09-10 07:28:59 +0000 |
---|---|---|
committer | Aleksander Machniak <machniak@kolabsys.com> | 2019-09-10 07:28:59 +0000 |
commit | bb489840e6e5ead923c9d9e420bd85252862a57f (patch) | |
tree | 9c1cf3834746d89df57cf0e591b0252dd65b09ca | |
parent | 7bce222bcb25bd5bc1da02e78d07e4fe71ce883a (diff) | |
parent | 8c7518c9f30608415146245bb5cfdec5fb95913f (diff) | |
download | webadmin-bb489840e6e5ead923c9d9e420bd85252862a57f.tar.gz |
Merge branch 'master' of ssh://git.kolab.org/diffusion/WAP/webadmin
-rw-r--r-- | lib/client/kolab_client_task_settings.php | 2 | ||||
-rw-r--r-- | lib/locale/bg_BG.php | 2 | ||||
-rw-r--r-- | lib/locale/cs_CZ.php | 2 | ||||
-rw-r--r-- | lib/locale/de_CH.php | 2 | ||||
-rw-r--r-- | lib/locale/de_DE.php | 2 | ||||
-rw-r--r-- | lib/locale/en_US.php | 8 | ||||
-rw-r--r-- | lib/locale/es_ES.php | 2 | ||||
-rw-r--r-- | lib/locale/et_EE.php | 2 | ||||
-rw-r--r-- | lib/locale/fi_FI.php | 2 | ||||
-rw-r--r-- | lib/locale/fr_FR.php | 2 | ||||
-rw-r--r-- | lib/locale/it_IT.php | 2 | ||||
-rw-r--r-- | lib/locale/ja_JP.php | 2 | ||||
-rw-r--r-- | lib/locale/nl_NL.php | 2 | ||||
-rw-r--r-- | lib/locale/pl_PL.php | 2 | ||||
-rw-r--r-- | lib/locale/pt_BR.php | 2 | ||||
-rw-r--r-- | lib/locale/ru_RU.php | 2 | ||||
-rw-r--r-- | public_html/skins/default/style.css | 1 | ||||
-rw-r--r-- | public_html/skins/default/templates/about_kolab.html | 2 | ||||
-rw-r--r-- | public_html/skins/default/templates/about_kolabsys.html | 4 | ||||
-rw-r--r-- | public_html/skins/default/templates/about_technology.html | 3 |
20 files changed, 22 insertions, 26 deletions
diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php index 961b457..af544be 100644 --- a/lib/client/kolab_client_task_settings.php +++ b/lib/client/kolab_client_task_settings.php @@ -162,7 +162,7 @@ class kolab_client_task_settings extends kolab_client_task $user_task = new kolab_client_task_user($this->output); $user_task->action_info(); - $this->output->set_object('content', $this->output->get_object('taskcontent')); + $this->output->set_object('content', '<div id="taskcontent">' . $this->output->get_object('taskcontent') . '</div>'); } /** diff --git a/lib/locale/bg_BG.php b/lib/locale/bg_BG.php index 4c92021..c09f06d 100644 --- a/lib/locale/bg_BG.php +++ b/lib/locale/bg_BG.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/cs_CZ.php b/lib/locale/cs_CZ.php index 26206c7..9bebe64 100644 --- a/lib/locale/cs_CZ.php +++ b/lib/locale/cs_CZ.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/de_CH.php b/lib/locale/de_CH.php index 5750530..1a597e4 100644 --- a/lib/locale/de_CH.php +++ b/lib/locale/de_CH.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/de_DE.php b/lib/locale/de_DE.php index bfc8934..1f077a9 100644 --- a/lib/locale/de_DE.php +++ b/lib/locale/de_DE.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professionelle Unterstützung ist erhältlich bei <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technologie'; -$LANG['about.warranty'] = 'Sie kommt mit <b>keinen Garantien</b> und wird normalerweise ohne professionelle Unterstützung eingesetzt. Hilfe und weitere Informationen finden Sie auf der <a href="http://kolab.org">Web-Seite</a> und im <a href="http://wiki.kolab.org">Wiki</a>.'; +$LANG['about.warranty'] = 'Sie kommt mit <b>keinen Garantien</b> und wird normalerweise ohne professionelle Unterstützung eingesetzt. Hilfe und weitere Informationen finden Sie auf der <a href="http://kolab.org">Web-Seite</a>.'; $LANG['aci.new'] = 'Neu...'; $LANG['aci.edit'] = 'Bearbeiten...'; diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php index d67c413..4340cf1 100644 --- a/lib/locale/en_US.php +++ b/lib/locale/en_US.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; @@ -226,7 +226,7 @@ $LANG['ou.delete.confirm'] = 'Are you sure, you want to delete this organization $LANG['ou.delete.success'] = 'Unit deleted successfully.'; $LANG['ou.description'] = 'Unit Description'; $LANG['ou.edit.success'] = 'Unit updated successfully.'; -$LANG['ou.list'] = 'Organizational Unit List'; +$LANG['ou.list'] = 'Organizational Units List'; $LANG['ou.norecords'] = 'No organizational unit records found!'; $LANG['ou.system'] = 'Details'; $LANG['ou.type_id'] = 'Unit Type'; @@ -244,7 +244,7 @@ $LANG['resource.edit.success'] = 'Resource updated successfully.'; $LANG['resource.kolabtargetfolder'] = 'Target Folder'; $LANG['resource.kolabinvitationpolicy'] = 'Invitation Policy'; $LANG['resource.kolabdescattribute'] = 'Attributes'; -$LANG['resource.list'] = 'Resource (Collection) List'; +$LANG['resource.list'] = 'Resources (Collections) List'; $LANG['resource.mail'] = 'Mail Address'; $LANG['resource.member'] = 'Collection Members'; $LANG['resource.norecords'] = 'No resource records found!'; @@ -263,7 +263,7 @@ $LANG['role.delete.confirm'] = 'Are you sure, you want to delete this role?'; $LANG['role.delete.success'] = 'Role deleted successfully.'; $LANG['role.description'] = 'Role Description'; $LANG['role.edit.success'] = 'Role updated successfully.'; -$LANG['role.list'] = 'Role List'; +$LANG['role.list'] = 'Roles List'; $LANG['role.norecords'] = 'No role records found!'; $LANG['role.system'] = 'Details'; $LANG['role.type_id'] = 'Role Type'; diff --git a/lib/locale/es_ES.php b/lib/locale/es_ES.php index c37c800..91f6caa 100644 --- a/lib/locale/es_ES.php +++ b/lib/locale/es_ES.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Tecnología'; -$LANG['about.warranty'] = 'Viene absolutamente <b>sin ninguna garantia</b> y normalmente se ejecuta sin ningun tipo de soporte. Puedes obetner ayuda y más información en el <a href="http://kolab.org">sitio web</a> de la comunidad y en el <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'Viene absolutamente <b>sin ninguna garantia</b> y normalmente se ejecuta sin ningun tipo de soporte. Puedes obetner ayuda y más información en el <a href="http://kolab.org">sitio web</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/et_EE.php b/lib/locale/et_EE.php index 4e5d9d1..b63e580 100644 --- a/lib/locale/et_EE.php +++ b/lib/locale/et_EE.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Tehnoloogia'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/fi_FI.php b/lib/locale/fi_FI.php index d9b9b58..7a9ee4e 100644 --- a/lib/locale/fi_FI.php +++ b/lib/locale/fi_FI.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Kaupallista tukea tarjoaa <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'Se ei sisällä <b>minkäänlaista takuuta</b>, ja tuki on yleensä hoidettava itse. Apua ja ohjeita on saatavilla yhteisön <a href="http://kolab.org">verkkosivustolta</a> sekä <a href="http://wiki.kolab.org">wikistä</a>.'; +$LANG['about.warranty'] = 'Se ei sisällä <b>minkäänlaista takuuta</b>, ja tuki on yleensä hoidettava itse. Apua ja ohjeita on saatavilla yhteisön <a href="http://kolab.org">verkkosivustolta</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/fr_FR.php b/lib/locale/fr_FR.php index f77312c..e66aa80 100644 --- a/lib/locale/fr_FR.php +++ b/lib/locale/fr_FR.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Un support professionnel est disponible au près de <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technologie'; -$LANG['about.warranty'] = 'Il est livré <b>sans aucune garantie</b> et généralement exécuté sous votre responsabilité. Vous pouvez trouver de l\'aide et des informations sur <a href="http://kolab.org">le site web communautaire</a> et sur <a href="http://wiki.kolab.org">le wiki</a>.'; +$LANG['about.warranty'] = 'Il est livré <b>sans aucune garantie</b> et généralement exécuté sous votre responsabilité. Vous pouvez trouver de l\'aide et des informations sur <a href="http://kolab.org">le site web communautaire</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/it_IT.php b/lib/locale/it_IT.php index c807303..ff63519 100644 --- a/lib/locale/it_IT.php +++ b/lib/locale/it_IT.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'È disponibile il supporto professionale di <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/ja_JP.php b/lib/locale/ja_JP.php index f6a3a7c..f52d81f 100644 --- a/lib/locale/ja_JP.php +++ b/lib/locale/ja_JP.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = '有償サポートは<a href="http://kolabsys.com">Kolab Systems</a>にて受付けております。'; $LANG['about.technology'] = 'Technology'; -$LANG['about.warranty'] = '動作保証は全くなく、ユーザの自己責任により実行されます。 <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>にてヘルプやコミュニティの情報を得ることができます。'; +$LANG['about.warranty'] = '動作保証は全くなく、ユーザの自己責任により実行されます。 <a href="http://kolab.org">web site</a>にてヘルプやコミュニティの情報を得ることができます。'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/nl_NL.php b/lib/locale/nl_NL.php index 3bc1d45..6c55b4b 100644 --- a/lib/locale/nl_NL.php +++ b/lib/locale/nl_NL.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Professionele ondersteuning is beschikbaar bij <a href="http://kolabsys.com">Kolab Systems</a>'; $LANG['about.technology'] = 'Technologie'; -$LANG['about.warranty'] = 'Het komt <b>zonder enige garanties</b> en wordt typisch geheel zelf ondersteund. U kunt help & informatie vinden in de community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'Het komt <b>zonder enige garanties</b> en wordt typisch geheel zelf ondersteund. U kunt help & informatie vinden in de community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'nieuw...'; $LANG['aci.edit'] = 'Wijzigen...'; diff --git a/lib/locale/pl_PL.php b/lib/locale/pl_PL.php index 71d5212..59426ac 100644 --- a/lib/locale/pl_PL.php +++ b/lib/locale/pl_PL.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Profesjonalne wsparcie techniczne jest dostępne ze strony <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Technologia'; -$LANG['about.warranty'] = 'Oprogramowanie to dostarczane jest bez <b>żadnych gwarancji</b> ani wsparcia. Pomoc i niezbędne informacje można znaleźć na <a href=http://kolab.org">stronie społeczności</a> oraz <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'Oprogramowanie to dostarczane jest bez <b>żadnych gwarancji</b> ani wsparcia. Pomoc i niezbędne informacje można znaleźć na <a href=http://kolab.org">stronie społeczności</a>.'; $LANG['aci.new'] = 'Nowy...'; $LANG['aci.edit'] = 'Edytuj...'; diff --git a/lib/locale/pt_BR.php b/lib/locale/pt_BR.php index 69c3916..a3b650e 100644 --- a/lib/locale/pt_BR.php +++ b/lib/locale/pt_BR.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Sistemas Kolab'; $LANG['about.support'] = 'Suporte profissional está disponível a partir da <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Tecnologia '; -$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.'; $LANG['aci.new'] = 'New...'; $LANG['aci.edit'] = 'Edit...'; diff --git a/lib/locale/ru_RU.php b/lib/locale/ru_RU.php index d498765..7c5b3a8 100644 --- a/lib/locale/ru_RU.php +++ b/lib/locale/ru_RU.php @@ -5,7 +5,7 @@ $LANG['about.kolab'] = 'Kolab'; $LANG['about.kolabsys'] = 'Kolab Systems'; $LANG['about.support'] = 'Профессиональную поддержку можно получить от <a href="http://kolabsys.com">Kolab Systems</a>.'; $LANG['about.technology'] = 'Технология'; -$LANG['about.warranty'] = 'Она распространяется абсолютно <b>без гарантий</b> и обычно поддерживается силами сообщества. Помощь и информацию можно найти на сайте <a href="http://kolab.org">сообщества</a> и <a href="http://wiki.kolab.org">wiki</a>.'; +$LANG['about.warranty'] = 'Она распространяется абсолютно <b>без гарантий</b> и обычно поддерживается силами сообщества. Помощь и информацию можно найти на сайте <a href="http://kolab.org">сообщества</a>.'; $LANG['aci.new'] = 'Новый...'; $LANG['aci.edit'] = 'Редактировать...'; diff --git a/public_html/skins/default/style.css b/public_html/skins/default/style.css index b64b439..129dae7 100644 --- a/public_html/skins/default/style.css +++ b/public_html/skins/default/style.css @@ -101,6 +101,7 @@ table.list tbody tr td.empty-body { height: 150px; color: #f3a628; text-align: center; + vertical-align: middle; } table.list tbody tr.deleted td { diff --git a/public_html/skins/default/templates/about_kolab.html b/public_html/skins/default/templates/about_kolab.html index 8ddb920..1d9161a 100644 --- a/public_html/skins/default/templates/about_kolab.html +++ b/public_html/skins/default/templates/about_kolab.html @@ -43,9 +43,7 @@ To summarize just some points, Kolab is your solution, if <ul> <li><a href="https://kolab.org">Kolab Community Web Site</a></li> - <li><a href="http://wiki.kolab.org">Kolab Community Wiki</a></li> <li><a href="http://blogs.fsfe.org/greve/?p=431">Article: 'The Kolab Story' by Georg Greve</a></li> - <li><a href="http://files.kolabsys.com/Public/Handouts/">Handouts for the Kolab Groupware Solution by Kolab Systems</a></li> </ul> <h2>Warranties & Professional Support</h2> diff --git a/public_html/skins/default/templates/about_kolabsys.html b/public_html/skins/default/templates/about_kolabsys.html index 3f02c15..8edc6f2 100644 --- a/public_html/skins/default/templates/about_kolabsys.html +++ b/public_html/skins/default/templates/about_kolabsys.html @@ -48,8 +48,6 @@ Kolab Systems is working closely with development partners, such as (in alphabet <b>Thank you for being part of this awesome community!</b> </p> -<p>If <b>you</b> want to join the community, please go to - <a href="https://kolab.org">kolab.org</a> and <a href="http://wiki.kolab.org">wiki.kolab.org</a>. -</p> +<p>If <b>you</b> want to join the community, please go to <a href="https://kolab.org">kolab.org</a>.</p> </div> diff --git a/public_html/skins/default/templates/about_technology.html b/public_html/skins/default/templates/about_technology.html index c168a47..afdaf1b 100644 --- a/public_html/skins/default/templates/about_technology.html +++ b/public_html/skins/default/templates/about_technology.html @@ -56,8 +56,7 @@ of the server, or for native packaging on the various platforms. </p> <p> -If you want to join the community, please visit <a href="http://wiki.kolab.org">http://wiki.kolab.org</a> -and <a href="http://kolab.org">http://kolab.org</a>. +If you want to join the community, please visit <a href="http://kolab.org">http://kolab.org</a>. </p> <h3>History before 2010</h3> |