Commit 8f781fdc authored by bmortier's avatar bmortier

Merge branch '1.0.9'

Signed-off-by: bmortier's avatarBenoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	asterisk/admin/systems/asterisk/phonesettings.tpl
	asterisk/config/asterisk/class_asteriskPluginConfig.inc
	asterisk/locale/ar/fusiondirectory.po
	asterisk/locale/ca/fusiondirectory.po
	asterisk/locale/cs_CZ/fusiondirectory.po
	asterisk/locale/de/fusiondirectory.po
	asterisk/locale/en/fusiondirectory.po
	asterisk/locale/es/fusiondirectory.po
	asterisk/locale/es_VE/fusiondirectory.po
	asterisk/locale/fa_IR/fusiondirectory.po
	asterisk/locale/fr/fusiondirectory.po
	asterisk/locale/id/fusiondirectory.po
	asterisk/locale/it/fusiondirectory.po
	asterisk/locale/lv/fusiondirectory.po
	asterisk/locale/nb/fusiondirectory.po
	asterisk/locale/nl/fusiondirectory.po
	asterisk/locale/pl/fusiondirectory.po
	asterisk/locale/pt/fusiondirectory.po
	asterisk/locale/pt_BR/fusiondirectory.po
	asterisk/locale/ru/fusiondirectory.po
	asterisk/locale/ru@petr1708/fusiondirectory.po
	asterisk/locale/sv/fusiondirectory.po
	asterisk/locale/ug/fusiondirectory.po
	asterisk/locale/vi_VN/fusiondirectory.po
	asterisk/locale/zh/fusiondirectory.po
	fax/config/fax/class_faxConfig.inc
	fax/locale/ar/fusiondirectory.po
	fax/locale/ca/fusiondirectory.po
	fax/locale/cs_CZ/fusiondirectory.po
	fax/locale/de/fusiondirectory.po
	fax/locale/en/fusiondirectory.po
	fax/locale/es/fusiondirectory.po
	fax/locale/es_VE/fusiondirectory.po
	fax/locale/fa_IR/fusiondirectory.po
	fax/locale/fr/fusiondirectory.po
	fax/locale/id/fusiondirectory.po
	fax/locale/it/fusiondirectory.po
	fax/locale/lv/fusiondirectory.po
	fax/locale/nb/fusiondirectory.po
	fax/locale/nl/fusiondirectory.po
	fax/locale/pl/fusiondirectory.po
	fax/locale/pt/fusiondirectory.po
	fax/locale/pt_BR/fusiondirectory.po
	fax/locale/ru/fusiondirectory.po
	fax/locale/ru@petr1708/fusiondirectory.po
	fax/locale/sv/fusiondirectory.po
	fax/locale/ug/fusiondirectory.po
	fax/locale/vi_VN/fusiondirectory.po
	fax/locale/zh/fusiondirectory.po
	kolab/locale/ar/fusiondirectory.po
	kolab/locale/ca/fusiondirectory.po
	kolab/locale/cs_CZ/fusiondirectory.po
	kolab/locale/de/fusiondirectory.po
	kolab/locale/en/fusiondirectory.po
	kolab/locale/es/fusiondirectory.po
	kolab/locale/es_VE/fusiondirectory.po
	kolab/locale/fa_IR/fusiondirectory.po
	kolab/locale/fr/fusiondirectory.po
	kolab/locale/id/fusiondirectory.po
	kolab/locale/it/fusiondirectory.po
	kolab/locale/lv/fusiondirectory.po
	kolab/locale/nb/fusiondirectory.po
	kolab/locale/nl/fusiondirectory.po
	kolab/locale/pl/fusiondirectory.po
	kolab/locale/pt/fusiondirectory.po
	kolab/locale/pt_BR/fusiondirectory.po
	kolab/locale/ru/fusiondirectory.po
	kolab/locale/ru@petr1708/fusiondirectory.po
	kolab/locale/sv/fusiondirectory.po
	kolab/locale/ug/fusiondirectory.po
	kolab/locale/vi_VN/fusiondirectory.po
	kolab/locale/zh/fusiondirectory.po
	openstack-compute/locale/ar/fusiondirectory.po
	openstack-compute/locale/ca/fusiondirectory.po
	openstack-compute/locale/cs_CZ/fusiondirectory.po
	openstack-compute/locale/de/fusiondirectory.po
	openstack-compute/locale/en/fusiondirectory.po
	openstack-compute/locale/es/fusiondirectory.po
	openstack-compute/locale/es_VE/fusiondirectory.po
	openstack-compute/locale/fa_IR/fusiondirectory.po
	openstack-compute/locale/fr/fusiondirectory.po
	openstack-compute/locale/id/fusiondirectory.po
	openstack-compute/locale/it/fusiondirectory.po
	openstack-compute/locale/lv/fusiondirectory.po
	openstack-compute/locale/nb/fusiondirectory.po
	openstack-compute/locale/nl/fusiondirectory.po
	openstack-compute/locale/pl/fusiondirectory.po
	openstack-compute/locale/pt/fusiondirectory.po
	openstack-compute/locale/pt_BR/fusiondirectory.po
	openstack-compute/locale/ru/fusiondirectory.po
	openstack-compute/locale/ru@petr1708/fusiondirectory.po
	openstack-compute/locale/sv/fusiondirectory.po
	openstack-compute/locale/ug/fusiondirectory.po
	openstack-compute/locale/vi_VN/fusiondirectory.po
	openstack-compute/locale/zh/fusiondirectory.po
	uw-imap/locale/ar/fusiondirectory.po
	uw-imap/locale/ca/fusiondirectory.po
	uw-imap/locale/cs_CZ/fusiondirectory.po
	uw-imap/locale/de/fusiondirectory.po
	uw-imap/locale/en/fusiondirectory.po
	uw-imap/locale/es/fusiondirectory.po
	uw-imap/locale/es_VE/fusiondirectory.po
	uw-imap/locale/fa_IR/fusiondirectory.po
	uw-imap/locale/fr/fusiondirectory.po
	uw-imap/locale/id/fusiondirectory.po
	uw-imap/locale/it/fusiondirectory.po
	uw-imap/locale/lv/fusiondirectory.po
	uw-imap/locale/nb/fusiondirectory.po
	uw-imap/locale/nl/fusiondirectory.po
	uw-imap/locale/pl/fusiondirectory.po
	uw-imap/locale/pt/fusiondirectory.po
	uw-imap/locale/pt_BR/fusiondirectory.po
	uw-imap/locale/ru/fusiondirectory.po
	uw-imap/locale/ru@petr1708/fusiondirectory.po
	uw-imap/locale/sv/fusiondirectory.po
	uw-imap/locale/ug/fusiondirectory.po
	uw-imap/locale/vi_VN/fusiondirectory.po
	uw-imap/locale/zh/fusiondirectory.po
