Skip to content
GitLab
Commit cac96e26 authored by Mortier Benoit's avatar Mortier Benoit
Browse files

Merge branch '1.0.9.1-fixes'

parents 991510a0 60e08b6f
Hide whitespace changes
Inline Side-by-side
.tx/config
View file @ cac96e26
......@@ -177,11 +177,6 @@ file_filter = repository/locale/<lang>/fusiondirectory.po
source_file = repository/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-109.rsyslog]
file_filter = rsyslog/locale/<lang>/fusiondirectory.po
source_file = rsyslog/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-109.samba]
file_filter = samba/locale/<lang>/fusiondirectory.po
source_file = samba/locale/en/fusiondirectory.po
......
addressbook/addons/addressbook/class_addressbook.inc
View file @ cac96e26
......@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2015 FusionDirectory
Copyright (C) 2011-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
......@@ -79,12 +79,6 @@ class addressbook extends plugin
$this->base = $this->config->current['BASE'];
/* Check if there is a special ldap-sub-tree specified, instead of dc=addressbook, */
$aoc = $this->config->search("addressbook", "addressbookBaseDN",array('menu'));
if ($aoc != "") {
$this->abobjectclass = $aoc;
}
/* Get global filter config */
if (!session::is_set("phonefilter")) {
$ui = get_userinfo();
......
addressbook/addons/addressbook/main.inc
View file @ cac96e26
......@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2015 FusionDirectory
Copyright (C) 2011-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
......
addressbook/html/getvcard.php
View file @ cac96e26
......@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2008 GONICUS GmbH
Copyright (C) 2011 FusionDirectory
Copyright (C) 2011-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
......
addressbook/locale/ar/fusiondirectory.po
View file @ cac96e26
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-109\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2015-09-11 22:18+0200\n"
"POT-Creation-Date: 2016-01-02 22:39+0100\n"
"PO-Revision-Date: 2015-05-30 14:12+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ar/)\n"
......@@ -17,102 +17,102 @@ 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"
#: addons/addressbook/class_addressbook.inc:195
#: addons/addressbook/class_addressbook.inc:189
#, php-format
msgid "Dial from %s to %s now?"
msgstr ""
#: addons/addressbook/class_addressbook.inc:198
#: addons/addressbook/class_addressbook.inc:192
msgid "Error"
msgstr "خطأ"
#: addons/addressbook/class_addressbook.inc:198
#: addons/addressbook/class_addressbook.inc:192
msgid ""
"You need to set your personal phone number in order to perform direct dials."
msgstr ""
#: addons/addressbook/class_addressbook.inc:227
#: addons/addressbook/class_addressbook.inc:797
#: addons/addressbook/class_addressbook.inc:221
#: addons/addressbook/class_addressbook.inc:791
msgid "LDAP error"
msgstr ""
#: addons/addressbook/class_addressbook.inc:235
#: addons/addressbook/class_addressbook.inc:343
#: addons/addressbook/class_addressbook.inc:229
#: addons/addressbook/class_addressbook.inc:337
msgid "Permission"
msgstr ""
#: addons/addressbook/class_addressbook.inc:465
#: addons/addressbook/class_addressbook.inc:472
#: addons/addressbook/class_addressbook.inc:476
#: addons/addressbook/class_addressbook.inc:597
#: addons/addressbook/class_addressbook.inc:459
#: addons/addressbook/class_addressbook.inc:466
#: addons/addressbook/class_addressbook.inc:470
#: addons/addressbook/class_addressbook.inc:591
#: addons/addressbook/dial.tpl.c:5
msgid "Dial"
msgstr ""
#: addons/addressbook/class_addressbook.inc:482
#: addons/addressbook/class_addressbook.inc:476
#, php-format
msgid "Save contact for %s as vcard"
msgstr ""
#: addons/addressbook/class_addressbook.inc:488
#: addons/addressbook/class_addressbook.inc:482
#, php-format
msgid "Send mail to %s"
msgstr ""
#: addons/addressbook/class_addressbook.inc:611
#: addons/addressbook/class_addressbook.inc:605
msgid "global addressbook"
msgstr ""
#: addons/addressbook/class_addressbook.inc:614
#: addons/addressbook/class_addressbook.inc:608
msgid "user database"
msgstr ""
#: addons/addressbook/class_addressbook.inc:618
#: addons/addressbook/class_addressbook.inc:612
#, php-format
msgid "Contact stored in '%s'"
msgstr ""
#: addons/addressbook/class_addressbook.inc:620
#: addons/addressbook/class_addressbook.inc:614
msgid "Creating new entry in"
msgstr ""
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:651
msgid "All"
msgstr "الكل"
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:696
#: addons/addressbook/class_addressbook.inc:706
#: addons/addressbook/class_addressbook.inc:733
#: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:690
#: addons/addressbook/class_addressbook.inc:700
#: addons/addressbook/class_addressbook.inc:727
#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
msgid "Name"
msgstr "الإسم"
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:700
#: addons/addressbook/class_addressbook.inc:709
#: addons/addressbook/class_addressbook.inc:730
#: addons/addressbook/class_addressbook.inc:858
#: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:694
#: addons/addressbook/class_addressbook.inc:703
#: addons/addressbook/class_addressbook.inc:724
#: addons/addressbook/class_addressbook.inc:852
msgid "Given name"
msgstr ""
#: addons/addressbook/class_addressbook.inc:658
#: addons/addressbook/class_addressbook.inc:652
msgid "Work phone"
msgstr "هاتف العمل"
#: addons/addressbook/class_addressbook.inc:658
#: addons/addressbook/class_addressbook.inc:652
msgid "Cell phone"
msgstr "الهاتف المحمول"
#: addons/addressbook/class_addressbook.inc:659
#: addons/addressbook/class_addressbook.inc:653
msgid "Home phone"
msgstr "هاتف المنزل"
#: addons/addressbook/class_addressbook.inc:659
#: addons/addressbook/class_addressbook.inc:653
msgid "User ID"
msgstr ""
#: addons/addressbook/class_addressbook.inc:714
#: addons/addressbook/class_addressbook.inc:708
#: addons/addressbook/address_info.tpl.c:20
#: addons/addressbook/address_info.tpl.c:50
#: addons/addressbook/contents.tpl.c:5
......@@ -121,115 +121,115 @@ msgstr ""
msgid "Phone"
msgstr "الهاتف"
#: addons/addressbook/class_addressbook.inc:717
#: addons/addressbook/class_addressbook.inc:711
msgid "Telephone number"
msgstr ""
#: addons/addressbook/class_addressbook.inc:720
#: addons/addressbook/class_addressbook.inc:714
#: addons/addressbook/contents.tpl.c:8
msgid "Fax"
msgstr "الفاكس"
#: addons/addressbook/class_addressbook.inc:723
#: addons/addressbook/class_addressbook.inc:717
#: addons/addressbook/address_info.tpl.c:23
#: addons/addressbook/contents.tpl.c:11
#: addons/addressbook/address_edit.tpl.c:29
msgid "Mobile"
msgstr "الهاتف المحمول"
#: addons/addressbook/class_addressbook.inc:726
#: addons/addressbook/class_addressbook.inc:865
#: addons/addressbook/class_addressbook.inc:720
#: addons/addressbook/class_addressbook.inc:859
#: addons/addressbook/address_info.tpl.c:56
#: addons/addressbook/address_edit.tpl.c:62
msgid "Pager"
msgstr ""
#: addons/addressbook/class_addressbook.inc:738
#: addons/addressbook/class_addressbook.inc:732
#: addons/addressbook/address_info.tpl.c:26
#: addons/addressbook/address_edit.tpl.c:32
msgid "Email"
msgstr ""
#: addons/addressbook/class_addressbook.inc:746
#: addons/addressbook/class_addressbook.inc:740
msgid ""
"Cannot create a unique DN for your entry. Please fill more formular fields."
msgstr ""
#: addons/addressbook/class_addressbook.inc:849
#: addons/addressbook/class_addressbook.inc:854 addons/addressbook/main.inc:43
#: addons/addressbook/class_addressbook.inc:843
#: addons/addressbook/class_addressbook.inc:848 addons/addressbook/main.inc:43
msgid "Addressbook"
msgstr ""
#: addons/addressbook/class_addressbook.inc:850
#: addons/addressbook/class_addressbook.inc:844
msgid "The addressbook plugin show internal users and external ones"
msgstr ""
#: addons/addressbook/class_addressbook.inc:857
#: addons/addressbook/class_addressbook.inc:851
msgid "Surname"
msgstr ""
#: addons/addressbook/class_addressbook.inc:859
#: addons/addressbook/class_addressbook.inc:853
msgid "Telefon number"
msgstr "رقم الهاتف"
#: addons/addressbook/class_addressbook.inc:860
#: addons/addressbook/class_addressbook.inc:854
msgid "Fax number"
msgstr "رقم الفاكس"
#: addons/addressbook/class_addressbook.inc:861
#: addons/addressbook/class_addressbook.inc:855
msgid "Mobile number"
msgstr "رقم المحمول"
#: addons/addressbook/class_addressbook.inc:862
#: addons/addressbook/class_addressbook.inc:856
msgid "Home phone number"
msgstr "رقم المنزل"
#: addons/addressbook/class_addressbook.inc:863
#: addons/addressbook/class_addressbook.inc:857
msgid "User identification"
msgstr ""
#: addons/addressbook/class_addressbook.inc:864
#: addons/addressbook/class_addressbook.inc:858
msgid "Mail address"
msgstr ""
#: addons/addressbook/class_addressbook.inc:866
#: addons/addressbook/class_addressbook.inc:860
msgid "Organization"
msgstr ""
#: addons/addressbook/class_addressbook.inc:867
#: addons/addressbook/class_addressbook.inc:861
#: addons/addressbook/address_info.tpl.c:35
#: addons/addressbook/address_edit.tpl.c:41
msgid "Department"
msgstr "القسم"
#: addons/addressbook/class_addressbook.inc:868
#: addons/addressbook/class_addressbook.inc:862
msgid "Location"
msgstr ""
#: addons/addressbook/class_addressbook.inc:869
#: addons/addressbook/class_addressbook.inc:870
#: addons/addressbook/class_addressbook.inc:863
#: addons/addressbook/class_addressbook.inc:864
msgid "Postal address"
msgstr ""
#: addons/addressbook/class_addressbook.inc:871
#: addons/addressbook/class_addressbook.inc:865
msgid "State"
msgstr ""
#: addons/addressbook/class_addressbook.inc:872
#: addons/addressbook/class_addressbook.inc:866
#: addons/addressbook/address_info.tpl.c:8
#: addons/addressbook/address_edit.tpl.c:14
msgid "Initials"
msgstr ""
#: addons/addressbook/class_addressbook.inc:873
#: addons/addressbook/class_addressbook.inc:867
msgid "Title"
msgstr ""
#: addons/addressbook/class_addressbook.inc:874
#: addons/addressbook/class_addressbook.inc:868
msgid "Home postal address"
msgstr ""
#: addons/addressbook/class_addressbook.inc:875
#: addons/addressbook/class_addressbook.inc:869
msgid "Common name"
msgstr "الإسم"
......
addressbook/locale/ca/fusiondirectory.po
View file @ cac96e26
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-109\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2015-09-11 22:18+0200\n"
"POT-Creation-Date: 2016-01-02 22:39+0100\n"
"PO-Revision-Date: 2015-05-30 14:02+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ca/)\n"
......@@ -17,102 +17,102 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: addons/addressbook/class_addressbook.inc:195
#: addons/addressbook/class_addressbook.inc:189
#, php-format
msgid "Dial from %s to %s now?"
msgstr ""
#: addons/addressbook/class_addressbook.inc:198
#: addons/addressbook/class_addressbook.inc:192
msgid "Error"
msgstr "Error"
#: addons/addressbook/class_addressbook.inc:198
#: addons/addressbook/class_addressbook.inc:192
msgid ""
"You need to set your personal phone number in order to perform direct dials."
msgstr ""
#: addons/addressbook/class_addressbook.inc:227
#: addons/addressbook/class_addressbook.inc:797
#: addons/addressbook/class_addressbook.inc:221
#: addons/addressbook/class_addressbook.inc:791
msgid "LDAP error"
msgstr "Error d'LDAP"
#: addons/addressbook/class_addressbook.inc:235
#: addons/addressbook/class_addressbook.inc:343
#: addons/addressbook/class_addressbook.inc:229
#: addons/addressbook/class_addressbook.inc:337
msgid "Permission"
msgstr ""
#: addons/addressbook/class_addressbook.inc:465
#: addons/addressbook/class_addressbook.inc:472
#: addons/addressbook/class_addressbook.inc:476
#: addons/addressbook/class_addressbook.inc:597
#: addons/addressbook/class_addressbook.inc:459
#: addons/addressbook/class_addressbook.inc:466
#: addons/addressbook/class_addressbook.inc:470
#: addons/addressbook/class_addressbook.inc:591
#: addons/addressbook/dial.tpl.c:5
msgid "Dial"
msgstr ""
#: addons/addressbook/class_addressbook.inc:482
#: addons/addressbook/class_addressbook.inc:476
#, php-format
msgid "Save contact for %s as vcard"
msgstr ""
#: addons/addressbook/class_addressbook.inc:488
#: addons/addressbook/class_addressbook.inc:482
#, php-format
msgid "Send mail to %s"
msgstr ""
#: addons/addressbook/class_addressbook.inc:611
#: addons/addressbook/class_addressbook.inc:605
msgid "global addressbook"
msgstr ""
#: addons/addressbook/class_addressbook.inc:614
#: addons/addressbook/class_addressbook.inc:608
msgid "user database"
msgstr ""
#: addons/addressbook/class_addressbook.inc:618
#: addons/addressbook/class_addressbook.inc:612
#, php-format
msgid "Contact stored in '%s'"
msgstr ""
#: addons/addressbook/class_addressbook.inc:620
#: addons/addressbook/class_addressbook.inc:614
msgid "Creating new entry in"
msgstr ""
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:651
msgid "All"
msgstr ""
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:696
#: addons/addressbook/class_addressbook.inc:706
#: addons/addressbook/class_addressbook.inc:733
#: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:690
#: addons/addressbook/class_addressbook.inc:700
#: addons/addressbook/class_addressbook.inc:727
#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
msgid "Name"
msgstr "Nom"
#: addons/addressbook/class_addressbook.inc:657
#: addons/addressbook/class_addressbook.inc:700
#: addons/addressbook/class_addressbook.inc:709
#: addons/addressbook/class_addressbook.inc:730
#: addons/addressbook/class_addressbook.inc:858
#: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:694
#: addons/addressbook/class_addressbook.inc:703
#: addons/addressbook/class_addressbook.inc:724
#: addons/addressbook/class_addressbook.inc:852
msgid "Given name"
msgstr ""
#: addons/addressbook/class_addressbook.inc:658
#: addons/addressbook/class_addressbook.inc:652
msgid "Work phone"
msgstr ""
#: addons/addressbook/class_addressbook.inc:658
#: addons/addressbook/class_addressbook.inc:652
msgid "Cell phone"
msgstr ""
#: addons/addressbook/class_addressbook.inc:659
#: addons/addressbook/class_addressbook.inc:653
msgid "Home phone"
msgstr ""
#: addons/addressbook/class_addressbook.inc:659
#: addons/addressbook/class_addressbook.inc:653
msgid "User ID"
msgstr ""
#: addons/addressbook/class_addressbook.inc:714
#: addons/addressbook/class_addressbook.inc:708
#: addons/addressbook/address_info.tpl.c:20
#: addons/addressbook/address_info.tpl.c:50
#: addons/addressbook/contents.tpl.c:5
......@@ -121,115 +121,115 @@ msgstr ""
msgid "Phone"
msgstr "Telèfon"
#: addons/addressbook/class_addressbook.inc:717
#: addons/addressbook/class_addressbook.inc:711
msgid "Telephone number"
msgstr ""
#: addons/addressbook/class_addressbook.inc:720
#: addons/addressbook/class_addressbook.inc:714
#: addons/addressbook/contents.tpl.c:8
msgid "Fax"
msgstr "Fax"
#: addons/addressbook/class_addressbook.inc:723
#: addons/addressbook/class_addressbook.inc:717
#: addons/addressbook/address_info.tpl.c:23
#: addons/addressbook/contents.tpl.c:11
#: addons/addressbook/address_edit.tpl.c:29
msgid "Mobile"
msgstr "Mòbil"
#: addons/addressbook/class_addressbook.inc:726
#: addons/addressbook/class_addressbook.inc:865
#: addons/addressbook/class_addressbook.inc:720
#: addons/addressbook/class_addressbook.inc:859
#: addons/addressbook/address_info.tpl.c:56
#: addons/addressbook/address_edit.tpl.c:62
msgid "Pager"
msgstr "Buscapersones"
#: addons/addressbook/class_addressbook.inc:738
#: addons/addressbook/class_addressbook.inc:732
#: addons/addressbook/address_info.tpl.c:26
#: addons/addressbook/address_edit.tpl.c:32
msgid "Email"
msgstr ""
#: addons/addressbook/class_addressbook.inc:746
#: addons/addressbook/class_addressbook.inc:740
msgid ""
"Cannot create a unique DN for your entry. Please fill more formular fields."
msgstr ""
#: addons/addressbook/class_addressbook.inc:849
#: addons/addressbook/class_addressbook.inc:854 addons/addressbook/main.inc:43
#: addons/addressbook/class_addressbook.inc:843
#: addons/addressbook/class_addressbook.inc:848 addons/addressbook/main.inc:43
msgid "Addressbook"
msgstr "Llibreta d'adreces"
#: addons/addressbook/class_addressbook.inc:850
#: addons/addressbook/class_addressbook.inc:844
msgid "The addressbook plugin show internal users and external ones"
msgstr ""
#: addons/addressbook/class_addressbook.inc:857
#: addons/addressbook/class_addressbook.inc:851
msgid "Surname"
msgstr ""
#: addons/addressbook/class_addressbook.inc:859
#: addons/addressbook/class_addressbook.inc:853
msgid "Telefon number"
msgstr "Número de telèfon"
#: addons/addressbook/class_addressbook.inc:860
#: addons/addressbook/class_addressbook.inc:854
msgid "Fax number"
msgstr "Número de fax"
#: addons/addressbook/class_addressbook.inc:861
#: addons/addressbook/class_addressbook.inc:855
msgid "Mobile number"
msgstr "Número de mòbil"
#: addons/addressbook/class_addressbook.inc:862
#: addons/addressbook/class_addressbook.inc:856
msgid "Home phone number"
msgstr "Número de telèfon personal"
#: addons/addressbook/class_addressbook.inc:863
#: addons/addressbook/class_addressbook.inc:857
msgid "User identification"
msgstr ""
#: addons/addressbook/class_addressbook.inc:864
#: addons/addressbook/class_addressbook.inc:858
msgid "Mail address"
msgstr "Adreça de correu"
#: addons/addressbook/class_addressbook.inc:866
#: addons/addressbook/class_addressbook.inc:860
msgid "Organization"
msgstr "Organització"
#: addons/addressbook/class_addressbook.inc:867
#: addons/addressbook/class_addressbook.inc:861
#: addons/addressbook/address_info.tpl.c:35
#: addons/addressbook/address_edit.tpl.c:41
msgid "Department"
msgstr "Departament"
#: addons/addressbook/class_addressbook.inc:868
#: addons/addressbook/class_addressbook.inc:862
msgid "Location"
msgstr "Localització"
#: addons/addressbook/class_addressbook.inc:869
#: addons/addressbook/class_addressbook.inc:870
#: addons/addressbook/class_addressbook.inc:863
#: addons/addressbook/class_addressbook.inc:864
msgid "Postal address"
msgstr "Adreça postal"
#: addons/addressbook/class_addressbook.inc:871
#: addons/addressbook/class_addressbook.inc:865
msgid "State"
msgstr "Província"
#: addons/addressbook/class_addressbook.inc:872
#: addons/addressbook/class_addressbook.inc:866
#: addons/addressbook/address_info.tpl.c:8
#: addons/addressbook/address_edit.tpl.c:14
msgid "Initials"
msgstr ""
#: addons/addressbook/class_addressbook.inc:873
#: addons/addressbook/class_addressbook.inc:867
msgid "Title"
msgstr ""
#: addons/addressbook/class_addressbook.inc:874
#: addons/addressbook/class_addressbook.inc:868
msgid "Home postal address"
msgstr "Adreça postal personal"
#: addons/addressbook/class_addressbook.inc:875
#: addons/addressbook/class_addressbook.inc:869
msgid "Common name"
msgstr "Nom"
......
addressbook/locale/cs_CZ/fusiondirectory.po
View file @ cac96e26
......@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-109\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2015-09-11 22:18+0200\n"
"PO-Revision-Date: 2015-05-30 14:12+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
</