parents b5ee4506 972dbd38

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -2,247 +2,232 @@
host = https://www.transifex.com
type = PO
[FusionDirectory-108.addressbook]
[FusionDirectory-109.addressbook]
file_filter = addressbook/locale/<lang>/fusiondirectory.po
source_file = addressbook/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.alias]
[FusionDirectory-109.alias]
file_filter = alias/locale/<lang>/fusiondirectory.po
source_file = alias/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.apache2]
[FusionDirectory-109.apache2]
file_filter = apache2/locale/<lang>/fusiondirectory.po
source_file = apache2/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.applications]
[FusionDirectory-109.applications]
file_filter = applications/locale/<lang>/fusiondirectory.po
source_file = applications/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.argonaut]
[FusionDirectory-109.argonaut]
file_filter = argonaut/locale/<lang>/fusiondirectory.po
source_file = argonaut/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.asterisk]
file_filter = asterisk/locale/<lang>/fusiondirectory.po
source_file = asterisk/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.autofs]
[FusionDirectory-109.autofs]
file_filter = autofs/locale/<lang>/fusiondirectory.po
source_file = autofs/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.certificates]
[FusionDirectory-109.certificates]
file_filter = certificates/locale/<lang>/fusiondirectory.po
source_file = certificates/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.cyrus]
[FusionDirectory-109.cyrus]
file_filter = cyrus/locale/<lang>/fusiondirectory.po
source_file = cyrus/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.debconf]
[FusionDirectory-109.debconf]
file_filter = debconf/locale/<lang>/fusiondirectory.po
source_file = debconf/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.developers]
[FusionDirectory-109.developers]
file_filter = developers/locale/<lang>/fusiondirectory.po
source_file = developers/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.dhcp]
[FusionDirectory-109.dhcp]
file_filter = dhcp/locale/<lang>/fusiondirectory.po
source_file = dhcp/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.dns]
[FusionDirectory-109.dns]
file_filter = dns/locale/<lang>/fusiondirectory.po
source_file = dns/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.dovecot]
[FusionDirectory-109.dovecot]
file_filter = dovecot/locale/<lang>/fusiondirectory.po
source_file = dovecot/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.dsa]
[FusionDirectory-109.dsa]
file_filter = dsa/locale/<lang>/fusiondirectory.po
source_file = dsa/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ejbca]
[FusionDirectory-109.ejbca]
file_filter = ejbca/locale/<lang>/fusiondirectory.po
source_file = ejbca/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.fai]
[FusionDirectory-109.fai]
file_filter = fai/locale/<lang>/fusiondirectory.po
source_file = fai/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.fax]
file_filter = fax/locale/<lang>/fusiondirectory.po
source_file = fax/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.freeradius]
[FusionDirectory-109.freeradius]
file_filter = freeradius/locale/<lang>/fusiondirectory.po
source_file = freeradius/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.fusioninventory]
[FusionDirectory-109.fusioninventory]
file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
source_file = fusioninventory/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.game]
[FusionDirectory-109.game]
file_filter = game/locale/<lang>/fusiondirectory.po
source_file = game/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.gpg]
[FusionDirectory-109.gpg]
file_filter = gpg/locale/<lang>/fusiondirectory.po
source_file = gpg/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ipmi]
[FusionDirectory-109.ipmi]
file_filter = ipmi/locale/<lang>/fusiondirectory.po
source_file = ipmi/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.kolab]
file_filter = kolab/locale/<lang>/fusiondirectory.po
source_file = kolab/locale/en/fusiondirectory.po
[FusionDirectory-109.kolab2]
file_filter = kolab2/locale/<lang>/fusiondirectory.po
source_file = kolab2/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ldapdump]
[FusionDirectory-109.ldapdump]
file_filter = ldapdump/locale/<lang>/fusiondirectory.po
source_file = ldapdump/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ldapmanager]
[FusionDirectory-109.ldapmanager]
file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
source_file = ldapmanager/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.mail]
[FusionDirectory-109.mail]
file_filter = mail/locale/<lang>/fusiondirectory.po
source_file = mail/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.nagios]
[FusionDirectory-109.mixedgroups]
file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
source_file = mixedgroups/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-109.nagios]
file_filter = nagios/locale/<lang>/fusiondirectory.po
source_file = nagios/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.netgroups]
[FusionDirectory-109.netgroups]
file_filter = netgroups/locale/<lang>/fusiondirectory.po
source_file = netgroups/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.openstack-compute]
file_filter = openstack-compute/locale/<lang>/fusiondirectory.po
source_file = openstack-compute/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.opsi]
[FusionDirectory-109.opsi]
file_filter = opsi/locale/<lang>/fusiondirectory.po
source_file = opsi/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.personal]
[FusionDirectory-109.personal]
file_filter = personal/locale/<lang>/fusiondirectory.po
source_file = personal/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ppolicy]
[FusionDirectory-109.ppolicy]
file_filter = ppolicy/locale/<lang>/fusiondirectory.po
source_file = ppolicy/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.puppet]
[FusionDirectory-109.puppet]
file_filter = puppet/locale/<lang>/fusiondirectory.po
source_file = puppet/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.pureftpd]
[FusionDirectory-109.pureftpd]
file_filter = pureftpd/locale/<lang>/fusiondirectory.po
source_file = pureftpd/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.quota]
[FusionDirectory-109.quota]
file_filter = quota/locale/<lang>/fusiondirectory.po
source_file = quota/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.repository]
[FusionDirectory-109.repository]
file_filter = repository/locale/<lang>/fusiondirectory.po
source_file = repository/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.rsyslog]
[FusionDirectory-109.rsyslog]
file_filter = rsyslog/locale/<lang>/fusiondirectory.po
source_file = rsyslog/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.samba]
[FusionDirectory-109.samba]
file_filter = samba/locale/<lang>/fusiondirectory.po
source_file = samba/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.sogo]
[FusionDirectory-109.sogo]
file_filter = sogo/locale/<lang>/fusiondirectory.po
source_file = sogo/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.squid]
[FusionDirectory-109.squid]
file_filter = squid/locale/<lang>/fusiondirectory.po
source_file = squid/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-108.ssh]