fix Debian autopkgtest / CI: prevent caching of phpunit results, like we do for "make test"

Assuming we're always dealing with a Principal isn't correct.

.gitignore

@@ -19,6 +19,7 @@ docs/website/api
 htdocs/api
 htdocs/jq
 htdocs/test.php
+htdocs/testfiles
 inc/test-RRULE-v2.php
 perms-perf.base
 random_crap

.gitlab-ci.yml

@@ -2,6 +2,8 @@ stages:
   - build
   - test
   - testall
+  - testldap
+  - testldapmemcache
 
 build:
   stage: build
@@ -9,7 +11,7 @@ build:
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli
+    - apt-get -y install build-essential curl devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli phpunit rst2pdf
     - mv debian/changelog debian/changelog.old
     - >
       cat
@@ -22,6 +24,8 @@ build:
       debian/changelog.old
       >debian/changelog
     - rm debian/changelog.old
+    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
+    - mv awl-master /usr/share/awl/
     - debuild -us -uc -b -d
     - 'mv ../davical_*_all.deb ./davical.deb'
   artifacts:
@@ -41,47 +45,10 @@ test:
     when:
       always
   script:
-    - apt-get -y update
+    - testing/gitlab_ci_script.sh
-    - bash -c 'mkdir -p /usr/share/man/man{0..10}'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule" ./run_regressions.sh all x'
-    - apt-get -y install locales
-    - echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen
-    - locale-gen
-    - echo "LANG=en_NZ.UTF-8" > /etc/default/locale
-    - apt-get -y install libdbd-pg-perl libyaml-perl php php-cli php-pgsql php-xml postgresql-client postgresql libapache2-mod-php curl xmlstarlet
-    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
-    - mv awl-master /usr/share/awl/
-    - chown -R www-data /usr/share/awl/
-    - dpkg --ignore-depends=libawl-php -i *.deb
-    - echo '127.0.1.1  regression mycaldav myempty' >> /etc/hosts
-    - rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/000-default.conf && touch /etc/apache2/ports.conf
-    - cp testing/apache-site.conf.example /etc/apache2/sites-enabled/davical-regression.conf
-    - sed -i 's/\/path\/to/\/usr\/share/g' /etc/apache2/sites-enabled/davical-regression.conf
-    - mkdir /usr/share/davical/testing/
-    - cp testing/*.php /usr/share/davical/testing/
-    - rm /etc/davical/config.php
-    - cat testing/regression-conf.php.example | sed 's.//$c->dbg.$c->dbg.' > /etc/davical/regression-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/mycaldav-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/myempty-conf.php
-    - mkdir -p /var/log/davical
-    - chown www-data /var/log/davical
-    - sed -i '/peer/d' /etc/postgresql/15/main/pg_hba.conf
-    - echo 'local  all  all  trust' >> /etc/postgresql/15/main/pg_hba.conf
-    - pg_ctlcluster 15 main start
-    - su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
-    - su postgres -c 'createuser davical_app --superuser'
-    - su postgres -c 'createuser testrunner --superuser'
-    - pg_ctlcluster 15 main restart
-    - a2enmod rewrite
-    - a2enmod headers
-    - apache2ctl start
-    - useradd testrunner
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
   after_script:
-    - mkdir -p apache2_log
+    - testing/gitlab_ci_after_script.sh build
-    - cp -r /var/log/apache2 apache2_log/build
-    - xz apache2_log/build/*
-    - mkdir -p davical_log
-    - cp -r /var/log/davical davical_log/build
 
 
 test_bullseye_carddavclientinterop:
@@ -101,54 +68,12 @@ test_bullseye_carddavclientinterop:
     when:
       always
   script:
-    - apt-get -y update
+    - testing/gitlab_ci_script.sh interop
-    - bash -c 'mkdir -p /usr/share/man/man{0..10}'
+    # Needed to create the regression database. Could be replaced by a basic suite.
-    - apt-get -y install locales
+    - cd testing && su testrunner -c 'IS_CI=yes ./run_regressions.sh regression-suite x'
-    - echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen
+    - cd ../carddavclient-master && vendor/bin/phpunit -c tests/Interop/phpunit.xml --no-coverage
-    - locale-gen
-    - echo "LANG=en_NZ.UTF-8" > /etc/default/locale
-    - apt-get -y install libdbd-pg-perl libyaml-perl php php-cli php-pgsql php-xml postgresql-client postgresql libapache2-mod-php curl xmlstarlet composer phpunit
-    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
-    - mv awl-master /usr/share/awl/
-    - chown -R www-data /usr/share/awl/
-    - dpkg --ignore-depends=libawl-php -i *.deb
-    - echo '127.0.1.1  regression mycaldav myempty' >> /etc/hosts
-    - rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/000-default.conf && touch /etc/apache2/ports.conf
-    - cp testing/apache-site.conf.example /etc/apache2/sites-enabled/davical-regression.conf
-    - sed -i 's/\/path\/to/\/usr\/share/g' /etc/apache2/sites-enabled/davical-regression.conf
-    - mkdir /usr/share/davical/testing/
-    - cp testing/*.php /usr/share/davical/testing/
-    - rm /etc/davical/config.php
-    - cat testing/regression-conf.php.example | sed 's.//$c->dbg.$c->dbg.' > /etc/davical/regression-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/mycaldav-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/myempty-conf.php
-    - mkdir -p /var/log/davical
-    - chown www-data /var/log/davical
-    - sed -i '/peer/d' /etc/postgresql/13/main/pg_hba.conf
-    - echo 'local  all  all  trust' >> /etc/postgresql/13/main/pg_hba.conf
-    - pg_ctlcluster 13 main start
-    - su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
-    - su postgres -c 'createuser davical_app --superuser'
-    - su postgres -c 'createuser testrunner --superuser'
-    - pg_ctlcluster 13 main restart
-    - a2enmod rewrite
-    - a2enmod headers
-    - apache2ctl start
-    - useradd testrunner
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
-    - cd ..
-    - curl https://codeload.github.com/mstilkerich/carddavclient/tar.gz/master | tar zxf -
-    - cd carddavclient-master
-    - composer install
-    - echo '<?php declare(strict_types=1); namespace MStilkerich\Tests\CardDavClient\Interop; use MStilkerich\CardDavClient\{Account,AddressbookCollection,Config}; final class AccountData { public const ACCOUNTS = [ "Davical" => [ "username" => "user3", "password" => "user3", "discoveryUri" => "http://regression", "syncAllowExtraChanges" => false, "featureSet" => TestInfrastructureSrv::SRVFEATS_DAVICAL, ], ]; public const ADDRESSBOOKS = [ "Davical_0" => [ "account" => "Davical", "url" => "http://regression/caldav.php/user3/addresses/", "displayname" => "user3 addresses", "description" => null, ], ]; }' > tests/Interop/AccountData.php
-    - mkdir -p testreports/interop
-    - vendor/bin/phpunit -c tests/Interop/phpunit.xml --no-coverage
   after_script:
-    - mkdir -p apache2_log
+    - testing/gitlab_ci_after_script.sh
-    - cp -r /var/log/apache2 apache2_log/test_bullseye_carddavclientinterop
-    - bzip2 apache2_log/test_bullseye_carddavclientinterop/*
-    - mkdir -p davical_log
-    - cp -r /var/log/davical davical_log/test_bullseye_carddavclientinterop
 
 
 build_bullseye_latestphp:
@@ -157,7 +82,7 @@ build_bullseye_latestphp:
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz
+    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz rst2pdf
     - mv debian/changelog debian/changelog.old
     - >
       cat
@@ -170,6 +95,10 @@ build_bullseye_latestphp:
       debian/changelog.old
       >debian/changelog
     - rm debian/changelog.old
+    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
+    - mv awl-master /usr/share/awl/
+    - curl -o /usr/bin/phpunit -L https://phar.phpunit.de/phpunit-9.phar
+    - chmod +x /usr/bin/phpunit
     - debuild --prepend-path=/usr/local/bin -us -uc -b -d
     - 'mv ../davical_*_all.deb ./davical.deb'
   artifacts:
@@ -189,51 +118,10 @@ test_bullseye_latestphp:
     when:
       always
   script:
-    - apt-get -y update
+    - testing/gitlab_ci_script.sh
-    - bash -c 'mkdir -p /usr/share/man/man{0..10}'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule" ./run_regressions.sh all x'
-    - apt-get -y install locales
-    - echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen
-    - locale-gen
-    - echo "LANG=en_NZ.UTF-8" > /etc/default/locale
-    - apt-get -y install libdbd-pg-perl libyaml-perl perl postgresql postgresql-client libpq-dev xmlstarlet
-    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
-    - mv awl-master /usr/share/awl/
-    - chown -R www-data /usr/share/awl/
-    - dpkg --ignore-depends=php,php-pgsql,php-xml,libawl-php,php-cli -i *.deb
-    - docker-php-ext-install -j$(nproc) pgsql
-    - docker-php-ext-install -j$(nproc) pdo_pgsql
-    - docker-php-ext-install -j$(nproc) calendar
-    - echo '127.0.1.1  regression mycaldav myempty' >> /etc/hosts
-    - rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/000-default.conf && touch /etc/apache2/ports.conf
-    - cp testing/apache-site.conf.example /etc/apache2/sites-enabled/davical-regression.conf
-    - sed -i 's/\/path\/to/\/usr\/share/g' /etc/apache2/sites-enabled/davical-regression.conf
-    - mkdir /usr/share/davical/testing/
-    - cp testing/*.php /usr/share/davical/testing/
-    - rm /etc/davical/config.php
-    - cat testing/regression-conf.php.example | sed 's.//$c->dbg.$c->dbg.' > /etc/davical/regression-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/mycaldav-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/myempty-conf.php
-    - mkdir -p /var/log/davical
-    - chown www-data /var/log/davical
-    - sed -i '/peer/d' /etc/postgresql/13/main/pg_hba.conf
-    - echo 'local  all  all  trust' >> /etc/postgresql/13/main/pg_hba.conf
-    - pg_ctlcluster 13 main start
-    - su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
-    - su postgres -c 'createuser davical_app --superuser'
-    - su postgres -c 'createuser testrunner --superuser'
-    - pg_ctlcluster 13 main restart
-    - a2enmod rewrite
-    - a2enmod headers
-    - a2dismod -f deflate
-    - apache2ctl start
-    - useradd testrunner
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
   after_script:
-    - mkdir -p apache2_log
+    - testing/gitlab_ci_after_script.sh
-    - cp -r /var/log/apache2 apache2_log/test_bullseye_latestphp
-    - bzip2 apache2_log/test_bullseye_latestphp/* || true
-    - mkdir -p davical_log
-    - cp -r /var/log/davical davical_log/test_bullseye_latestphp
 
 test_memcache:
   stage: testall
@@ -248,48 +136,45 @@ test_memcache:
     when:
       always
   script:
-    - apt-get -y update
+    - testing/gitlab_ci_script.sh memcache
-    - bash -c 'mkdir -p /usr/share/man/man{0..10}'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule" ./run_regressions.sh all x'
-    - apt-get -y install locales
-    - echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen
-    - locale-gen
-    - echo "LANG=en_NZ.UTF-8" > /etc/default/locale
-    - apt-get -y install libdbd-pg-perl libyaml-perl php php-cli php-pgsql php-xml php-memcached postgresql-client postgresql libapache2-mod-php curl xmlstarlet memcached
-    - phpenmod memcached
-    - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf -
-    - mv awl-master /usr/share/awl/
-    - chown -R www-data /usr/share/awl/
-    - dpkg --ignore-depends=libawl-php -i *.deb
-    - echo '127.0.1.1  regression mycaldav myempty' >> /etc/hosts
-    - rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/000-default.conf && touch /etc/apache2/ports.conf
-    - cp testing/apache-site.conf.example /etc/apache2/sites-enabled/davical-regression.conf
-    - sed -i 's/\/path\/to/\/usr\/share/g' /etc/apache2/sites-enabled/davical-regression.conf
-    - mkdir /usr/share/davical/testing/
-    - cp testing/*.php /usr/share/davical/testing/
-    - rm /etc/davical/config.php
-    - cat testing/regression-conf.php.example | sed 's.//$c->dbg.$c->dbg.' | sed 's.//memcache ..g' > /etc/davical/regression-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/mycaldav-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/myempty-conf.php
-    - mkdir -p /var/log/davical
-    - chown www-data /var/log/davical
-    - sed -i '/peer/d' /etc/postgresql/15/main/pg_hba.conf
-    - echo 'local  all  all  trust' >> /etc/postgresql/15/main/pg_hba.conf
-    - pg_ctlcluster 15 main start
-    - su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
-    - su postgres -c 'createuser davical_app --superuser'
-    - su postgres -c 'createuser testrunner --superuser'
-    - pg_ctlcluster 15 main restart
-    - a2enmod rewrite
-    - a2enmod headers
-    - apache2ctl start
-    - /etc/init.d/memcached start
-    - useradd testrunner
-    # testrunner needs to be able to read /var/log/apache2/regression-error.log for the memcache tests.
-    - adduser testrunner adm
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
   after_script:
-    - mkdir -p apache2_log
+    - testing/gitlab_ci_after_script.sh
-    - cp -r /var/log/apache2 apache2_log/test_memcache
+
-    - xz apache2_log/test_memcache/*
+test_ldap:
-    - mkdir -p davical_log
+  stage: testldap
-    - cp -r /var/log/davical davical_log/test_memcache
+  image: debian:unstable
+  artifacts:
+    paths:
+      - testing/report.xml
+      - apache2_log/*
+      - davical_log/*
+    reports:
+      junit: testing/report.xml
+    when:
+      always
+  script:
+    - testing/gitlab_ci_script.sh ldap
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap" ./run_regressions.sh all x'
+  after_script:
+    - testing/gitlab_ci_after_script.sh
+
+# Only test if the memcache and LDAP tests pass
+test_memcache_and_ldap:
+  stage: testldapmemcache
+  image: debian:unstable
+  artifacts:
+    paths:
+      - testing/report.xml
+      - apache2_log/*
+      - davical_log/*
+      - davical_conf/*
+    reports:
+      junit: testing/report.xml
+    when:
+      always
+  script:
+    - testing/gitlab_ci_script.sh ldap_memcache_auth
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap ldap_memcache" ./run_regressions.sh all x'
+  after_script:
+    - testing/gitlab_ci_after_script.sh

CREDITS

@@ -21,12 +21,15 @@ in many small ways.  These are acknowledged in the changelog
 and version control history:
 
 Aiko Barz <aiko@deepco.de>
+Andreas Haerter <ah@foundata.com>
 Andrew McMillan <debian@mcmillan.net.nz>
 Andrew Ruthven <andrew@etc.gen.nz>
 Antoine <ahuret@skilld.fr>
+Athos Ribeiro <athoscribeiro@gmail.com>
 Aurelien Requiem <aurelien@menfin.net>
 Benoît Bleuzé <benoit.bleuze@gmail.com>
 Bill McGonigle <bill-gitlab.com-20170608@bfccomputing.com>
+Chris S <chris@abacuscc.org>
 Christian Kier <kier@isip.uni-luebeck.de>
 Christoph Anton Mitterer <calestyo@scientia.net>
 CSchulz <christian@schulz.re>
@@ -39,6 +42,8 @@ Dávid Takács <david.takacs@cafeopen.eu>
 Dirk Bauer <dirk.bauer@iserv.eu>
 Émile Morel <emorel@quarkslab.com>
 Emmanuel Seyman <eseyman@edd.fr>
+eppesuig <giuseppe@sguazz.it>
+Eric Wagner <eric.wagner@htwsaar.de>
 fbiete@gmail.com <fbiete@gmail.com>
 Felix Möller <mail@felixmoeller.de>
 Florian Schlichting <fsfs@debian.org>
@@ -88,6 +93,8 @@ Rob Ostensen <caveman+davical@caveman.name>
 ruliane <ruliane+github@ruliane.net>
 Sarenet S.A.U Egoitz Aurrekoetxea <egoitz@sarenet.es>
 Scott Balneaves <sbalneav@alburg.net>
+Scott Savarese <root@infra1.scottsavarese.com>
+Stonewall Jackson <stonewall@sacredheartsc.com>
 Till Schäfer <till2.schaefer@tu-dortmund.de>
 Tobias Brox <tobias@redpill-linpro.com>
 Vincent Van Houtte <vvh@synergylaw.be>

ChangeLog

@@ -1,7 +1,114 @@
+2025-01-22 Andrew Ruthven <andrew@etc.gen.nz>
+	* Using a Ticket ID requires public.php
+
+2024-12-13 Andrew Ruthven <andrew@etc.gen.nz>
+        * Fix iPhone's accessing other principal's collections.
+
+2024-04-15 Andrew Ruthven <andrew@etc.gen.nz>
+	* Add caching of user credential success/failure
+
+2024-04-14 Stonewall Jackson <stonewall@sacredheartsc.com>
+	* Add support for fallback to LDAP password even if Kerberos is
+	  active.
+
+2024-04-02 Andrew Ruthven <andrew@etc.gen.nz>
+	* Drop the drivers for authenticating against IMAP as PHP is droppping
+	  the imap module.
+
+2024-03-31 Andrew Ruthven <andrew@etc.gen.nz>
+	* Ensure that we have the timezone for invites received via iSchedule.
+
+2024-03-30 Andrew Ruthven <andrew@etc.gen.nz>
+	* Many more changes for PHP 8.2 support.
+
+2024-03-10 Andrew Ruthven <andrew@etc.gen.nz>
+	* On a fatal error, include the Request ID which is now in the log file
+	  to aid investigations.
+
+2024-03-02 Andrew Ruthven <andrew@etc.gen.nz>
+	* Fix free-busy-query REPORT if start/end is missing, previously the
+	  current timestamp was used for missing values.
+
+2024-03-01 Andrew Ruthven <andrew@etc.gen.nz>
+	* Enforce dates sent to PostgreSQL to be strings, this allows us to
+	  to support dates prior to 1900. We now allow dates from 1 AD to
+	  9999 AD.
+
+2024-02-25 Andrew Ruthven <andrew@etc.gen.nz>
+	* Don't display sections of the principal edit screen that the
+	  viewing user either can't use, or shouldn't be able to see.
+	* Fix any PHP 8.2.0 deprecation errors or warnings.
+
+2024-02-24 Andrew Ruthven <andrew@etc.gen.nz>
+	* Add tests for the web UI. This should allow us to pick up on
+	  issues with newer PHP versions faster.
+	* Unescape URLs passed in as external bindings.
+
+2024-02-27 Stonewall Jackson <stonewall@sacredheartsc.com>
+	* Fix scope=onelevel in LDAP driver.
+	* Update LDAP driver to support SASL binds.
+
+2024-02-17 Andrew Ruthven <andrew@etc.gen.nz>
+	* Set external_refresh by default to 60 minutes.
+	* Fix PROPFIND with Depth 1 if external bind is included.
+
+2024-02-03 Andrew Ruthven <andrew@etc.gen.nz>
+	* Set default filters for LDAP queries.
+	* Various small improvements to LDAP support.
+	* In LDAP config rename mapping_field to user_mapping_field (old
+	  name is still supported).
+	* When doing an LDAP group sync, update existing groups. Previously
+	  we only loaded new groups.
+
+2023-05-25 Eric Wagner <eric.wagner@htwsaar.de>
+	* When fetching group membership from LDAP use the username attr.
+
+2024-03-07 Chris S <chris@abacuscc.org>
+	* Fix conversion to UTC for DST changes
+
+2024-02-04 Andrew Ruthven <andrew@etc.gen.nz>
+	* If curl is missing, complain, loudly.
+
+2024-01-21 Andrew Ruthven <andrew@etc.gen.nz>
+	* Add ROOM as a principal type.
+
+2024-01-20 Andrew Ruthven <andrew@etc.gen.nz>
+	* Add PHP version check to setup.php.
+
+2024-01-16 Andreas Haerter <ah@foundata.com>
+	* Fix typos in example config.
+	* Improve Active Directory example.
+
+2023-10-23 Andrew Ruthven <andrew@etc.gen.nz>
+	* Remove accidental includsion of sis.redsys.es in CSP.
+	* Only apply CSP to the DAViCal htdocs (this allows us to behave
+	  better when sharing a vhost).
+
+2023-07-06 Athos Ribeiro <athoscribeiro@gmail.com>
+	* Add suport for phpunit 10 (dev facing only)
+
+2023-06-21 eppesuig <giuseppe@sguazz.it>
+	* Better check for $_SERVER['PATH_INFO']
+
+2023-04-03 Andrew Ruthven <andrew@etc.gen.nz>
+	* Fix expansion of recurring events for Confidential resources.
+
+2023-04-03 Andrew Ruthven <andrew@etc.gen.nz>
+	* Add a missing space to a SQL statement, PostgreSQL fixed a bug in
+	  2022 which was masking this bug.
+
+2023-04-27 Scott Savarese <root@infra1.scottsavarese.com>
+	* Add support for specifying LDAP connections via URL to handle
+	  LDAPS and redundant LDAP servers
+
+2023-03-23 Florian Schlichting <fsfs@debian.org>
+	* Fix a string concatenation.
+
 2023-03-02 Florian Schlichting <fsfs@debian.org>
 	* release davical 1.1.12
 	* add Debian autopkgtests
-	* Fix phpunit tests ('Attempt to read property "rrule_loop_limit" on null') and add them to 'make test'
+	* Fix phpunit tests ('Attempt to read property "rrule_loop_limit" on
+	  null') and add them to 'make test'
 
 2023-02-05 Andrew Ruthven <andrew@etc.gen.nz>
 	* Fix is-defined and is-not-defined prop-filters

Makefile

@@ -32,7 +32,7 @@ built-locale: po/*.po
 #
 # Insert the current version number into always.php
 #
-htdocs/always.php: inc/always.php.in scripts/build-always.sh VERSION dba/davical.sql
+htdocs/always.php: inc/always.php.in scripts/build-always.sh VERSION
 	scripts/build-always.sh <$< >$@
 
 #
@@ -75,7 +75,7 @@ test:
 		exit 0; \
 	   fi
 	# run phpunit tests
-	phpunit testing/phpunit
+	phpunit --do-not-cache-result testing/phpunit
 
 
 .PHONY: clean

VERSION

@@ -1 +1 @@
-1.1.12
+1.1.13

config/apache-davical.conf

@@ -21,6 +21,11 @@ Alias /davical /usr/share/davical/htdocs
 
   # Some people want this. YMMV.
   #php_admin_value open_basedir /usr/share/awl/inc/:/usr/share/davical/:/etc/davical/
+
+  # All content for our UI should be served locally.
+  <FilesMatch "(admin|help|iSchedule|index|metrics|public|setup|tools|upgrade).php">
+    Header set Content-Security-Policy "default-src 'none'; img-src 'self' data:; media-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' data:; font-src 'self' data:; object-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'self'"
+  </FilesMatch>
 </Directory>
 
 <IfModule mod_rewrite.c>
@@ -49,8 +54,3 @@ Alias /davical /usr/share/davical/htdocs
   # Everything else gets rewritten to /caldav.php/...
   #RewriteRule ^(.*)$ /davical/caldav.php$1  [NC,L]
 </IfModule>
-
-# All content for our UI should be served locally.
-<FilesMatch "(admin|help|iSchedule|index|metrics|public|setup|tools|upgrade).php">
-  Header set Content-Security-Policy "default-src 'none'; img-src 'self' data:; media-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' data:; font-src 'self' data:; object-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self' sis.redsys.es; frame-ancestors 'self'"
-</FilesMatch>

config/example-config.php

@@ -31,9 +31,9 @@ $c->pg_connect[] = "dbname=davical user=davical_app";
 // $c->system_name = "DAViCal CalDAV Server";
 
 /**
-* The CalDAV specification does not define GET on a collection, but typically this is
+* The CalDAV specification does not define GET on a collection, but typically
-* used as a .ics download for the whole collection. This will also enable a download
+* this is used as a .ics download for the whole collection. This will also
-* link in the web interface for calendars with entries.
+* enable a download link in the web interface for calendars with entries.
 *
 * Default: false
 */
@@ -44,9 +44,9 @@ $c->pg_connect[] = "dbname=davical user=davical_app";
 * will be read-only. Any changes to them must be applied via CalDAV.
 *
 * You may want to set this to false during your initial setup to make it
-* easier for people to PUT whole calendars or addressbooks as part of migrating
+* easier for people to PUT whole calendars or addressbooks as part of
-* their data. After this, it is recommended to turn it off so that clients
+* migrating their data. After this, it is recommended to turn it off so that
-* which have been misconfigured are readily identifiable.
+* clients which have been misconfigured are readily identifiable.
 *
 * Default: true
 */
@@ -99,9 +99,10 @@ $c->admin_email = 'calendar-admin@example.com';
 /**
 * Restrict access to the administrative pages to only be available on a
 * particular domain name and port. The default is that any DAViCal instance
-* will have the administrative pages active. When any these settings is enabled,
+* will have the administrative pages active. When any these settings is
-* requests for administrative URLs such as index.php, admin.php, setup.php etc
+* enabled, requests for administrative URLs such as index.php, admin.php,
-* will be redirected to 'caldav.php', unless the restrictions are fulfilled.
+* setup.php etc will be redirected to 'caldav.php', unless the restrictions
+* are fulfilled.
 */
 // $c->restrict_admin_domain = 'admin.davical.example.com';
 // $c->restrict_admin_port   = '8443';
@@ -131,8 +132,8 @@ $c->admin_email = 'calendar-admin@example.com';
 * Allow users to see all accounts on the server in the web interface, or only
 * their account and the accounts they have a relationship with. If set to
 * false, users need the READ privilege to display another principal and their
-* collections, and they need to be in the same group with another principal to
+* collections, and they need to be in the same group with another principal
-* find them in a drop-down list for granting privileges.
+* to find them in a drop-down list for granting privileges.
 *
 * Admins will still be able to see all accounts.
 *
@@ -142,17 +143,20 @@ $c->admin_email = 'calendar-admin@example.com';
 
 /**
 * Provide a way of over-riding the default password change UI to render a
-* clickable link instead. Usually the UI provides a pair of text boxes to enter
+* clickable link instead. Usually the UI provides a pair of text boxes to
-* a new password and confirm password. In some cases where remote authentication
+* enter a new password and confirm password. In some cases where remote
-* is being used, the password change process is managed in a more complex way
+* authentication is being used, the password change process is managed in a
-* and allowing it to be changed locally is not helpful. In this case the UI
+* more complex way and allowing it to be changed locally is not helpful. In
-* is disabled and an HREF displayed to take the user to the appropriate place for
+* this case the UI is disabled and an HREF displayed to take the user to the
-* facilitating that.
+& appropriate place for facilitating that.
 *
-* As well as the Administration UI, this will also affect the Forgotten Password
+* As well as the Administration UI, this will also affect the Forgotten
-* UI since it would create a temporary local password. The login HTML rendered by
+* Password UI since it would create a temporary local password. The login
-* libawl-php is over-ridden and replaced by the same HREF as above.
+* HTML rendered by libawl-php is over-ridden and replaced by the same HREF as
-* Users with Administrator privileges will still see the default password change UI.
+* above.
+*
+* Users with Administrator privileges will still see the default password
+* change UI.
 *
 * Default: unset
 */
@@ -168,10 +172,10 @@ $c->admin_email = 'calendar-admin@example.com';
 ***************************************************************************/
 
 /**
-* Whenever you think you've found an issue with how DAViCal handles a situation,
+* Whenever you think you've found an issue with how DAViCal handles a
-* generating some data on what it's actually doing and whether it can find a
+* situation, generating some data on what it's actually doing and whether it
-* certain event in the database etc. can be essential to allow others (or
+* can find a certain event in the database etc. can be essential to allow
-* yourself) to understand what's going wrong.
+* others (or yourself) to understand what's going wrong.
 *
 * There are many different types of debug messages (for more details see
 * debug-config.php), but this will log them all:
@@ -179,10 +183,10 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->dbg["ALL"] = 1;
 
 /**
-* While the above setting will quickly fill your PHP error log and should best
+* While the above setting will quickly fill your PHP error log and should
-* be restricted to one or two requests, logging just the client interaction
+* best be restricted to one or two requests, logging just the client
-* is almost as useful. This should be the minimum for any support request on
+* interaction is almost as useful. This should be the minimum for any support
-* the mailing list or issue tracker.
+* request on the mailing list or issue tracker.
 */
 // $c->dbg["request"]  = 1;  // The request headers & content
 // $c->dbg['response'] = 1;  // The response headers & content
@@ -229,25 +233,29 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->home_addressbook_name = 'addresses';
 
 /**
-* Sets a numeric value indicating the maximum size in octets (bytes) of a resource
+* Sets a numeric value indicating the maximum size in octets (bytes) of a
-* that the server is willing to accept when an address object resource is stored
+* resource that the server is willing to accept when an address object
-* in an address book collection (e.g. contacts with image attachments).
+* resource is stored in an address book collection (e.g. contacts with image
-* Note that not all clients respect that property and that DAViCal won't deny creating
+* attachments).
-* or updating a resource that is larger than the specified limit if the client willingly or
+* 
-* unwillingly ignores that property. Currently (late 2018) we only know of iOS devices to handle it properly.
+* Note that not all clients respect that property and that DAViCal won't deny
+* creating or updating a resource that is larger than the specified limit if
+* the client willingly or unwillingly ignores that property. Currently (late
+* 2018) we only know of iOS devices to handle it properly.
 *
 * Default: 6550000
 */
 // $c->carddav_max_resource_size = 6550000;
 
 /**
-* If the above options are not suitable for your new users, use this to create
+* If the above options are not suitable for your new users, use this to
-* a more complex default collection management.
+* create a more complex default collection management.
 *
 * Note: if you use this configuration option both $c->home_calendar_name and
 *       $c->home_addressbook_name are ignored!
 *
-* See https://wiki.davical.org/index.php/Configuration/settings/default_collections
+* See:
+* https://wiki.davical.org/index.php/Configuration/settings/default_collections
 */
 // $c->default_collections = array(
 //     array(
@@ -280,10 +288,11 @@ $c->admin_email = 'calendar-admin@example.com';
 /**
 * An array of the privileges which will be configured for a user by default
 * from the possible set of real privileges:
-*   'read', 'write-properties', 'write-content', 'unlock', 'read-acl', 'read-current-user-privilege-set',
+*   'read', 'write-properties', 'write-content', 'unlock', 'read-acl',
-*   'bind', 'unbind', 'write-acl', 'read-free-busy',
+*   'read-current-user-privilege-set', 'bind', 'unbind', 'write-acl',
-*   'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy',
+*   'read-free-busy', 'schedule-deliver-invite', 'schedule-deliver-reply',
-*   'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy'
+*   'schedule-query-freebusy', 'schedule-send-invite', 'schedule-send-reply',
+*   'schedule-send-freebusy'
 *
 * Or also from these aggregated privileges:
 *   'write', 'schedule-deliver', 'schedule-send', 'all'
@@ -333,10 +342,10 @@ $c->admin_email = 'calendar-admin@example.com';
 * Hide bound collections from certain clients
 *
 * If you want to use iOS (which does not support delegation) in combination
-* with other software which does supports degation, you can use this option
+* with other software which do support delegation, you can use this option
 * to tailor a working solution: bind all collections you want to see on iOS
-* (emulation of delegation) and then hide these collections from other clients
+* (emulation of delegation) and then hide these collections from other
-* with real delegation support.
+* clients with real delegation support.
 *
 * Default: false/not set: always show bound collections
 *
@@ -348,26 +357,28 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->hide_bound = array( 'User-Agent'=>'#regex1#', 'X-Client'=>'#regex2#');
 
 /**
-* External subscription (BIND) minimum refresh interval
+* External subscription (BIND) minimum refresh interval (minutes)
 * Required if you want to enable remote binding ( webcal subscriptions )
 *
-* Default: none
+* Default: 60
 */
 // $c->external_refresh = 60;
 
 /**
 * External subscription (BIND) user agent string
-* Required if your remote calendar only delivers to known user agents.
+* You may need to set a specific stirng if your remote calendar only delivers
+* to known user agents.
 *
-* Default: none
+* Default: DAViCal/$version
 */
-// $c->external_ua_string = '';
+// $c->external_ua_string = "DAViCal/" . $c->version_string;
 
 /**
 * If you want to force DAViCal to use HTTP Digest Authentication for CalDAV
-* access. Note that this requires all user passwords to be stored in plain text
+* access. Note that this requires all user passwords to be stored in plain
-* in the database. It is probably better to configure the webserver to do
+* text in the database. It is probably better to configure the webserver to
-* Digest auth against a separate user database (see below for Webserver Auth).
+* do Digest auth against a separate user database (see below for Webserver
+* Auth).
 */
 // $c->http_auth_mode = "Digest";
 
@@ -382,10 +393,10 @@ $c->admin_email = 'calendar-admin@example.com';
 
 /**
 * The "support_obsolete_free_busy_property" value controls whether,
-* during a PROPFIND, the obsolete Scheduling property "calendar-free-busy-set"
+* during a PROPFIND, the obsolete Scheduling property
-* is returned. Set the value to true to support the property only if your
+* "calendar-free-busy-set" is returned. Set the value to true to support the
-* client requires it, however note that PROPFIND performance may be
+* property only if your client requires it, however note that PROPFIND
-* adversely affected if you do so.
+* performance may be adversely affected if you do so.
 *
 * Introduced in DAViCal version 1.1.4 in support of Issue #31 Database
 * Performance Improvements.
@@ -400,14 +411,15 @@ $c->admin_email = 'calendar-admin@example.com';
 * If you are in a non-English locale, you can set the default_locale
 * configuration to one of the supported locales.
 *
-* Supported Locales (at present, see: "select * from supported_locales ;" for a full list)
+* Supported Locales (at present, see: "select * from supported_locales ;" for
+* a full list):
 *
-* "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU"
+*     "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU"
 *
-* If you want locale support you probably know more about configuring it than me, but
+* If you want locale support you probably know more about configuring it than
-* at this stage it should be noted that all translations are UTF-8, and pages are
+* me, but at this stage it should be noted that all translations are UTF-8,
-* served as UTF-8, so you will need to ensure that the UTF-8 versions of these locales
+* and pages are served as UTF-8, so you will need to ensure that the UTF-8
-* are supported on your system.
+* versions of these locales are supported on your system.
 *
 * People interested in providing new translations are directed to the Wiki:
 *   https://wiki.davical.org/w/Translating_DAViCal
@@ -415,9 +427,10 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->default_locale = "en_NZ";
 
 /**
-* This is used to construct URLs which are passed in the answers to the client.  You may
+* This is used to construct URLs which are passed in the answers to the
-* want to force this to a specific domain in responses if your system is accessed by
+* client.  You may want to force this to a specific domain in responses if
-* multiple names, otherwise you probably won't need to change it.
+* your system is accessed by multiple names, otherwise you probably won't
+* need to change it.
 *
 * Default: $_SERVER['SERVER_NAME']
 */
@@ -443,8 +456,8 @@ $c->admin_email = 'calendar-admin@example.com';
 * an attendee of a meeting and then would be able to read the meeting.
 *
 * Without this, the only person who can view/change PRIVATE or CONFIDENTIAL
-* events in a calendar is someone with full administrative rights to the calendar
+* events in a calendar is someone with full administrative rights to the
-* usually the owner.
+* calendar usually the owner.
 *
 * If the only person that devious is your sysadmin then you probably already
 * enabled this option...
@@ -468,7 +481,10 @@ $c->admin_email = 'calendar-admin@example.com';
 * If set to true: never show
 * If set to an array: hide if any header => regex tuple matches
 */
-// $c->disable_caldav_proxy_propfind_collections = array( 'User-Agent'=>'#regex1#', 'X-Client'=>'#regex2#');
+// $c->disable_caldav_proxy_propfind_collections = array(
+//     'User-Agent' => '#regex1#',
+//     'X-Client'   => '#regex2#'
+// );
 
 /**
 * A limiter on how many times we'll apply the recurrence rules for an event
@@ -478,7 +494,8 @@ $c->admin_email = 'calendar-admin@example.com';
 *
 * If you see the following error message, you may want to consider increasing
 * it:
-* RRULE, loop limit has been hit in GetMoreInstances, you probably want to increase $c->rrule_loop_limit
+* RRULE, loop limit has been hit in GetMoreInstances, you probably want to
+* increase $c->rrule_loop_limit
 */
 // $c->rrule_loop_limit = 100;
 
@@ -501,30 +518,29 @@ $c->admin_email = 'calendar-admin@example.com';
 ***************************************************************************/
 
 /**
-* If you want to turn off scheduling functions you can set this to 'false' and
+* If you want to turn off scheduling functions you can set this to 'false'
-* DAViCal will not advertise the ability to schedule, leaving it to calendar
+* and DAViCal will not advertise the ability to schedule, leaving it to
-* clients to send out and receive scheduling requests.
+* calendar clients to send out and receive scheduling requests.
 *
 * Default: true
 */
 // $c->enable_auto_schedule = false;
 
 /**
-* If true, then remote scheduling will be enabled.  There is a possibility 
+* If true, then remote scheduling will be enabled.  There is a possibility
 * of receiving spam events in calendars if enabled, you will at least know
 * what domain the spam came from as domain key signatures are required for
-* events to be accepted.  
+* events to be accepted.
 *
 * You probably need to setup Domain Keys for your domain as well as the
-* appropiate DNS SRV records.
+* appropriate DNS SRV records.
 *
 * for example, if DAViCal is installed on cal.example.com you should have
 * DNS SRV records like this:
 * _ischedules._tcp.example.com. IN SRV 0 1 443 cal.example.com
-*  _ischedule._tcp.example.com. IN SRV 0 1  80 cal.example.com
+* _ischedule._tcp.example.com.  IN SRV 0 1  80 cal.example.com
 *
-* DNS TXT record for signing outbound requests
+* DNS TXT record for signing outbound requests example:
-* example:
 * cal._domainkey.example.com. 86400 IN   TXT     "k=rsa\; t=s\; p=PUBKEY"
 *
 * Default: false
@@ -532,7 +548,7 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->enable_scheduling = true;
 
 /**
-* Domain Key domain to use when signing outbound scheduling requests, this 
+* Domain Key domain to use when signing outbound scheduling requests, this
 * is the domain with the public key in a TXT record as shown above.
 *
 * TODO: enable domain/signing by per user keys, patches welcome.
@@ -551,11 +567,11 @@ $c->admin_email = 'calendar-admin@example.com';
 // $c->scheduling_dkim_selector = 'cal';
 
 /*
-* Domain Key private key 
+* Domain Key private key
 * Required if you want to enable outbound remote server scheduling
 *
 * Default: none
-*/  
+*/
 // $c->schedule_private_key = 'PRIVATE-KEY-BASE-64-DATA';
 
 
@@ -567,17 +583,17 @@ $c->admin_email = 'calendar-admin@example.com';
 
 /**
 * If you install DAViCal behind a reverse proxy (e.g. an SSL offloader or
-* application firewall, or in order to present services from different machines
+* application firewall, or in order to present services from different
-* on a single public IP / hostname), the client IP, protocol and port used may
+* machines on a single public IP / hostname), the client IP, protocol and
-* be different from what the web server is reporting to DAViCal. Often, the
+* port used may be different from what the web server is reporting to
-* original values are written to the X-Real-IP and/or X-Forwarded-For,
+* DAViCal. Often, the original values are written to the X-Real-IP and/or
-* X-Forwarded-Proto and X-Forwarded-Port headers. You can instruct DAViCal to
+* X-Forwarded-For, X-Forwarded-Proto and X-Forwarded-Port headers. You can
-* attempt to "do the right thing" and use the content of these headers instead,
+* instruct DAViCal to attempt to "do the right thing" and use the content of
-* when they are available.
+* these headers instead, when they are available.
 *
-* CAUTION: Malicious clients can spoof these headers. When you enable this, you
+* CAUTION: Malicious clients can spoof these headers. When you enable this,
-* need to make sure your reverse proxy erases any pre-existing values of all
+* you need to make sure your reverse proxy erases any pre-existing values of
-* these headers, and that no untrusted requests can reach DAViCal without
+* all these headers, and that no untrusted requests can reach DAViCal without
 * passing the proxy server.
 *
 * Default: false
@@ -600,6 +616,57 @@ $c->admin_email = 'calendar-admin@example.com';
 // $_SERVER['REMOTE_ADDR'] = $_SERVER['Client-IP'];
 
 
+/***************************************************************************
+*                                                                          *
+*                     Authentication Settings                              *
+*                                                                          *
+***************************************************************************/
+
+/**
+* Cache credentials, requires memcache_servers to be defined.
+*
+* If you enable this, please ensure that your memcached server(s) are
+* suitably protected. While we store the credentials hashed in memcached,
+* you may still be exposing youself, please ensure you understand the risk
+* you may be taking by enabling this feature.
+*
+* We use HMAC-SHA256 and bcrypt using the password set in
+* $c->auth_cache_secret as a pepper and a per user salt that is generated
+* as required and cached for 10 days.
+*
+* Both the hash and the per user salt are stored in memcached. The hash has
+* an expiry set as either $c->auth_cache_pass or $c->auth_cache_fail as
+* appropriate. You must enable either (or both) of these with suitable
+* expiry times (15 minutes?) based on your requirements.
+*
+* Default: false
+*/
+// $c->auth_cache = false;
+
+/**
+* Secret to use for caching passwords (aka pepper). For example, the output
+* of:
+*     pwgen 32
+*
+* Default: unset, which disables caching
+*/
+// $c->auth_cache_secret = NULL;
+
+/**
+* How long to cache credentials where username & password match (seconds).
+*
+* Default: 0 (aka don't cache passwords that match)
+*/
+// $c->auth_cache_pass = 0;
+
+/**
+* How long to cache credentials where username & password don't match
+* (seconds).
+*
+* Default: 0 (aka don't cache passwords that don't match)
+*/
+// $c->auth_cache_fail = 0;
+
 /***************************************************************************
 *                                                                          *
 *                     External Authentication Sources                      *
@@ -607,27 +674,31 @@ $c->admin_email = 'calendar-admin@example.com';
 ***************************************************************************/
 
 /**
-* Allow specifying another way to control access of the user by authenticating
+* Allow specifying another way to control access of the user by
-* him against other drivers such has LDAP (the default is the PgSQL DB)
+* authenticating them against other drivers such as LDAP (the default is the
-* $c->authenticate_hook['call'] should be set to the name of the plugin and must
+* PostgreSQL DB).
-* be a valid function that will be call like this:
+*
+* $c->authenticate_hook['call'] should be set to the name of the plugin and
+* must be a valid function that will be call like this:
 *   call_user_func( $c->authenticate_hook['call'], $username, $password )
 *
 * The login mechanism is used in 2 different places:
-*  - for the web interface in: index.php that calls DAViCalSession.php that extends
+*  - for the web interface in: index.php that calls DAViCalSession.php that
-*    Session.php (from AWL libraries)
+*    extends Session.php (from AWL libraries)
 *  - for the caldav client in: caldav.php that calls HTTPAuthSession.php
 * Both Session.php and HTTPAuthSession.php check against the
-* authenticate_hook['call'], although for HTTPAuthSession.php this will be for
+* authenticate_hook['call'], although for HTTPAuthSession.php this will be
-* each page.  For Session.php this will only occur during login.
+* for each page.  For Session.php this will only occur during login.
+*
+* $c->authenticate_hook['config'] should be set up with any configuration
+* data needed by the authenticate call - see below or in the Wiki for
+* details.
 *
-* $c->authenticate_hook['config'] should be set up with any configuration data
-* needed by the authenticate call - see below or in the Wiki for details.
 * If you want to develop your own authentication plugin, have a look at
 * awl/inc/AuthPlugins.php or any of the inc/drivers_*.php files.
 *
-* $c->authenticate_hook['optional'] = true; can be set to try default authentication
+* $c->authenticate_hook['optional'] = true; can be set to try default
-* as well in case the configured hook should report a failure.
+* authentication as well in case the configured hook should report a failure.
 */
 // $c->authenticate_hook['optional'] = true;
 
@@ -638,7 +709,8 @@ $c->admin_email = 'calendar-admin@example.com';
 //  $c->authenticate_hook = array(
 //      'call'   => 'AuthExternalAwl',
 //      'config' => array(
-//           // A PgSQL database connection string for the database containing user records
+//           // A PgSQL database connection string for the database
+//           // containing user records
 //          'connection' => 'dbname=wrms host=otherhost port=5433 user=general',
 //           // Which columns should be fetched from the database
 //          'columns'    => "user_no, active, email_ok, joined, last_update AS updated, last_used, username, password, fullname, email",
@@ -657,41 +729,86 @@ $c->admin_email = 'calendar-admin@example.com';
 
 // $c->authenticate_hook['call'] = 'LDAP_check';
 // $c->authenticate_hook['config'] = array(
-//     'host' => 'www.tennaxia.net', //host name of your LDAP Server
+//     /* Use URI to set one or more LDAP servers to connect to for
-//     'port' => '389',              //port
+//      * redundancy. Also supports ldaps.
+//      * If no URI string is set, host and port can be used */
+//     'uri'  => 'ldaps://hostname:port ldap://hostname2:port2'
+//     'host' => 'ldap.example.net', // host name of your LDAP Server
+//     'port' => '389',              // port
 
        /* For the initial bind to be anonymous leave bindDN and passDN
-          commented out */
+        * commented out */
-// DN and password if rquired to bind to this server for initial queries
+// DN and password if required to bind to this server for initial queries
-//     'bindDN' => 'cn=manager,cn=internal,dc=tennaxia,dc=net',
+//     'bindDN' => 'cn=calendar-manager,ou=users,dc=example,dc=net',
 //     'passDN' => 'xxxxxxxx',
 
-//     'protocolVersion' => '3', // Version of LDAP protocol to use
+//     /* Perform a SASL bind instead of a simple bind. Uncomment this option
-//     'optReferrals'    => 0,   // whether to automatically follow referrals returned by the LDAP server
+//      * to authenticate to the LDAP server using Kerberos credentials or TLS
-//     'networkTimeout'  => 10,  // timeout in seconds
+//      * certificates.
-//     'baseDNUsers'  => 'dc=tennaxia,dc=net',              // where to look at valid user
+//      * Depending on the SASL mechanism used, you may need to set some of the
-//     'filterUsers'  => 'objectClass=kolabInetOrgPerson',  // filter which must validate a user according to RFC4515, i.e. surrounded by brackets
+//      * sasl_ options below. You may also need to set environment variables
-//     'baseDNGroups' => 'ou=divisions,dc=tennaxia,dc=net', // where to look for groups
+//      * in the PHP process (KRB5CCNAME, LDAPTLS_CERT, LDAPTLS_KEY, etc).
-//     'filterGroups' => 'objectClass=groupOfUniqueNames',  // filter with same rules as filterUsers
+//      */
-       /** /!\ "username" should be set and "modified" must be set **/
+//     'sasl'          => 'yes',
-//     'mapping_field' => array("username" => "uid",
+//     'sasl_mech'     => 'GSSAPI',
-//         "modified" => "modifyTimestamp",
+//     'sasl_realm'    => 'EXAMPLE.COM',
-//         "fullname" => "cn" ,
+//     'sasl_authc_id' => null,
-//         "email"    => "mail"
+//     'sasl_authz_id' => null,
-//     ), // used to create the user based on their ldap properties
+//     'sasl_props'    => null,
-//     'group_mapping_field' => array("username" => "cn",
-//         "modified" => "modifyTimestamp",
-//         "fullname" => "cn" ,
-//         "members"  => "memberUid"
-//     ), // used to create the group based on the ldap properties
-//     'group_member_dnfix' => true,   // if your "members" field contains the full DN and needs to be truncated to just the uid
 
-       /** used to set default value for all users, will be overcharged by ldap if defined also in mapping_field **/
+//     'protocolVersion' => '3', // version of LDAP protocol to use
-//     'default_value' => array("date_format_type" => "E","locale" => "fr_FR"),
+//     'optReferrals'    => 0,   // whether to automatically follow referrals
+//                               // returned by the LDAP server
+//     'networkTimeout'  => 10,  // timeout in seconds
+
+       /* where to look for users */
+//     'baseDNUsers'  => 'ou=users,dc=example,dc=net',
+
+       /* filter which must validate a user according to RFC4515, i.e.
+        * surrounded by brackets. Default is (objectClass=*). You
+        * should check what objectClass is used for your user accounts  */
+//     'filterUsers'  => 'objectClass=Person',
+
+       /* where to look for groups */
+//     'baseDNGroups' => 'ou=divisions,dc=example,dc=net',
+
+       /* filter with same rules as filterUsers, and the same default. You
+        * should check what is used for your groups. */
+//     'filterGroups' => 'objectClass=groupOfNames',
+
+       /* /!\ "username" should be set and "modified" must be set
+        * used to create the user based on their ldap properties */
+//     'user_mapping_field' => array(
+//         "username" => "uid",
+//         "modified" => "modifyTimestamp",
+//         "fullname" => "cn",
+//         "email"    => "mail"
+//     ),
+
+       /* used to create the group based on the ldap properties */
+//     'group_mapping_field' => array(
+//         "name"     => "cn",
+//         "modified" => "modifyTimestamp",
+//         "members"  => "member"
+//     ),
+
+       /** used to set default value for all users, will be overcharged by
+         * ldap if defined also in mapping_field **/
+//     'default_value' => array(
+//         "date_format_type" => "E",
+//         "locale" => "fr_FR"
+//     ),
 
        /** foreach key set start and length in the string provided by ldap
            example for openLDAP timestamp : 20070503162215Z **/
-//     'format_updated' => array('Y' => array(0,4), 'm' => array(4,2), 'd' => array(6,2), 'H' => array(8,2), 'M' => array(10,2), 'S' => array(12,2)),
+//     'format_updated' => array(
+//         'Y' => array(0,4),
+//         'm' => array(4,2),
+//         'd' => array(6,2),
+//         'H' => array(8,2),
+//         'M' => array(10,2),
+//         'S' => array(12,2)
+//     ),
 
 //     'startTLS' => 'yes',  // Require that TLS is used for LDAP?
              // If ldap_start_tls is not working, it is probably
@@ -704,7 +821,8 @@ $c->admin_email = 'calendar-admin@example.com';
 //
 //    );
 //
-// /* If there is some user/group you do not want to sync from LDAP, put their username in these lists */
+// /* If there is some user/group you do not want to sync from LDAP, put
+//  * their username in these lists */
 // $c->do_not_sync_from_ldap = array( 'admin' => true );
 // $c->do_not_sync_group_from_ldap = array( 'teamclient1' => true );
 //
@@ -713,33 +831,72 @@ $c->admin_email = 'calendar-admin@example.com';
 /*
 * Use the following LDAP example if you are using Active Directory
 *
-* You will need to  change host, passDN and DOMAIN in bindDN
+* You will need to change host, passDN and DOMAIN in bindDN
 * and baseDNUsers.
 */
 // $c->authenticate_hook['call'] = 'LDAP_check';
 // $c->authenticate_hook['config'] = array(
 //     'host'              => 'ldap://ldap.example.net',
-//     'bindDN'            => 'auth@DOMAIN',
+//     'port'              => '389', // usually 636 for ldaps
+//     'sasl'              => 'yes',
+//     'sasl_mech'         => 'GSSAPI',
+//     'sasl_realm'        => 'EXAMPLE.COM',
+//     'sasl_authc_id'     => null,
+//     'sasl_authz_id'     => null,
+//     'sasl_props'        => null,
+//     'bindDN'            => 'cn=bind-user,cn=Users,dc=example,dc=net',
 //     'passDN'            => 'secret',
-//     'baseDNUsers'       => 'dc=DOMAIN,dc=local',
+//     'baseDNUsers'       => 'dc=example,dc=net',
 //     'protocolVersion'   => 3,
 //     'optReferrals'      => 0,
 //     'networkTimeout'    => 10,
 //     'filterUsers'       => '(&(objectcategory=person)(objectclass=user)(givenname=*))',
-//     'mapping_field'     => array("username" => "uid",
+//     'mapping_field'     => array(
-//         "fullname" => "cn" ,
+//         "username" => "sAMAccountName",
-//         "email"    => "mail"
+//         "fullname" => "displayName" ,
+//         "email"    => "mail",
+//         "modified" => ""
 //     ),
-//     'default_value'     => array("date_format_type" => "E","locale" => "en_NZ"),
+//     'default_value'     => array(
-//     'format_updated'    => array('Y' => array(0,4), 'm' => array(4,2), 'd' => array(6,2), 'H' => array(8,2), 'M' => array(10,2), 'S' => array(12,2))
+//         "date_format_type" => "E",
+//         "locale" => "en_NZ"
+//     ),
+//     'format_updated'    => array(
+//         'Y' => array(0,4),
+//         'm' => array(4,2),
+//         'd' => array(6,2),
+//         'H' => array(8,2),
+//         'M' => array(10,2),
+//         'S' => array(12,2)
+//     )
 // );
 //
-// /* If there is some user/group you do not want to sync from LDAP, put their username in these lists */
+// /* If there is some user/group you do not want to sync from LDAP, put
+//  * their username in these lists */
 // $c->do_not_sync_from_ldap = array( 'admin' => true );
 // $c->do_not_sync_group_from_ldap = array( 'teamclient1' => true );
 //
 // include('drivers_ldap.php');
 
+// /* Kerberus configuration
+//  *
+//  * You may want your webserver to perform Kerberos SSO, in which case
+//  * REMOTE_USER should be trusted. If that is the case, then set
+//  * 'i_use_mode_kerberos' there are two options, neither are the default:
+//  *
+//  * * 'i_know_what_i_am_doing' means to trust REMOTE_USER, do not try and
+//  *   authenticate to LDAP
+//  * * 'allow_fallback_to_ldap_auth' means to trust REMOTE_USER, but if
+//  *   it isn't present, try and authenticate to LDAP. This allows using
+//  *   Kerberos for SSO, but still allows non-Kerberos supporting clients
+//  *   to still use username/password login.
+//  *
+//  * If either are set, then we still get details from LDAP for the user.
+//  *
+//  * Either include this in the above authenticate_hook config setting,
+//  * or use: */
+//
+//  $c->authenticate_hook['config']['i_use_mode_kerberos'] = '';
 
 /********************************/
 /****** PAM and IMAP hooks ******/
@@ -750,7 +907,10 @@ $c->admin_email = 'calendar-admin@example.com';
 */
 // $c->authenticate_hook = array(
 //     'call'   => 'SQUID_PAM_check',
-//     'config' =>  array( 'script' => '/usr/bin/pam_auth', 'email_base' => 'example.com' )
+//     'config' =>  array(
+//         'script' => '/usr/bin/pam_auth',
+//         'email_base' => 'example.com'
+//     )
 // );
 // include('drivers_squid_pam.php');
 
@@ -759,34 +919,24 @@ $c->admin_email = 'calendar-admin@example.com';
 */
 // $c->authenticate_hook = array(
 //     'call'       => 'PWAUTH_PAM_check',
-//     'config'     => array('path' => '/usr/sbin/pwauth',
+//     'config'     => array(
-//     'email_base' => 'example.com')
+//         'path' => '/usr/sbin/pwauth',
-// );
-// include('drivers_pwauth_pam.php');
-
-/**
-* Authentication against IMAP using the imap_open function.
-*/
-// $c->authenticate_hook =  array(
-//     'call'       => 'IMAP_PAM_check',
-//     'config'     => array( 
-//         'imap_url'   => '{localhost:993/imap/ssl/novalidate-cert}',
 //         'email_base' => 'example.com'
 //     )
 // );
-// include('drivers_imap_pam.php');
+// include('drivers_pwauth_pam.php');
 
 /********************************/
 /****** Webserver does Auth *****/
 /********************************/
 
-/** 
+/**
 * It is quite common that the webserver can do the authentication for you,
-* and you just want DAViCal to trust the username that the webserver will pass
+* and you just want DAViCal to trust the username that the webserver will
-* through (in the REMOTE_USER or REDIRECT_REMOTE_USER environment variable).
+* pass through (in the REMOTE_USER or REDIRECT_REMOTE_USER environment
-* In that case, set server_auth_type (can be an array) to the value provided by
+* variable). In that case, set server_auth_type (can be an array) to the
-* the webserver in the AUTH_TYPE environment variable, as well as the two
+* value provided by the webserver in the AUTH_TYPE environment variable, as
-* following options as needed.
+* well as the two following options as needed.
 *
 * Note that this method does not pull account details from anywhere, so you
 * will first need to create an account in DAViCal for each username that will
@@ -818,20 +968,25 @@ $c->admin_email = 'calendar-admin@example.com';
 
 /*
 * This enable XMPP PubSub push notifications to clients that request them.
-* N.B. this will publish urls for ALL updates and does NOT restrict
+* N.B. this will publish URLs for ALL updates and does NOT restrict
-* subscription permissions on the jabber server!  That means anyone with
+* subscription permissions on the Jabber server!  That means anyone with
 * read access to the pubsub tree of your jabber server can watch for updates,
-* they will only see URL's to the updated entries not the calendar data.
+* they will only see URLs to the updated entries not the calendar data.
 *
 * Only tested with ejabberd 2.0.x
 */
 
 // $c->notifications_server = array(
-//     'host' => $_SERVER['SERVER_NAME'],      // jabber server hostname
+//     /* jabber server hostname */
-//     'jid'  => 'user@example.com',           // user(JID) to login/ publish as
+//     'host' => $_SERVER['SERVER_NAME'],
-//     'password' => '',                       // password for above account
+//     /* user(JID) to login/ publish as */
-//     // 'debug_jid' => 'otheruser@example.com'  // send a copy of all publishes to this jid
+//     'jid'  => 'user@example.com',
+//     /* password for above account */
+//     'password' => '',
+//     /* send a copy of all publishes to this jid */
+//     // 'debug_jid' => 'otheruser@example.com'
 // );
+//
 // include ( 'pubsub.php' );
 
 
@@ -850,11 +1005,21 @@ $c->admin_email = 'calendar-admin@example.com';
 * Note that there is currently no way of enabling metrics via memcache
 * without memcache being enabled for all of DAViCal.
 */
-// $c->metrics_style = 'counters';                // Just the simple counter-based metrics
+
-// $c->metrics_style = 'memcache';                // Only the metrics using memcache
+/* Just the simple counter-based metrics */
-// $c->metrics_style = 'both';                    // Both styles of metrics
+// $c->metrics_style = 'counters';
-// $c->metrics_collectors   = array('127.0.0.1'); // Restrict access to only this IP address
+
-// $c->metrics_require_user = 'metricsuser';      // Restrict access to only connections authenticating as this user
+/* Only the metrics using memcache */
+// $c->metrics_style = 'memcache';
+
+/* Both styles of metrics */
+// $c->metrics_style = 'both';
+
+/* Restrict access to only this IP address */
+// $c->metrics_collectors   = array('127.0.0.1');
+
+/* Restrict access to only connections authenticating as this user */
+// $c->metrics_require_user = 'metricsuser';
 
 /***************************************************************************
 *                                                                          *
@@ -863,8 +1028,8 @@ $c->admin_email = 'calendar-admin@example.com';
 ***************************************************************************/
 /* To enable audit logging to syslog you can uncomment the following line.
 *
-* This file is suitable for basic auditing, if you want/need more comprehensive
+* This file is suitable for basic auditing, if you want/need more
-* logging then see:
+* comprehensive logging then see:
 *   http://wiki.davical.org/index.php/Configuration/hooks/log_caldav_action
 */
 // include('log_caldav_action.php');

dba/create-database.sh

@@ -132,7 +132,7 @@ psql -qXAt ${PSQLOPTS} ${DBA} -f "${AWLDIR}/dba/schema-management.sql" "${DBNAME
 psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/davical.sql" "${DBNAME}" 2>&1
 
 #
-# Set permissions for the application DB user on the database
+# Set permissions for the application DB user on the database.
 if ! ${DBADIR}/update-davical-database ${DBAOPTS} --dbuser "${AWL_DBAUSER}" --dbname "${DBNAME}" --appuser "${AWL_APPUSER}" --nopatch --owner "${AWL_DBAUSER}" ; then
         cat <<EOFAILURE
 * * * * ERROR * * * *
@@ -152,6 +152,13 @@ fi
 # Load the required base data
 psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/base-data.sql" "${DBNAME}" | grep -E -v '^10'
 
+
+# Apply any patches.
+if ! ${DBADIR}/update-davical-database ${DBAOPTS} --dbuser "${AWL_DBAUSER}" --dbname "${DBNAME}" --appuser "${AWL_APPUSER}" --owner "${AWL_DBAUSER}" ; then
+    echo "Failed to patch database"
+    exit 1;
+fi
+
 #
 # We can override the admin password generation for regression testing predictability
 if [ "${ADMINPW}" = "" ] ; then

dba/patches/1.3.6.sql

@@ -0,0 +1,42 @@
+-- Add CalDAV labels to principal types to remove hardcoded ID -> Label
+-- mappings in code.
+--
+-- List is from: https://tools.ietf.org/html/rfc5545#section-3.2.3
+
+BEGIN;
+SELECT check_db_revision(1,3,5);
+
+INSERT INTO roles ( role_no, role_name ) VALUES( 5, 'Room');
+
+ALTER TABLE principal_type ADD COLUMN label VARCHAR;
+
+-- Add labels
+UPDATE principal_type
+  SET label = 'INDIVIDUAL'
+  WHERE principal_type_id = 1;
+
+UPDATE principal_type
+  SET label = 'RESOURCE'
+  WHERE principal_type_id = 2;
+
+UPDATE principal_type
+  SET label = 'GROUP'
+  WHERE principal_type_id = 3;
+
+-- Add suport for the ROOM principal type.
+-- Having hardcoded IDs pains me. A lot.
+INSERT INTO principal_type
+  (principal_type_id, principal_type_desc, label)
+VALUES (4, 'Room', 'ROOM');
+
+-- Ensure that the sequence is primed, on my instance the sequence had
+-- last_value as 0.
+SELECT setval('principal_type_principal_type_id_seq',
+    (SELECT max(principal_type_id) FROM principal_type)
+  );
+
+-- http://blogs.transparent.com/polish/names-of-the-months-and-their-meaning/
+SELECT new_db_revision(1,3,6, 'Czerwiec');
+
+COMMIT;
+ROLLBACK;

dba/views/dav_principal.sql

@@ -1,4 +1,4 @@
--- Define an updateable view for dav_principal which conbines the AWL usr
+-- Define an updateable view for dav_principal which combines the AWL usr
 -- record 1:1 with the principal table
 
 

debian/changelog

@@ -1,3 +1,57 @@
+davical (1.1.13-2) unstable; urgency=medium
+
+  * fix Debian autopkgtest / CI: prevent caching of phpunit results, like we
+    do already for "make test"
+
+ -- Florian Schlichting <fsfs@debian.org>  Wed, 27 May 2026 23:10:28 +0200
+
+davical (1.1.13-1) unstable; urgency=medium
+
+  [ Andrew Ruthven ]
+  * New upstream release (Closes: #1040996, #1054143)
+
+  [ Florian Schlichting ]
+  * Acknowledge NMUs by David Prévot - thank you! (closes: #1121419)
+  * Depend on AWL 0.65
+  * Update copyright years
+  * Drop redundant "Priority: optional" and "Rules-Requires-Root: no" fields
+    in debian/control
+  * Update Doxyfile using "doxygen -u"
+  * Add graphviz to Build-Depends, our doxygen config needs "dot"
+  * Update debian/watch to version 5 (Gitlab template)
+  * Declare compliance with Debian Policy 4.7.4
+
+ -- Florian Schlichting <fsfs@debian.org>  Mon, 11 May 2026 23:00:17 +0200
+
+davical (1.1.12-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * No change upload for the reproducible effort
+
+ -- David Prévot <taffit@debian.org>  Wed, 26 Nov 2025 08:37:04 +0100
+
+davical (1.1.12-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Update latest patch to PHPUnit 12 syntax (Closes: #1099659)
+
+ -- David Prévot <taffit@debian.org>  Thu, 25 Sep 2025 08:27:38 +0200
+
+davical (1.1.12-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add support for PHPUnit 10 (Closes: #1039746)
+
+ -- David Prévot <taffit@debian.org>  Tue, 14 Jan 2025 13:45:14 +0100
+
+davical (1.1.12-2) unstable; urgency=medium
+
+  * Cherry-pick two bug fixes from upstream:
+    + use "." to concatenate strings, not "+" (gitlab #288)
+    + Add a missing space to a SQL statement to fix adding groups (gitlab #294)
+
+ -- Florian Schlichting <fsfs@debian.org>  Mon, 01 May 2023 00:29:20 +0200
+
 davical (1.1.12-1) unstable; urgency=medium
 
   [ Debian Janitor ]

debian/control

@@ -1,27 +1,26 @@
 Source: davical
 Section: web
-Priority: optional
 Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net>
 Uploaders: Andrew McMillan <awm@debian.org>,
  Florian Schlichting <fsfs@debian.org>
-Standards-Version: 4.6.2
+Standards-Version: 4.7.4
 Build-Depends: debhelper-compat (= 13),
  dh-exec,
  jdupes,
- libawl-php (>= 0.64-1~), libawl-php (<< 0.65),
+ libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
  gettext,
  doxygen,
+ graphviz,
  php-cli | php5-cli,
  phpunit
 Vcs-Git: https://gitlab.com/davical-project/davical.git
 Vcs-Browser: https://gitlab.com/davical-project/davical
 Homepage: https://www.davical.org/
-Rules-Requires-Root: no
 
 Package: davical
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},
- libawl-php (>= 0.64-1~), libawl-php (<< 0.65),
+ libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
  libdbd-pg-perl,
  libyaml-perl,
  php | php5,

debian/copyright

@@ -7,7 +7,7 @@ Files: *
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2023, Davical contributors (see CREDITS for details)
+ 2007 - 2026, Davical contributors (see CREDITS for details)
 License: GPL-2+
 
 Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
@@ -18,7 +18,7 @@ Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2023, Davical contributors (see CREDITS for details)
+ 2007 - 2026, Davical contributors (see CREDITS for details)
 License: GPL-2
 
 Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
@@ -28,14 +28,14 @@ Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2023, Davical contributors (see CREDITS for details)
+ 2007 - 2026, Davical contributors (see CREDITS for details)
 License: GPL-3+
 
 Files: inc/caldav-client-v2.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2023, Davical contributors (see CREDITS for details)
+ 2007 - 2026, Davical contributors (see CREDITS for details)
 License: LGPL-3+
 
 Files: inc/check_UTF8.php
@@ -93,7 +93,7 @@ License: 3-clause-bsd
 
 Files: debian/*
 Copyright: 2006-2012, Andrew McMillan <awm@debian.org>
- 2014-2023, Florian Schlichting <fsfs@debian.org>
+ 2014-2026, Florian Schlichting <fsfs@debian.org>
 License: GPL-2+
 
 License: GPL-2+

debian/tests/phpunit

@@ -4,5 +4,5 @@
 set -e
 
 # 2) phpunit tests
-phpunit --include-path "/usr/share/davical:/usr/share/awl" testing/phpunit
+phpunit --include-path "/usr/share/davical:/usr/share/awl" --do-not-cache-result testing/phpunit
 

debian/watch

@@ -1,2 +1,5 @@
-version=4
+Version: 5
-https://gitlab.com/davical-project/davical/tags?sort=updated_desc \/davical-project\/davical\/-\/archive\/r([\d.]+)\/davical-r[\d.]+\.tar\.gz
+
+Template: GitLab
+Dist: https://gitlab.com/davical-project/davical
+Matching-Pattern: r(\d[\-+\.:\~\da-zA-Z]*)

htdocs/always.php

@@ -141,6 +141,8 @@ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
 $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
 $c->default_privileges = array('read-free-busy', 'schedule-deliver');
 $c->list_everyone = true;
+$c->external_refresh = 60;
+$c->scheduling_dkim_domain = false;
 
 $c->enable_auto_schedule = true;
 
@@ -159,13 +161,24 @@ $c->template_usr = array( 'active' => true,
 $c->hide_TODO = true;                      // VTODO only visible to collection owner
 $c->readonly_webdav_collections = true;    // WebDAV access is readonly
 
+// Authentication caching details
+$c->auth_cache = false;                    // Default to off
+$c->auth_cache_pass = 0;                   // Default to off
+$c->auth_cache_fail = 0;                   // Default to off
+
 // Kind of private configuration values
 $c->total_query_time = 0;
 
-// Any many times GetMoreInstances in inc/RRule.php should loop trying to
+// How many times GetMoreInstances in inc/RRule.php should loop trying to
 // find more instances.
 $c->rrule_loop_limit = 100;
 
+// Kind of private configuration values
+$c->total_query_time = 0;
+
+// Are we in test mode?
+$c->test_mode = false;
+
 $c->dbg = array();
 
 
@@ -279,7 +292,7 @@ if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) {
 else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
   // Only log this if more than a little debugging of some sort is turned on, somewhere
   @dbg_error_log( 'LOG', '==========> method =%s= =%s= =%s= =%s= =%s=',
-         $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '$_SERVER[PATH_INFO] undefined'), $c->base_url, $c->base_directory );
+         $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, (isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] !== '' ? $_SERVER['PATH_INFO'] : '$_SERVER[PATH_INFO] undefined'), $c->base_url, $c->base_directory );
 }
 
 /**
@@ -297,8 +310,8 @@ if ( function_exists('awl_set_locale') ) {
 *
 */
 $c->code_version = 0;
-$c->want_awl_version = '0.64';
+$c->want_awl_version = '0.65';
-$c->version_string = '1.1.12'; // The actual version # is replaced into that during the build /release process
+$c->version_string = '1.1.13'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
   $c->code_minor = $matches[2];
@@ -308,6 +321,12 @@ if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->v
   @header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
 }
 
+// What is our minimum supported version of PHP?
+$c->minimum_php_version = '5.4.0';
+
+// Default UserAgent string when fetching content from elsewhere.
+$c->external_ua_string = "DAViCal/" . $c->version_string;
+
 /**
 * Force the domain name to what was in the configuration file
 */
@@ -315,7 +334,7 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
 
 require_once('AwlQuery.php');
 
-$c->want_dbversion = array(1,3,5);
+$c->want_dbversion = array(1,3,6);
 $c->schema_version = 0;
 $qry = new AwlQuery( 'SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;' );
 if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {

htdocs/caldav.php

@@ -28,7 +28,7 @@ function logRequestHeaders() {
   dbg_error_log( "LOG ", "***************** Request Header ****************" );
   dbg_error_log( "LOG ", "%s %s", $_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI'] );
   foreach( $lines AS $k => $v ) {
-    if ( $k != 'Authorization' || (isset($c->dbg['password']) && $c->dbg['password'] ) )
+    if ( strtolower($k) != 'authorization' || (isset($c->dbg['password']) && $c->dbg['password'] ) )
       dbg_error_log( "LOG headers", "-->%s: %s", $k, $v );
     else
       dbg_error_log( "LOG headers", "-->%s: %s", $k, 'Delicious tasty password eaten by debugging monster!' );
@@ -152,7 +152,7 @@ try {
 
 } catch (Exception $e) {
   trace_bug( 'DAViCal Fatal Error: ['.$e->getCode().'] '.$e->getmessage().' at '.$e->getFile().':'.$e->getLine() );
-  $request->DoResponse( 500, translate('DAViCal Fatal Error') );
+  $request->DoResponse( 500, sprintf(translate('DAViCal Fatal Error, request ID: %s'), request_id()));
 }
 
 $request->DoResponse( 400, translate('The application program does not understand that request.') );

htdocs/setup.php

@@ -228,14 +228,6 @@ include("page-header.php");
 require_once("AwlQuery.php");
 
 
-function check_datetime() {
-  if ( class_exists('DateTime') ) return new CheckResult(true);
-  $result = new CheckResult(false);
-  $result->setClass('dep_warning');
-  $result->setDescription(i18n('Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended.'));
-  return $result;
-}
-
 function check_xml() {
   return new CheckResult(function_exists('xml_parser_create_ns'));
 }
@@ -267,9 +259,14 @@ function check_davical_version() {
   if ( ! ini_get('allow_url_fopen') )
     return new CheckResult( false, translate("Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</code>”."), 'dep_warning' );
   $url = 'https://www.davical.org/current_davical_version?v='.$c->version_string;
-  $version_file = @fopen($url, 'r');
+  $version_context = stream_context_create( array(
+    'http' => array(
+        'timeout' => 2.0
+    )
+  ));
+  $version_file = @fopen($url, 'r', false, $version_context);
   if ( ! $version_file ) return new CheckResult( false, translate("Could not retrieve") . " '$url'", 'dep_warning' );
-  $current_version = htmlentities( trim(fread( $version_file,12)) );
+  $current_version = htmlentities( trim(fread( $version_file, 12)) );
   fclose($version_file);
   $result = new CheckResult($c->version_string == $current_version);
   if ( ! $result->getOK() ) {
@@ -286,6 +283,19 @@ function check_davical_version() {
   return $result;
 }
 
+function check_php_version() {
+  global $c;
+
+  $result = new CheckResult(version_compare(phpversion(), $c->minimum_php_version, '>='));
+  if ( ! $result->getOK() ) {
+    $result->setDescription( sprintf(i18n('Minimum: %s, Currently: %s'), $c->minimum_php_version, phpversion()) );
+    $result->setClass('dep_fail');
+  } else {
+    $result->setDescription( sprintf(i18n('Passed: %s'), phpversion() . ' >= ' . $c->minimum_php_version) );
+  }
+  return $result;
+
+}
 
 function check_awl_version() {
   global $c;
@@ -337,6 +347,7 @@ function build_dependencies_table( ) {
 
   $dependencies = array(
     translate('Current DAViCal version ')         => 'check_davical_version',
+    translate('PHP version ')                     => 'check_php_version',
     translate('AWL Library version ')             => 'check_awl_version',
     translate('PHP not using Apache Filter mode') => 'check_real_php',
     translate('PHP PDO module available')         => 'check_pdo',
@@ -345,7 +356,6 @@ function build_dependencies_table( ) {
     translate('DAViCal DB Schema version ')       => 'check_schema_version',
     translate('GNU gettext support')              => 'check_gettext',
     translate('PHP iconv support')                => 'check_iconv',
-    translate('PHP DateTime class')               => 'check_datetime',
     translate('PHP XML support')                  => 'check_xml',
     translate('Suhosin "server.strip" disabled')  => 'check_suhosin_server_strip',
     translate('PHP Magic Quotes GPC off')         => 'check_magic_quotes_gpc',

htdocs/tools.php

@@ -87,7 +87,7 @@ class Tools {
       $html .= $ef->DataEntryLine( translate("path to store your ics"), "%s", "text", "calendar_path",
                 array( "size" => 20,
                         "title" => translate("Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"),
-                        "help" => translate("<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>")
+                        "help" => translate("<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>")
                       )
                       , '' );
 

inc/CalDAVRequest.php

@@ -87,7 +87,7 @@ class CalDAVRequest
   protected $exists;
 
   /**
-  * The value of any 'Destionation:' header, if present.
+  * The value of any 'Destination:' header, if present.
   */
   var $destination;
 
@@ -168,7 +168,7 @@ class CalDAVRequest
     *  4. otherwise we query the defined relationships between users and use
     *     the minimum privileges returned from that analysis.
     */
-    if ( isset($_SERVER['PATH_INFO']) ) {
+    if ( isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] !== '') {
       $this->path = $_SERVER['PATH_INFO'];
     }
     else {
@@ -1191,7 +1191,8 @@ EOSQL;
     $xmldoc = sprintf('<?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="%s">
   <%s/>%s
-</error>', $xmlns, str_replace($xmlns.':', '', $precondition), $explanation );
+</error>
+', $xmlns, str_replace($xmlns.':', '', $precondition), $explanation );
 
     $this->DoResponse( $status, $xmldoc, 'text/xml; charset="utf-8"' );
     exit(0);  // Unecessary, but might clarify things
@@ -1239,6 +1240,7 @@ EOSQL;
     if ( !headers_sent() ) @header( sprintf("HTTP/1.1 %d %s", $status, getStatusMessage($status)) );
     if ( !headers_sent() ) @header( sprintf("X-DAViCal-Version: DAViCal/%d.%d.%d; DB/%d.%d.%d", $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) );
     if ( !headers_sent() ) header( "Content-type: ".$content_type );
+    if ( !headers_sent() && $c->test_mode ) header( "Request-ID: " . request_id() );
 
     if ( (isset($c->dbg['ALL']) && $c->dbg['ALL']) || (isset($c->dbg['response']) && $c->dbg['response'])
          || $status == 400  || $status == 402 || $status == 403 || $status > 404 ) {

inc/DAVPrincipal.php

@@ -560,20 +560,8 @@ class DAVPrincipal extends Principal
          * and https://tools.ietf.org/html/rfc5545#section-3.2.3
          */
         $type = 'UNKNOWN';
-        if ( isset($this->type_id) ) {
+        if ( isset($this->type_label) )
-          switch ( $this->type_id ) {
+            $type = $this->type_label;
-            case 1:
-              $type = 'INDIVIDUAL';
-              break;
-            case 2:
-              $type = 'RESOURCE';
-              break;
-            case 3:
-              $type = 'GROUP';
-              break;
-            // 'ROOM' type is not supported yet
-          }
-        }
         $reply->CalDAVElement($prop, 'calendar-user-type', $type);
         break;
 

inc/DAVResource.php

@@ -173,7 +173,7 @@ class DAVResource
   * field of the resource is populated with the given data, so it does not need
   * to be queried again later
   */
-  function __construct( $parameters = null, DAVResource $prefetched_collection = null ) {
+  function __construct( $parameters = null, ?DAVResource $prefetched_collection = null ) {
     $this->exists        = null;
     $this->bound_from    = null;
     $this->dav_name      = null;
@@ -363,13 +363,19 @@ class DAVResource
 
     $this->FetchCollection();
     if ( $this->_is_collection ) {
-      if ( $this->_is_principal || $this->collection->type == 'principal' ) $this->FetchPrincipal();
+      if ( $this->_is_principal || $this->collection->type == 'principal' )
+        $this->FetchPrincipal();
     }
     else {
       $this->FetchResource();
     }
     dbg_error_log( 'DAVResource', ':FromPath: Path "%s" is%s a collection%s.',
-               $this->dav_name, ($this->_is_collection?' '.$this->resourcetypes:' not'), ($this->_is_principal?' and a principal':'') );
+                   $this->dav_name,
+                   ($this->_is_collection ? ' ' . $this->resourcetypes
+                                          : ' not'),
+                   ($this->_is_principal  ? ' and a principal'
+                                          : '')
+                 );
   }
 
 
@@ -569,29 +575,34 @@ EOSQL;
     $cache_ns = 'collection-'.preg_replace( '{/[^/]*$}', '/', $this->dav_name);
     $cache_key = 'dav_resource'.$session->user_no;
     $this->collection = $cache->get( $cache_ns, $cache_key );
+
     if ( $this->collection === false ) {
       $this->ReadCollectionFromDatabase();
+
       if ( $this->collection->type != 'principal' && $this->_collection_is_cacheable ) {
         $cache_ns = 'collection-'.$this->collection->dav_name;
         @dbg_error_log( 'Cache', ':FetchCollection: Setting cache ns "%s" key "%s". Type: %s', $cache_ns, $cache_key, $this->collection->type );
         $cache->set( $cache_ns, $cache_key, $this->collection );
       }
+
       @dbg_error_log( 'DAVResource', ':FetchCollection: Found collection named "%s" of type "%s".', $this->collection->dav_name, $this->collection->type );
     }
     else {
-      @dbg_error_log( 'Cache', ':FetchCollection: Got cache ns "%s" key "%s". Type: %s', $cache_ns, $cache_key, $this->collection->type );
+      @dbg_error_log( 'Cache', ':FetchCollection: Got cache ns "%s" key "%s". dav_name: "%s", Type: %s', $cache_ns, $cache_key, $this->collection->dav_name, $this->collection->type );
-      if ( preg_match( '#^(/[^/]+)/?$#', $this->dav_name, $matches)
+
-           || preg_match( '#^((/principals/[^/]+/)[^/]+)/?$#', $this->dav_name, $matches) ) {
+      if ($this->collection->type == 'principal') {
         $this->_is_principal = true;
         $this->FetchPrincipal();
         $this->collection->is_principal = true;
-        $this->collection->type = 'principal';
+
-      } else {
+      } else if ($this->collection->type == 'calendar') {
-        if ($this->collection->type == 'proxy') {
+        $this->_is_calendar = true;
-          $this->_is_proxy_resource = true;
+
-          $this->proxy_type = $this->collection->proxy_type;
+      } else if ($this->collection->type == 'proxy') {
-        }
+        $this->_is_proxy_resource = true;
+        $this->proxy_type = $this->collection->proxy_type;
       }
+
       @dbg_error_log( 'DAVResource', ':FetchCollection: Read cached collection named "%s" of type "%s".', $this->collection->dav_name, $this->collection->type );
     }
 
@@ -1881,8 +1892,15 @@ EOQRY;
         $prop->NewElement( 'principal-collection-set', $reply->href( ConstructURL('/') ) );
         break;
 
+      # iPhone devices incorrectly implement DAV:current-user-principal from
+      # RFC 5397. They assume that current-user-principal is the href for the
+      # resource being queried. The RFC says it should be the current resource.
+      # See: https://gitlab.com/davical-project/davical/-/issues/335
       case 'DAV::current-user-principal':
-        $prop->NewElement('current-user-principal', $reply->href( ConstructURL(DeconstructURL($session->principal->url())) ) );
+        if ( preg_match('/iPhone/', $_SERVER['HTTP_USER_AGENT']) )
+            $prop->NewElement('current-user-principal', $reply->href( ConstructURL(DeconstructURL($request->principal->url())) ) );
+        else
+            $prop->NewElement('current-user-principal', $reply->href( ConstructURL(DeconstructURL($session->principal->url())) ) );
         break;
 
       case 'SOME-DENIED-PROPERTY':  /** indicating the style for future expansion */

inc/DAViCalSession.php

@@ -49,6 +49,9 @@ class DAViCalSession extends Session
 {
 
   public $principal_id;
+  public $type_id;
+  public $default_privileges;
+  public $displayname;
   private $privilege_resources = array();
 
   /**

inc/HTTPAuthSession.php

@@ -106,6 +106,8 @@ class HTTPAuthSession {
 
     header('HTTP/1.1 401 Unauthorized', true, 401 );
     header('Content-type: text/plain; ; charset="utf-8"' );
+    if ( $c->test_mode ) header( "Request-ID: " . request_id() );
+
     header( $auth_header );
     echo 'Please log in for access to this system.';
     if ( isset($_SERVER['PHP_AUTH_USER']) ) {
@@ -312,6 +314,34 @@ class HTTPAuthSession {
     if(isset($c->login_append_domain_if_missing) && $c->login_append_domain_if_missing && !preg_match('/@/',$username))
       $username.='@'.$c->domain_name;
 
+    $cache_result = $this->_CheckCache($username, $password);
+
+    if ($cache_result == 0) {
+      # noop as _CheckCache has nothing for this username/password combo
+      # and we need to perform full authentication check.
+
+    } else if ($cache_result == 1) {
+      # cached credentials match and are valid
+
+      if ( $principal = new Principal('username', $username) ) {
+        if ( isset($c->dbg['password']) ) dbg_error_log( "password", ":CheckPassword (cached): Name:%s, Pass:%s, File:%s, Active:%s", $username, $password, $principal->password, ($principal->user_active?'Yes':'No') );
+        if ( $principal->user_active ) {
+          return $principal;
+        } else {
+          return false;
+        }
+      } else {
+
+        # If we fail to find the Principal, then fall through to full authentication below.
+        dbg_error_log('password', 'Cache check: Failed to find principal after valid cache result, falling through to full authentication check.');
+      }
+
+    } else if ($cache_result == 2) {
+      # cached credentials match and are invalid
+
+      return false;
+    }
+
     if ( !isset($c->authenticate_hook) || !isset($c->authenticate_hook['call'])
                       || !function_exists($c->authenticate_hook['call'])
                       || (isset($c->authenticate_hook['optional']) && $c->authenticate_hook['optional']) )
@@ -319,6 +349,7 @@ class HTTPAuthSession {
       if ( $principal = new Principal('username', $username) ) {
         if ( isset($c->dbg['password']) ) dbg_error_log( "password", ":CheckPassword: Name:%s, Pass:%s, File:%s, Active:%s", $username, $password, $principal->password, ($principal->user_active?'Yes':'No') );
         if ( $principal->user_active && session_validate_password( $password, $principal->password ) ) {
+          $this->_SetCache($username, $password, 'pass');
           return $principal;
         }
       }
@@ -340,9 +371,17 @@ class HTTPAuthSession {
       if ( $principal !== false && !($principal instanceof Principal) ) {
         $principal = new Principal('username', $username);
       }
+
+      if ( $principal === false ) {
+        $this->_SetCache($username, $password, 'fail');
+      } else {
+        $this->_SetCache($username, $password, 'pass');
+      }
+
       return $principal;
     }
 
+    $this->_SetCache($username, $password, 'fail');
     return false;
   }
 
@@ -403,6 +442,161 @@ class HTTPAuthSession {
     }
   }
 
+  /**
+  * Internal function used to check a cache for username/password details. This is
+  * intended to reduce the load on external authentication sources.
+  */
+  function _CheckCache( $username, $password ) {
+    global $c;
 
+    if (! $c->auth_cache) return 0;
+    if (! isset($c->auth_cache_secret) || $c->auth_cache_secret == '') {
+      dbg_error_log('LOG', "HTTPAuth:CheckCache: caching of credentials is enabled, but \$c->auth_cache_secret isn't set, using auth source");
+      return 0;
+    }
+
+    $cache = getCacheInstance();
+    if ($cache->isActive() === false) return 0;
+
+    $cache_ns = 'auth-' . $username;
+
+    $salt = $cache->get($cache_ns, 'salt');
+
+    if (!isset($salt) || (is_bool($salt) && $salt == false) || $salt == '') {
+      dbg_error_log('HTTPAuth', 'CheckCache: No stored salt for %s, need to use auth source', $username);
+      return 0;
+    }
+
+    # The hashed password to fetch
+    $hash = $this->_MakeHash($password, $salt);
+    if (! isset($hash)) {
+      dbg_error_log('LOG', 'HTTPAuth:CheckCache: failed to generate hash of credential, using auth source');
+      return 0;
+    }
+
+    $cached_credentials = $cache->get($cache_ns, $hash);
+
+    if (isset($cached_credentials)) {
+      if ($cached_credentials === 'pass') {
+        dbg_error_log('HTTPAuth', 'CheckCache: Cached credentials for %s are good and valid', $username);
+        return 1;
+
+      } else if ($cached_credentials === 'fail') {
+        dbg_error_log('HTTPAuth', 'CheckCache: Cached credentials for %s are good and invalid', $username);
+        return 2;
+      }
+
+      dbg_error_log('HTTPAuth', 'CheckCache: No stored salted password for %s, need to use auth source', $username);
+    }
+
+    # All hope is lost, we must have failed to find anything decent.
+    return 0;
+  }
+
+  /**
+  * Internal function used to set a cache for username/password details. This is
+  * intended to reduce the load on external authentication sources.
+  */
+  function _SetCache( $username, $password, $state ) {
+    global $c;
+
+    if (! $c->auth_cache) return 0;
+    if (! isset($c->auth_cache_secret) || $c->auth_cache_secret === '') {
+      dbg_error_log('LOG', "HTTPAuth:CheckCache: caching of credentials is enabled, \$c->auth_cache_secret isn't set, not caching credential");
+      return 0;
+    }
+
+    # Work out the expiry to use, some sites might prefer different TTLs for
+    # pass/fail results.
+    if ($state === 'pass') {
+      $expiry = $c->auth_cache_pass;
+    } else if ($state === 'fail') {
+      $expiry = $c->auth_cache_fail;
+    } else {
+      dbg_error_log('ERROR', 'HTTPAuth:CheckCache: SetCache: Unexpected state %s, bailing out from caching credential.', $state);
+      return 0;
+    }
+
+    # Only cache if the expiry is set to non-zero. This allows disabling
+    # caching on a pass or fail basis.
+    if ($expiry == 0) {
+      dbg_error_log('ERROR', 'HTTPAuth:CheckCache: SetCache: Expiry set to 0, not caching credential.', $state);
+      return 0;
+    }
+
+
+    $cache = getCacheInstance();
+    if ($cache->isActive() === false) return 0;
+
+    $cache_ns = 'auth-' . $username;
+
+    $salt = $cache->get($cache_ns, 'salt');
+
+    if (!isset($salt) || (is_bool($salt) && $salt == false) || $salt == '') {
+      # bcrypt requires the salt is 22 bytes.
+      $salt = $this->_GenerateSalt(22);
+
+      # We use the default expiry setting for the salt, because the worst
+      # case scenario is that we won't access the cached credentials and
+      # need to fail back to the full authentication source.
+      if (! $cache->set($cache_ns, 'salt', $salt) ) {
+        dbg_error_log('ERROR', 'HTTPAuth:CheckCache: SetCache: Failed to store salt, bailing out from caching credential.');
+        return 0;
+      }
+    }
+
+    # The hashed password to store
+    $hash = $this->_MakeHash($password, $salt);
+    if (! isset($hash)) {
+      dbg_error_log('ERROR', 'HTTPAuth:CheckCache: SetCache: Failed to generate hash, bailing out from caching credential.');
+      return 0;
+    }
+
+    if (! $cache->set($cache_ns, $hash, $state, $expiry) ) {
+      dbg_error_log('ERROR', 'HTTPAuth:CheckCache: SetCache: Failed to store credential.');
+      return 0;
+    }
+
+    return 1;
+  }
+
+  /**
+  * Internal function to generate hash of the password.
+  */
+  function _MakeHash( $password, $salt ) {
+    global $c;
+
+    $password_salt = '$2y$07$' . $salt . '$';
+    $password_peppered = hash_hmac('sha256', $password, $c->auth_cache_secret);
+    $password_hashed   = crypt($password_peppered, $password_salt);
+
+    if ($password_hashed == $password_salt || $password_hashed == '*0')  {
+        return NULL;
+    } else {
+        return $password_hashed;
+    }
+  }
+
+  /*
+   * Internal function to generate a salt.
+   *
+   * Uses random_bytes if available, falls back to mcrypt_create_iv if it
+   * isn't.
+   */
+  function _GenerateSalt( $length ) {
+    # We fetch a bit more incase we need to strip out unacceptable characters.
+    if (function_exists('random_bytes')) {
+        $salt = random_bytes($length + 20);
+    } else {
+        $salt = mcrypt_create_iv($length + 20, MCRYPT_DEV_URANDOM);
+    }
+
+    # We use this salt with CRYPT_BLOWFISH which only accepts the characters
+    #./0-9a-zA-Z as per https://www.php.net/manual/en/function.crypt.php
+    $salt = base64_encode($salt);
+    $salt = preg_replace('/[^0-9\.\/a-zA-Z]/', '', $salt);
+
+    $salt = substr($salt, 1, $length);
+    return $salt;
+  }
 }
-

inc/Principal.php

@@ -60,6 +60,7 @@ class Principal {
   public $date_format_type;
   public $locale;
   public $type_id;
+  public $type_label;
   public $displayname;
   public $default_privileges;
   public $is_principal;
@@ -193,7 +194,7 @@ class Principal {
       }
     }
 
-    $sql = 'SELECT *, ';
+    $sql = 'SELECT dav_principal.*, principal_type.label AS type_label, ';
     if ( isset($session->principal_id) && $session->principal_id !== false ) {
       $sql .= 'pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS privileges ';
       $params = array( ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth );
@@ -202,7 +203,7 @@ class Principal {
       $sql .= '0::BIT(24) AS privileges ';
       $params = array( );
     }
-    $sql .= 'FROM dav_principal WHERE ';
+    $sql .= 'FROM dav_principal LEFT JOIN principal_type ON (type_id = principal_type_id) WHERE ';
     switch ( $type ) {
       case 'username':
         $sql .= 'lower(username)=lower(text(:param))';
@@ -413,6 +414,9 @@ class Principal {
   protected function FetchCollections() {
     if ( isset($this->collections) ) return;
 
+    // If this is an external binding, then user_no will most likely be empty.
+    if ( ! isset($this->user_no) ) return;
+
     $this->collections = array();
     $qry = new AwlQuery('SELECT * FROM collection WHERE user_no= :user_no', array(':user_no' => $this->user_no()) );
     if ( $qry->Exec('Principal') ) {
@@ -447,7 +451,7 @@ class Principal {
           if ( isset($this->collections[$dav_name]) && ($this->collections[$dav_name]->is_calendar == 't') ) {
             $this->default_calendar = $dav_name;
           }
-          else {
+          else if ( isset($this->collections) ) {
             foreach( $this->collections AS $dav_name => $collection ) {
               if ( $collection->is_calendar == 't' ) {
                 $this->default_calendar = $dav_name;

inc/RRule.php

@@ -410,9 +410,7 @@ class RepeatRuleDateTime extends DateTime {
   public function FloatOrUTC($return_floating_times = false) {
     $gmt = clone($this);
     if ( !$return_floating_times && isset($this->tzid) && $this->tzid != 'UTC' ) {
-      $dtz = parent::getTimezone();
+      $gmt->setTimezone('UTC');
-      $offset = 0 - $dtz->getOffset($gmt);
-      $gmt->modify( $offset . ' seconds' );
     }
     if ( $this->is_date ) return $gmt->format('Ymd');
     if ( $return_floating_times ) return $gmt->format('Ymd\THis');

inc/WritableCollection.php

@@ -198,6 +198,18 @@ class WritableCollection extends DAVResource {
         $qry->QDo('SET TIMEZONE TO \''.$olson."'" );
         $last_olson = $olson;
       }
+
+      $params = array( ':tzid' => $tzid);
+      $qry = new AwlQuery('SELECT 1 FROM timezones WHERE tzid = :tzid', $params );
+      if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
+        $params[':olson_name'] = $olson;
+        $params[':vtimezone'] = (isset($tz) ? $tz->Render() : null );
+        $params[':last_modified'] = (isset($tz) ? $tz->GetPValue('LAST-MODIFIED') : null );
+        if ( empty($params[':last_modified']) ) {
+          $params[':last_modified'] = gmdate('Ymd\THis\Z');
+        }
+        $qry->QDo('INSERT INTO timezones (tzid, olson_name, active, vtimezone, last_modified) VALUES(:tzid,:olson_name,false,:vtimezone,:last_modified)', $params );
+      }
     }
 
     $created = $first->GetPValue('CREATED');
@@ -239,7 +251,8 @@ EOSQL;
     }
     else {
       $sql = <<<EOSQL
-UPDATE calendar_item SET dav_etag=:etag, uid=:uid, dtstamp=:dtstamp,
+UPDATE calendar_item
+SET dav_etag=:etag, uid=:uid, dtstamp=:dtstamp,
   dtstart=:dtstart, dtstart_orig=:dtstart_orig, dtend=$dtend,
   dtend_orig=:dtend_orig, summary=:summary, location=:location, class=:class,
   transp=:transp, description=:description, rrule=:rrule, tz_id=:tzid,

inc/always.php.in

@@ -141,6 +141,8 @@ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
 $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
 $c->default_privileges = array('read-free-busy', 'schedule-deliver');
 $c->list_everyone = true;
+$c->external_refresh = 60;
+$c->scheduling_dkim_domain = false;
 
 $c->enable_auto_schedule = true;
 
@@ -159,13 +161,24 @@ $c->template_usr = array( 'active' => true,
 $c->hide_TODO = true;                      // VTODO only visible to collection owner
 $c->readonly_webdav_collections = true;    // WebDAV access is readonly
 
+// Authentication caching details
+$c->auth_cache = false;                    // Default to off
+$c->auth_cache_pass = 0;                   // Default to off
+$c->auth_cache_fail = 0;                   // Default to off
+
 // Kind of private configuration values
 $c->total_query_time = 0;
 
-// Any many times GetMoreInstances in inc/RRule.php should loop trying to
+// How many times GetMoreInstances in inc/RRule.php should loop trying to
 // find more instances.
 $c->rrule_loop_limit = 100;
 
+// Kind of private configuration values
+$c->total_query_time = 0;
+
+// Are we in test mode?
+$c->test_mode = false;
+
 $c->dbg = array();
 
 
@@ -279,7 +292,7 @@ if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) {
 else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
   // Only log this if more than a little debugging of some sort is turned on, somewhere
   @dbg_error_log( 'LOG', '==========> method =%s= =%s= =%s= =%s= =%s=',
-         $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '$_SERVER[PATH_INFO] undefined'), $c->base_url, $c->base_directory );
+         $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, (isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] !== '' ? $_SERVER['PATH_INFO'] : '$_SERVER[PATH_INFO] undefined'), $c->base_url, $c->base_directory );
 }
 
 /**
@@ -297,7 +310,7 @@ if ( function_exists('awl_set_locale') ) {
 *
 */
 $c->code_version = 0;
-$c->want_awl_version = 0.63;
+$c->want_awl_version = 0.65;
 $c->version_string = '0.9.9.4'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
@@ -308,6 +321,12 @@ if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->v
   @header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
 }
 
+// What is our minimum supported version of PHP?
+$c->minimum_php_version = '5.4.0';
+
+// Default UserAgent string when fetching content from elsewhere.
+$c->external_ua_string = "DAViCal/" . $c->version_string;
+
 /**
 * Force the domain name to what was in the configuration file
 */
@@ -315,7 +334,7 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
 
 require_once('AwlQuery.php');
 
-$c->want_dbversion = array(1,2,9);
+$c->want_dbversion = array(1,3,6);
 $c->schema_version = 0;
 $qry = new AwlQuery( 'SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;' );
 if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {

inc/auth-functions.php

@@ -102,6 +102,8 @@ function CreateHomeCollections( $username, $default_timezone = null ) {
         'name'               => $c->home_in_calendar_name,
         'displayname_suffix' => ' Inbox'
       );
+
+    // XXX Should we not do this for ROOMS?
     if( !empty($c->home_addressbook_name) )
       $c->default_collections[] = array(
         'type' => 'addressbook',

inc/caldav-ACL.php

@@ -125,6 +125,9 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
   $principal_content = $principal_node->GetContent();
   if ( count($principal_content) != 1 ) $request->MalformedRequest('ACL request must contain exactly one principal per ACE');
   $principal_content = $principal_content[0];
+
+  dbg_error_log( 'ACE', 'NSTag: "%s", by_collection: %s, by_principal: %s', $principal_content->GetNSTag(), $by_collection ?? 'Null', $by_principal ?? 'Null');
+
   switch( $principal_content->GetNSTag() ) {
     case 'DAV::property':
       $principal_property = $principal_content->GetContent();
@@ -142,8 +145,10 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
       $principal_type = 'href';
       $grantee = new DAVResource( DeconstructURL($principal_content->GetContent()) );
       $grantee_id = $grantee->getProperty('principal_id');
+
       if ( !$grantee->Exists() || !$grantee->IsPrincipal() )
-        $request->PreconditionFailed(403,'recognized-principal', 'Principal "' + $principal_content->GetContent() + '" not found.');
+        $request->PreconditionFailed(403,'recognized-principal', 'Principal "' . $principal_content->GetContent() . '" not found.');
+
       $sqlparms = array( ':to_principal' => $grantee_id);
       $where = 'WHERE to_principal=:to_principal AND ';
       if ( isset($by_principal) ) {
@@ -154,6 +159,7 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
         $sqlparms[':by_collection'] = $by_collection;
         $where .= 'by_collection = :by_collection';
       }
+
       $qry = new AwlQuery('SELECT privileges FROM grants '.$where, $sqlparms);
       if ( $qry->Exec('ACL',__LINE__,__FILE__) && $qry->rows() == 1 && $current = $qry->Fetch() ) {
         $sql = 'UPDATE grants SET privileges=:privileges::INT::BIT(24) '.$where;
@@ -169,6 +175,15 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
         Principal::cacheDelete('dav_name',$grantee->dav_name());
         Principal::cacheFlush('principal_id IN (SELECT member_id FROM group_member WHERE group_id = ?)', array($grantee_id));
       }
+
+      /**
+       *  Basically this has changed everyone's permissions now, so...
+       */
+      $cache = getCacheInstance();
+      $cache->flush();
+
+      #Principal::cacheFlush('TRUE');
+
       break;
 
     case 'DAV::authenticated':

inc/caldav-GET-functions.php

@@ -22,6 +22,9 @@ function obfuscated_event( $icalendar ) {
   $confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' );
   $confidential->SetProperties( $icalendar->GetProperties('DTSTART'), 'DTSTART' );
   $confidential->SetProperties( $icalendar->GetProperties('RRULE'), 'RRULE' );
+  $confidential->SetProperties( $icalendar->GetProperties('EXDATE'), 'EXDATE' );
+  $confidential->SetProperties( $icalendar->GetProperties('RECURRENCE-ID'), 'RECURRENCE-ID' );
+  $confidential->SetProperties( $icalendar->GetProperties('SEQUENCE'), 'SEQUENCE' );
   $confidential->SetProperties( $icalendar->GetProperties('DURATION'), 'DURATION' );
   $confidential->SetProperties( $icalendar->GetProperties('DTEND'), 'DTEND' );
   $confidential->SetProperties( $icalendar->GetProperties('UID'), 'UID' );

inc/caldav-PUT-functions.php

@@ -181,6 +181,19 @@ function GetTZID( vComponent $comp ) {
   return $p->GetParameterValue('TZID');
 }
 
+/**
+ * Quotes a DateTime parameter (e.g. DTSTART) for the database
+ *
+ * @var string|null $dt
+ * @return string|null
+ */
+function quote_dt_param($dt) {
+    if (null === $dt || '' === $dt) {
+        return null;
+    }
+
+    return "'" . $dt . "'";
+}
 
 /**
 * Deliver scheduling requests to attendees
@@ -1086,8 +1099,8 @@ EOSQL;
     $dav_data_params[':session_user'] = $session->user_no;
 
     $dtstart = $first->GetPValue('DTSTART');
-    $calitem_params[':dtstart_orig'] = $dtstart;
+    $calitem_params[':dtstart_orig'] = quote_dt_param($dtstart);
-    $calitem_params[':dtstart'] = $dtstart;
+    $calitem_params[':dtstart'] = quote_dt_param($dtstart);
 
     if ( (!isset($dtstart) || $dtstart == '') && $first->GetPValue('DUE') != '' ) {
       $dtstart = $first->GetPValue('DUE');
@@ -1129,11 +1142,11 @@ EOSQL;
     }
 
     $dtend = $first->GetPValue('DTEND');
-    $calitem_params[':dtend_orig'] = $dtend;
+    $calitem_params[':dtend_orig'] = quote_dt_param($dtend);
 
     if ( isset($dtend) && $dtend != '' ) {
       dbg_error_log( 'PUT', ' DTEND: "%s", DTSTART: "%s", DURATION: "%s"', $dtend, $dtstart, $first->GetPValue('DURATION') );
-      $calitem_params[':dtend'] = $dtend;
+      $calitem_params[':dtend'] = quote_dt_param($dtend);
       $dtend = ':dtend';
     }
     else {
@@ -1479,21 +1492,17 @@ function write_resource( DAVResource $resource, $caldav_data, DAVResource $colle
   if ( $first->GetType() == 'VTODO' ) $due = $first->GetPValue('DUE');
   $calitem_params[':due'] = $due;
   $dtstart = $first->GetPValue('DTSTART');
-  $calitem_params[':dtstart_orig'] = $dtstart;
+  $calitem_params[':dtstart_orig'] = quote_dt_param($dtstart);
 
   if ( empty($dtstart) ) $dtstart = $due;
-  if (isset($dtstart) && preg_match("/^1[0-8][0-9][0-9][01][0-9][0-3][0-9]$/", $dtstart))
+  $calitem_params[':dtstart'] = quote_dt_param($dtstart);
-     $dtstart = $dtstart . "T000000Z";
-  $calitem_params[':dtstart'] = $dtstart;
 
   $dtend = $first->GetPValue('DTEND');
-  $calitem_params[':dtend_orig'] = $dtend;
+  $calitem_params[':dtend_orig'] = quote_dt_param($dtend);
 
   if ( isset($dtend) && $dtend != '' ) {
     dbg_error_log( 'PUT', ' DTEND: "%s", DTSTART: "%s", DURATION: "%s"', $dtend, $dtstart, $first->GetPValue('DURATION') );
-    if (preg_match("/^1[0-8][0-9][0-9][01][0-9][0-3][0-9]$/", $dtend))
+    $calitem_params[':dtend'] = quote_dt_param($dtend);
-       $dtend = $dtend . "T000000Z";
-    $calitem_params[':dtend'] = $dtend;
     $dtend = ':dtend';
   }
   else {

inc/caldav-REPORT-freebusy.php

@@ -10,9 +10,34 @@ $fbq_end   = $fbq_content[0]->GetAttribute('end');
 if ( ! ( isset($fbq_start) || isset($fbq_end) ) ) {
   $request->DoResponse( 400, 'All valid freebusy requests MUST contain a time-range filter' );
 }
-$range_start = new RepeatRuleDateTime($fbq_start);
-$range_end   = new RepeatRuleDateTime($fbq_end);
 
+if ( isset($fbq_start) ) {
+  $range_start = new RepeatRuleDateTime($fbq_start);
+} else {
+  # RFC 4791 Section 9.9 says that if start isn't set, then -infinity
+  # should be used. We can't specify that in PHP, and
+  # expand_event_instances has '-6 weeks' as the default.
+  # That's a bit short, go for one year prior to end, if defined,
+  # otherwise 1 year prior to now now.
+  if ( isset($fbq_end) ) {
+    $range_start = new RepeatRuleDateTime($fbq_end);
+  } else {
+    $range_start = new RepeatRuleDateTime;
+  }
+
+  $range_start->modify('-365 days');
+}
+
+if ( isset($fbq_end) ) {
+  $range_end = new RepeatRuleDateTime($fbq_end);
+} else {
+  # RFC 4791 Section 9.9 says that if end isn't set, then +infinity
+  # should be used. We can't specify that in PHP, and
+  # expand_event_instances has '+ 6 weeks' as the default. That's a
+  # bit short, go for two years from the start.
+  $range_end = clone($range_start);
+  $range_end->modify('+730 days');
+}
 
 /** We use the same code for the REPORT, the POST and the freebusy GET... */
 $freebusy = get_freebusy( '^' . $request->path . $request->DepthRegexTail(true), $range_start, $range_end );

inc/caldav-REPORT-principal.php

@@ -16,8 +16,24 @@ if ( isset($CS_search_test) && $CS_search_test == 'anyof' ) {
   $clause_joiner = " OR ";
 }
 
+# Calendar on macOS searches for the principal type as an attribute.
+$principal_type = $xmltree->GetAttribute('type');
+
 $params = array();
+$typewhere = "";
 $where = "";
+$join = "";
+
+dbg_error_log("SEARCH", "type: '%s'", $principal_type );
+
+// This is ugly, but macOS specifies the calendar type as an attribute
+if (isset($principal_type)) {
+    $typewhere = 'principal_type.label = :principal_type';
+    $params[':principal_type'] = $principal_type;
+
+    $join = 'LEFT JOIN principal_type ON (type_id = principal_type_id)';
+}
+
 foreach( $searches AS $k => $search ) {
   $qry_props = $search->GetPath('/DAV::property-search/DAV::prop/*');  // There may be many
   $match     = $search->GetPath('/DAV::property-search/DAV::match');   // There may only be one
@@ -61,8 +77,16 @@ foreach( $searches AS $k => $search ) {
     $where .= sprintf( "%s(%s)", ($where == "" ? "" : $clause_joiner), $subwhere );
   }
 }
-if ( $where != "" ) $where = "WHERE $where";
+
-$sql = "SELECT * FROM dav_principal $where ORDER BY principal_id LIMIT 100";
+if ( $where != "" && $typewhere != "" ) {
+    $where = "WHERE $typewhere AND $where";
+} elseif ( $where != "" ) {
+    $where = "WHERE $where";
+} elseif ( $typewhere != "" ) {
+    $where = "WHERE $typewhere";
+}
+
+$sql = "SELECT * FROM dav_principal $join $where ORDER BY principal_id LIMIT 100";
 $qry = new AwlQuery($sql, $params);
 
 

inc/caldav-client-v2.php

@@ -70,7 +70,7 @@ class CalDAVClient {
   protected $calendar_urls;
 
   /**
-  * The useragent which is send to the caldav server
+  * The useragent which is sent to the caldav server
   *
   * @var string
   */

inc/caldav-client.php

@@ -26,7 +26,7 @@ class CalDAVClient {
   var $base_url, $user, $pass, $calendar, $entry, $protocol, $server, $port;
 
   /**
-  * The useragent which is send to the caldav server
+  * The useragent which is sent to the caldav server
   *
   * @var string
   */

inc/csrf_tokens.php

@@ -16,11 +16,7 @@ function updateCsrf() {
  * @return bool
  */
 function sessionExists() {
-    if (version_compare(phpversion(), '5.4.0', '>')) {
+    return session_status() === PHP_SESSION_ACTIVE;
-        return session_id() !== '';
-    } else {
-        return session_status() === PHP_SESSION_ACTIVE;
-    }
 }
 
 /**
@@ -116,4 +112,4 @@ function verifyCsrf($csrf_token) {
  */
 function verifyCsrfPost() {
     return (isset($_POST['csrf_token']) && verifyCsrf($_POST['csrf_token']));
-}
+}

inc/drivers_imap_pam.php

@@ -1,120 +0,0 @@
-<?php
-/**
-* Authentication against IMAP using the imap_open function
-*
-* @package   davical
-* @category  Technical
-* @subpackage authentication/drivers
-* @author    Oliver Schulze <oliver@samera.com.py>,
-*            Andrew McMillan <andrew@mcmillan.net.nz>
-* @copyright Based on Eric Seigne script drivers_squid_pam.php
-* @license   http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
-*/
-
-// The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
-if (!function_exists('imap_open')) {
-  die("drivers_imap_pam: php-imap required.");
-}
-
-require_once("auth-functions.php");
-
-/**
- * Plugin to authenticate against IMAP
- */
-class imapPamDriver
-{
-  /**#@+
-  * @access private
-  */
-
-  /**#@-*/
-
-
-  /**
-  * The constructor
-  *
-  * @param string $imap_url formated for imap_open()
-  */
-  function __construct($imap_url)
-  {
-      global $c;
-      if (empty($imap_url)){
-          $c->messages[] = sprintf(i18n('drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php'));
-          $this->valid=false;
-          return ;
-      }
-  }
-}
-
-
-/**
-* Check the username / password against the IMAP server, provision from GECOS
-*/
-function IMAP_PAM_check($username, $password ){
-  global $c;
-
-  $imap_username = $username;
-  if ( function_exists('mb_convert_encoding') ) {
-    $imap_username = mb_convert_encoding($imap_username, "UTF7-IMAP",mb_detect_encoding($imap_username));
-  }
-  else {
-    $imap_username = imap_utf7_encode($imap_username);
-  }
-
-  //$imap_url = '{localhost:143/imap/notls}';
-  //$imap_url = '{localhost:993/imap/ssl/novalidate-cert}';
-  $imap_url = $c->authenticate_hook['config']['imap_url'];
-  $auth_result = "ERR";
-
-  $imap_stream = @imap_open($imap_url, $imap_username, $password, OP_HALFOPEN);
-  //print_r(imap_errors());
-  if ( $imap_stream ) {
-    // disconnect
-    imap_close($imap_stream);
-    // login ok
-    $auth_result = "OK";
-  }
-
-  if ( $auth_result == "OK") {
-    $principal = new Principal('username',$username);
-    if ( ! $principal->Exists() ) {
-      dbg_error_log( "PAM", "Principal '%s' doesn't exist in local DB, we need to create it",$username );
-      $cmd = "getent passwd '$username'";
-      $getent_res = exec($cmd);
-      $getent_arr = explode(":", $getent_res);
-      $fullname = $getent_arr[4];
-      if(empty($fullname)) {
-        $fullname = $username;
-      }
-
-      // ensure email domain is not doubled in email field
-      @list($tmp_user, $tmp_domain) = explode('@', $username);
-      if( empty($tmp_domain) ) {
-        $email_address = $username . "@" . $c->authenticate_hook['config']['email_base'];
-      }
-      else {
-        $email_address = $username;
-      }
-
-      $principal->Create( array(
-                      'username' => $username,
-                      'user_active' => true,
-                      'email' => $email_address,
-                      'modified' => date('c'),
-                      'fullname' => $fullname
-              ));
-      if ( ! $principal->Exists() ) {
-        dbg_error_log( "PAM", "Unable to create local principal for '%s'", $username );
-        return false;
-      }
-      CreateHomeCollections($username);
-      CreateDefaultRelationships($username);
-    }
-    return $principal;
-  }
-  else {
-    dbg_error_log( "PAM", "User %s is not a valid username (or password was wrong)", $username );
-    return false;
-  }
-
-}

inc/drivers_ldap.php

@@ -54,19 +54,34 @@ class ldapDriver
       if (isset($config['networkTimeout']))
           ldap_set_option($this->connect, LDAP_OPT_NETWORK_TIMEOUT, $config['networkTimeout']);
 
-      if ($port)
+      // If we are given a URI (or multiple) to connect to, use them. This allows support for LDAPS connections
+      // as well as redundant ldap servers to connect to
+      // Otherwise default to host and port
+      if (isset($config['uri']))
+          $this->connect=ldap_connect($config['uri']);
+      elseif ($port)
           $this->connect=ldap_connect($host, $port);
       else
           $this->connect=ldap_connect($host);
 
       if (! $this->connect){
-          $c->messages[] = sprintf(translate( 'drivers_ldap : Unable to connect to LDAP with port %s on host %s'), $port, $host );
+          if (isset($config['uri'])) {
+              $c->messages[] = sprintf(translate( 'drivers_ldap : Unable to connect to LDAP with URI: %s'), $config['uri'] );
+          } else {
+              if (! $port) $port = 'default';
+              $c->messages[] = sprintf(translate( 'drivers_ldap : Unable to connect to LDAP with port %s on host %s'), $port, $host );
+          }
           $this->valid=false;
           return ;
+      } else {
+          if (isset($config['uri']))
+              dbg_error_log( "LDAP", "drivers_ldap : Connected to LDAP server %s", $config['uri'] );
+          elseif ($port)
+              dbg_error_log( "LDAP", "drivers_ldap : Connected to LDAP server %s, port %s", $host, $port );
+          else
+              dbg_error_log( "LDAP", "drivers_ldap : Connected to LDAP server %s", $host );
       }
 
-      dbg_error_log( "LDAP", "drivers_ldap : Connected to LDAP server %s",$host );
-
       // Start TLS if desired (requires protocol version 3)
       if (isset($config['startTLS'])) {
         if (!ldap_set_option($this->connect, LDAP_OPT_PROTOCOL_VERSION, 3)) {
@@ -90,7 +105,7 @@ class ldapDriver
         break;
       case "onelevel":
         $this->ldap_query_one = 'ldap_list';
-        $this->ldap_query_all = 'ldap_search';
+        $this->ldap_query_all = 'ldap_list';
         break;
       default:
         $this->ldap_query_one = 'ldap_search';
@@ -98,21 +113,49 @@ class ldapDriver
         break;
       }
 
+      // This is useful to see what is happening at a low level. I also
+      // recommend tcpdump...
+      //ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
+
       //connect as root
-      if (!ldap_bind($this->connect, (isset($config['bindDN']) ? $config['bindDN'] : null), (isset($config['passDN']) ? $config['passDN'] : null) ) ){
+      if (isset($config['sasl'])){
+        $bind_result = ldap_sasl_bind(
+          $this->connect,
+          (isset($config['bindDN']) ? $config['bindDN'] : null),
+          (isset($config['passDN']) ? $config['passDN'] : null),
+          (isset($config['sasl_mech']) ? $config['sasl_mech'] : null),
+          (isset($config['sasl_realm']) ? $config['sasl_realm'] : null),
+          (isset($config['sasl_authc_id']) ? $config['sasl_authc_id'] : null),
+          (isset($config['sasl_authz_id']) ? $config['sasl_authz_id'] : null),
+          (isset($config['sasl_props']) ? $config['sasl_props'] : null) );
+      } else {
+        $bind_result = ldap_bind($this->connect, (isset($config['bindDN']) ? $config['bindDN'] : null), (isset($config['passDN']) ? $config['passDN'] : null) );
+      }
+      if (!$bind_result){
           $bindDN = isset($config['bindDN']) ? $config['bindDN'] : 'anonymous';
           $passDN = isset($config['passDN']) ? $config['passDN'] : 'anonymous';
+
           dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port, $bindDN );
           $c->messages[] = i18n( 'drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your LDAP server is reachable');
           $this->valid=false;
           return ;
       }
       $this->valid = true;
-      //root to start search
+
-      $this->baseDNUsers  = is_string($config['baseDNUsers']) ? array($config['baseDNUsers']) : $config['baseDNUsers'];
+      // root to start search
-      $this->filterUsers  = (isset($config['filterUsers'])  ? $config['filterUsers']  : null);
+      $this->baseDNUsers  =
-      $this->baseDNGroups = (isset($config['baseDNGroups']) ? (is_string($config['baseDNGroups']) ? array($config['baseDNGroups']) : $config['baseDNGroups']) : null);
+          is_string($config['baseDNUsers']) ?
-      $this->filterGroups = (isset($config['filterGroups']) ? $config['filterGroups'] : null);
+          array($config['baseDNUsers']) : $config['baseDNUsers'];
+      $this->filterUsers  =
+          (isset($config['filterUsers'])  ?
+          $config['filterUsers'] : '(objectclass=*)');
+      $this->baseDNGroups =
+          (isset($config['baseDNGroups']) ?
+          (is_string($config['baseDNGroups']) ?
+          array($config['baseDNGroups']) : $config['baseDNGroups']) : null);
+      $this->filterGroups =
+          (isset($config['filterGroups']) ?
+           $config['filterGroups'] : '(objectclass=*)');
   }
 
   /**
@@ -125,22 +168,38 @@ class ldapDriver
     $ret = array();
 
     foreach($this->baseDNUsers as $baseDNUsers) {
-      $entry = $query($this->connect,$baseDNUsers,$this->filterUsers,$attributes);
+      $entry = $query($this->connect, $baseDNUsers, $this->filterUsers, $attributes);
 
-      if (!ldap_first_entry($this->connect,$entry)) {
+      if (! $entry) {
+          $c->messages[] = sprintf(translate('Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<'),
+                                   $this->filterUsers,
+                                   join(', ', $attributes),
+                                   $baseDNUsers);
+          dbg_error_log('LDAP', 'Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<',
+                                   $this->filterUsers,
+                                   join(', ', $attributes),
+                                   $baseDNUsers);
+          return $ret;
+      }
+
+      if (! ldap_first_entry($this->connect, $entry)) {
         $c->messages[] = sprintf(translate('Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<'),
                                  $this->filterUsers,
                                  join(', ', $attributes),
                                  $baseDNUsers);
+        return $ret;
       }
+
       $row = array();
-      for($i = ldap_first_entry($this->connect,$entry);
+      for ($i = ldap_first_entry($this->connect,$entry);
-          $i && $arr = ldap_get_attributes($this->connect,$i);
+           $i && $arr = ldap_get_attributes($this->connect,$i);
-          $i = ldap_next_entry($this->connect,$i) ) {
+           $i = ldap_next_entry($this->connect,$i) ) {
         $row = array();
+
         for ($j=0; $j < $arr['count']; $j++) {
           $row[$arr[$j]] = $arr[$arr[$j]][0];
         }
+
         $ret[]=$row;
       }
     }
@@ -215,29 +274,42 @@ class ldapDriver
 
     $dnUser = ldap_get_dn($this->connect, ldap_first_entry($this->connect,$entry));
 
-    if ( isset($c->authenticate_hook['config']['i_use_mode_kerberos']) && $c->authenticate_hook['config']['i_use_mode_kerberos'] == "i_know_what_i_am_doing") {
+    $authenticated = false;
+    $use_kerberos_only = isset($c->authenticate_hook['config']['i_use_mode_kerberos']) && $c->authenticate_hook['config']['i_use_mode_kerberos'] == "i_know_what_i_am_doing";
+    $use_kerberos_with_fallback = isset($c->authenticate_hook['config']['i_use_mode_kerberos']) && $c->authenticate_hook['config']['i_use_mode_kerberos'] == "allow_fallback_to_ldap_auth";
+
+    if ($use_kerberos_only or $use_kerberos_with_fallback) {
       if (isset($_SERVER["REMOTE_USER"])) {
         dbg_error_log( "LOG", "drivers_ldap : Skipping password Check for user %s which should be the same as %s",$username , $_SERVER["REMOTE_USER"]);
-        if ($username != $_SERVER["REMOTE_USER"]) {
+        if ($username == $_SERVER["REMOTE_USER"]) {
+          $authenticated = true;
+        } else {
           return false;
         }
-      } else {
+      } elseif (isset($_SERVER["REDIRECT_REMOTE_USER"])) {
         dbg_error_log( "LOG", "drivers_ldap : Skipping password Check for user %s which should be the same as %s",$username , $_SERVER["REDIRECT_REMOTE_USER"]);
-        if ($username != $_SERVER["REDIRECT_REMOTE_USER"]) {
+        if ($username == $_SERVER["REDIRECT_REMOTE_USER"]) {
+          $authenticated = true;
+        } else {
           return false;
         }
+      } elseif ($use_kerberos_only) {
+        return false;
       }
     }
-    else if ( empty($passwd) || preg_match('/[\x00-\x19]/',$passwd) ) {
+
-      // See http://www.php.net/manual/en/function.ldap-bind.php#73718 for more background
+    if (!$authenticated) {
-      dbg_error_log( 'LDAP', 'drivers_ldap : user %s supplied empty or invalid password: login rejected', $dnUser );
+      if ( empty($passwd) || preg_match('/[\x00-\x19]/',$passwd) ) {
-      return false;
+        // See http://www.php.net/manual/en/function.ldap-bind.php#73718 for more background
-    }
+        dbg_error_log( 'LDAP', 'drivers_ldap : user %s supplied empty or invalid password: login rejected', $dnUser );
-    else {
-      if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) {
-        dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s ", $dnUser );
         return false;
       }
+      else {
+        if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) {
+          dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s ", $dnUser );
+          return false;
+        }
+      }
     }
 
     dbg_error_log( "LDAP", "drivers_ldap : Bound to user %s using password %s", $dnUser,
@@ -413,10 +485,12 @@ function LDAP_check($username, $password ){
     if( $ldap_timestamp <= $db_timestamp ) {
         return $principal; // no need to update
     }
+
     // we will need to update the user record
+    dbg_error_log( "LDAP", "user %s has been modified in LDAP, we need to update our DB", $username );
   }
   else {
-    dbg_error_log( "LDAP", "user %s doesn't exist in local DB, we need to create it",$username );
+    dbg_error_log( "LDAP", "user %s doesn't exist in local DB, we need to create it", $username );
   }
   $principal->setUsername($username);
 
@@ -443,91 +517,137 @@ function fix_unique_member($list) {
 */
 function sync_LDAP_groups(){
   global $c;
+
+  // Can only sync if we know where to find the groups.
+  if (! isset($c->authenticate_hook['config']['baseDNGroups']) )
+      return;
+
   $ldapDriver = getStaticLdap();
   if ( ! $ldapDriver->valid ) return;
 
   $mapping = $c->authenticate_hook['config']['group_mapping_field'];
-  //$attributes = array('cn','modifyTimestamp','memberUid');
+
+  // Old config (pre 1.1.13) used "username" as the group name, if that is in
+  // use, copy it to the new name: name.
+  if ( ! isset($mapping['name']) && isset($mapping['username']) ) {
+      $mapping['name'] = $mapping['username'];
+      unset($mapping['username']);
+  }
+
+  // Set sane defaults.
+  if (! isset($mapping['name']))
+      $mapping['name'] = 'cn';
+  if (! isset($mapping['members']))
+      $mapping['members'] = 'member';
+
   $attributes = array_values_mapping($mapping);
   $ldap_groups_tmp = $ldapDriver->getAllGroups($attributes);
 
   if ( sizeof($ldap_groups_tmp) == 0 ) return;
 
   $member_field = $mapping['members'];
-  $dnfix = isset($c->authenticate_hook['config']['group_member_dnfix']) && $c->authenticate_hook['config']['group_member_dnfix'];
 
-  foreach($ldap_groups_tmp as $key => $ldap_group){
+  $dnfix = isset($c->authenticate_hook['config']['group_member_dnfix'])
-    $group_mapping = $ldap_group[$mapping['username']];
+      && $c->authenticate_hook['config']['group_member_dnfix'];
-    $ldap_groups_info[$group_mapping] = $ldap_group;
+
-    if ( is_array($ldap_groups_info[$group_mapping][$member_field]) ) {
+  foreach ($ldap_groups_tmp as $key => $ldap_group) {
-      unset( $ldap_groups_info[$group_mapping][$member_field]['count'] );
+    $group_name = $ldap_group[$mapping['name']];
-    }
+
-    else {
+    if ( isset($ldap_group[$member_field]) ) {
-      $ldap_groups_info[$group_mapping][$member_field] = array($ldap_groups_info[$group_mapping][$member_field]);
+      if ( is_array($ldap_group[$member_field]) ) {
+        unset( $ldap_group[$member_field]['count'] );
+      } else {
+        $ldap_group[$member_field] = array($ldap_group[$member_field]);
+      }
     }
+
+    $ldap_groups_info[$group_name] = $ldap_group;
     unset($ldap_groups_tmp[$key]);
   }
+
   $db_groups = array();
   $db_group_members = array();
-  $qry = new AwlQuery( "SELECT g.username AS group_name, member.username AS member_name FROM dav_principal g LEFT JOIN group_member ON (g.principal_id=group_member.group_id) LEFT JOIN dav_principal member  ON (member.principal_id=group_member.member_id) WHERE g.type_id = 3");
+
+  $qry = new AwlQuery( "
+      SELECT g.username AS group_name, member.username AS member_name
+      FROM dav_principal g
+          LEFT JOIN group_member ON (g.principal_id = group_member.group_id)
+          LEFT JOIN dav_principal member ON
+              (member.principal_id = group_member.member_id)
+      WHERE g.type_id = 3
+  ");
+
   $qry->Exec('sync_LDAP',__LINE__,__FILE__);
-  while($db_group = $qry->Fetch()) {
+
-    $db_groups[$db_group->group_name] = $db_group->group_name;
+  while ($db_group = $qry->Fetch()) {
+    $db_groups[$db_group->group_name]          = $db_group->group_name;
     $db_group_members[$db_group->group_name][] = $db_group->member_name;
   }
 
   $ldap_groups = array_keys($ldap_groups_info);
 
-  // users only in ldap
+  // Groups only in LDAP or in both LDAP and DB. To be created or updated.
-  $groups_to_create = array_diff($ldap_groups,$db_groups);
+  $groups_to_create = array_merge(
+                          array_diff($ldap_groups, $db_groups),
+                          array_intersect($db_groups, $ldap_groups));
 
-  // users only in db
+  // Groups only in DB. To be disabled..
-  $groups_to_deactivate = array_diff($db_groups,$ldap_groups);
+  $groups_to_deactivate = array_diff($db_groups, $ldap_groups);
 
-  // users present in ldap and in the db
+  // Groups where nothing was done
-  $groups_to_update = array_intersect($db_groups,$ldap_groups);
-
-  // groups where nothing was done
   $groups_nothing_done[] = null;
 
-  if ( sizeof ( $groups_to_create ) ){
+  if ( sizeof ( $groups_to_create ) ) {
     $validUserFields = awl_get_fields('usr');
+
     foreach ( $groups_to_create as $k => $group ){
-      if ( isset($c->do_not_sync_group_from_ldap) && isset($c->do_not_sync_group_from_ldap[$group]) ){
+      if ( isset($c->do_not_sync_group_from_ldap)
+          && isset($c->do_not_sync_group_from_ldap[$group]) ) {
         unset($groups_to_create[$k]);
         $groups_nothing_done[] = $group;
+
         continue;
       }
 
+      dbg_error_log( "LDAP", "Syncing group %s", $group );
       $user = (object) array();
 
-      if ( isset($c->authenticate_hook['config']['default_value']) && is_array($c->authenticate_hook['config']['default_value']) ) {
+      if ( isset($c->authenticate_hook['config']['default_value'])
+          && is_array($c->authenticate_hook['config']['default_value']) ) {
         foreach ( $c->authenticate_hook['config']['default_value'] as $field => $value ) {
           if ( isset($validUserFields[$field]) ) {
-            $user->{$field} =  $value;
+            $user->{$field} = $value;
             dbg_error_log( "LDAP", "Setting usr->%s to %s from configured defaults", $field, $value );
           }
         }
       }
+
       $user->user_no = 0;
       $ldap_values = $ldap_groups_info[$group];
+
       foreach ( $mapping as $field => $value ) {
         dbg_error_log( "LDAP", "Considering copying %s", $field );
-        if ( isset($validUserFields[$field]) ) {
+        if ( isset($validUserFields[$field]) && isset($ldap_values[$value]) ) {
-          $user->{$field} =  $ldap_values[$value];
+          $user->{$field} = $ldap_values[$value];
           dbg_error_log( "LDAP", "Setting usr->%s to %s from LDAP field %s", $field, $ldap_values[$value], $value );
         }
       }
-      if ($user->fullname=="") {
+
+      // A sane default for the fullname is the group name.
+      if (! isset($user->fullname) || $user->fullname == "") {
         $user->fullname = $group;
       }
-      if ($user->displayname=="") {
+
-        $user->displayname = $group;
+      // A sane default for the displayname is the fullname (which might be
+      // the group name).
+      if (! isset($user->displayname) || $user->displayname == "") {
+        $user->displayname = $user->fullname;
       }
+
       $user->username = $group;
       $user->updated = "now";  /** @todo Use the 'updated' timestamp from LDAP for groups too */
 
-      $principal = new Principal('username',$group);
+      $principal = new Principal('username', $group);
       if ( $principal->Exists() ) {
         $principal->Update($user);
       }
@@ -535,37 +655,133 @@ function sync_LDAP_groups(){
         $principal->Create($user);
       }
 
-      $qry = new AwlQuery( "UPDATE dav_principal set type_id = 3 WHERE username=:group ",array(':group'=>$group) );
+      $qry = new AwlQuery( "
+          UPDATE dav_principal
+          SET type_id = 3
+          WHERE username = :group",
+          array(':group' => $group) );
       $qry->Exec('sync_LDAP',__LINE__,__FILE__);
+
       Principal::cacheDelete('username', $group);
-      // mark group for updating, so users get synced
+
-      $groups_to_update[] = $group;
+      // mark group for sync'ing the members
+      $groups_to_sync_members[] = $group;
     }
-    $c->messages[] = sprintf( i18n('- creating groups : %s'), join(', ',$groups_to_create) );
+
+    $c->messages[] = sprintf( i18n('- creating groups : %s'), join(', ', $groups_to_create) );
   }
 
-  if ( sizeof ( $groups_to_update ) ){
+  if ( sizeof ( $groups_to_sync_members ) ){
-    $c->messages[] = sprintf(i18n('- updating groups : %s'),join(', ',$groups_to_update));
+    $c->messages[] = sprintf(i18n('- updating groups : %s'), join(', ', $groups_to_sync_members));
-    foreach ( $groups_to_update as $group ){
+
-      $db_members = array_values ( $db_group_members[$group] );
+    // Support the old name of user_mapping_field..
-      $ldap_members = array_values ( $ldap_groups_info[$group][$member_field] );
+    $user_mapping = NULL;
-      if ( $member_field == 'uniqueMember' || $dnfix ) {
+    if (isset($c->authenticate_hook['config']['user_mapping_field'])) {
-        $ldap_members = fix_unique_member( $ldap_members );
+      $user_mapping = $c->authenticate_hook['config']['user_mapping_field'];
+    } else if (isset($c->authenticate_hook['config']['mapping_field'])) {
+      $user_mapping = $c->authenticate_hook['config']['mapping_field'];
+    }
+
+    // Used if the group members are DNs and we need to do LDAP lookups.
+    $query = $ldapDriver->ldap_query_one;
+    $username_ldap_attribute = $user_mapping['username'];
+    $filter = $ldapDriver->filterUsers;
+
+    foreach ( $groups_to_sync_members as $group ) {
+      $db_members = isset($db_group_members[$group])
+          && is_array($db_group_members[$group])
+          ? array_values( $db_group_members[$group] )
+          : array();
+      $ldap_members = isset ( $ldap_groups_info[$group][$member_field] )
+          ? array_values ( $ldap_groups_info[$group][$member_field] )
+          : array();
+
+      $ldap_members_tmp = array();
+
+      foreach ( $ldap_members as $member ) {
+          dbg_error_log( "LDAP", "Considering adding %s to group %s", $member, $group );
+
+          if (isset($user_mapping['username'])
+              && preg_match('/=/', $member)) {
+              // The member from LDAP has an = in it, assume it is a DN.
+
+              if (preg_match("/^$username_ldap_attribute=/", $member)) {
+                  // If the member record starts with the mapping field, we
+                  // don't need to fetch from LDAP. Win.
+
+                  $ldap_members_tmp[] = ldap_explode_dn($member,1)[0];
+
+              } else {
+                  // The attribute isn't at the start of the member name,
+                  // off to LDAP we go.
+                  // NOTE: We could cache all the person records fetched
+                  //       in sync_LDAP and use more memory but not need
+                  //       anymore trips to LDAP.
+
+                  $entry = $query($ldapDriver->connect, $member, $filter,
+                                     array($username_ldap_attribute));
+                  $ldap_user_entry
+                      = ldap_first_entry($ldapDriver->connect, $entry);
+
+                  if (! $ldap_user_entry) {
+                      dbg_error_log( "ERROR", "%s not found in LDAP, not adding to group %s", $member, $group );
+                  } else {
+                      $ldap_user_attributes
+                          = ldap_get_attributes($ldapDriver->connect,
+                                                $ldap_user_entry);
+
+                     $ldap_members_tmp[]
+                         = $ldap_user_attributes[$username_ldap_attribute][0];
+                  }
+              }
+          } else {
+            // No need to rewrite.
+            $ldap_members_tmp[] = $member;
+          }
+
+          $ldap_members = $ldap_members_tmp;
       }
+
       $add_users = array_diff ( $ldap_members, $db_members );
       if ( sizeof ( $add_users ) ){
         $c->messages[] = sprintf(i18n('- adding %s to group : %s'),join(', ', $add_users ), $group);
-        foreach ( $add_users as $member ){
+
-          $qry = new AwlQuery( "INSERT INTO group_member SELECT g.principal_id AS group_id,u.principal_id AS member_id FROM dav_principal g, dav_principal u WHERE g.username=:group AND u.username=:member",array (':group'=>$group,':member'=>$member) );
+        foreach ( $add_users as $member ) {
+          if ( isset($c->do_not_sync_from_ldap)
+            && isset($c->do_not_sync_from_ldap[$member]) ) {
+            dbg_error_log( "ERROR", "drivers_ldap : Skipped adding %s to %s", $member, $group);
+
+            continue;
+          }
+
+          $qry = new AwlQuery( "
+              INSERT INTO group_member
+                  SELECT g.principal_id AS group_id, u.principal_id AS member_id
+                  FROM dav_principal g, dav_principal u
+                  WHERE g.username = :group
+                      AND u.username = :member",
+              array (':group' => $group, ':member' => $member) );
+
           $qry->Exec('sync_LDAP_groups',__LINE__,__FILE__);
           Principal::cacheDelete('username', $member);
         }
       }
-      $remove_users = @array_flip( @array_flip( array_diff( $db_members, $ldap_members ) ));
+
-      if ( sizeof ( $remove_users ) ){
+      $remove_users = @array_flip( @array_flip( array_diff( $db_members,
+                                                            $ldap_members )));
+      if ( sizeof ( $remove_users ) ) {
         $c->messages[] = sprintf(i18n('- removing %s from group : %s'),join(', ', $remove_users ), $group);
-        foreach ( $remove_users as $member ){
+
-          $qry = new AwlQuery( "DELETE FROM group_member USING dav_principal g,dav_principal m WHERE group_id=g.principal_id AND member_id=m.principal_id AND g.username=:group AND m.username=:member",array (':group'=>$group,':member'=>$member) );
+        foreach ( $remove_users as $member ) {
+          $qry = new AwlQuery( "
+              DELETE FROM group_member
+              USING dav_principal g,dav_principal m
+              WHERE group_id = g.principal_id
+                AND member_id = m.principal_id
+                AND g.username = :group
+                AND m.username=:member",
+              array (':group' => $group , ':member' => $member) );
+
           $qry->Exec('sync_LDAP_groups',__LINE__,__FILE__);
           Principal::cacheDelete('username', $member);
         }
@@ -573,20 +789,31 @@ function sync_LDAP_groups(){
     }
   }
 
-  if ( sizeof ( $groups_to_deactivate ) ){
+  if ( sizeof ( $groups_to_deactivate ) ) {
-    foreach ( $groups_to_deactivate as $k => $group ){
+    foreach ( $groups_to_deactivate as $k => $group ) {
-      if ( isset($c->do_not_sync_group_from_ldap) && isset($c->do_not_sync_group_from_ldap[$group]) ){
+      if ( isset($c->do_not_sync_group_from_ldap)
+           && isset($c->do_not_sync_group_from_ldap[$group]) ) {
         unset($groups_to_deactivate[$k]);
         $groups_nothing_done[] = $group;
+
       } else {
-        $qry = new AwlQuery( 'UPDATE dav_principal SET user_active=FALSE WHERE username=:group AND type_id = 3',array(':group'=>$group) );
+        $qry = new AwlQuery( '
+            UPDATE dav_principal
+            SET user_active = FALSE
+            WHERE username = :group
+              AND type_id = 3',
+            array(':group' => $group) );
         $qry->Exec('sync_LDAP',__LINE__,__FILE__);
-        Principal::cacheFlush('username=:group AND type_id = 3', array(':group'=>$group) );
+
+        Principal::cacheFlush('username=:group AND type_id = 3',
+                              array(':group' => $group) );
       }
     }
+
     if ( sizeof($groups_to_deactivate) )
       $c->messages[] = sprintf(i18n('- deactivated groups : %s'), join(', ',$groups_to_deactivate));
   }
+
   if ( sizeof($groups_nothing_done) )
     $c->messages[] = sprintf( i18n('- nothing done on : %s'), join(', ',$groups_nothing_done) );
 
@@ -600,7 +827,14 @@ function sync_LDAP(){
   $ldapDriver = getStaticLdap();
   if ( ! $ldapDriver->valid ) return;
 
-  $mapping = $c->authenticate_hook['config']['mapping_field'];
+  // Support the old name of user_mapping_field.
+  $mapping = NULL;
+  if (isset($c->authenticate_hook['config']['user_mapping_field'])) {
+      $mapping = $c->authenticate_hook['config']['user_mapping_field'];
+  } else if (isset($c->authenticate_hook['config']['mapping_field'])) {
+      $mapping = $c->authenticate_hook['config']['mapping_field'];
+  }
+
   $attributes = array_values_mapping($mapping);
   $ldap_users_tmp = $ldapDriver->getAllUsers($attributes);
 
@@ -626,6 +860,8 @@ function sync_LDAP(){
   $users_to_deactivate = array_diff($db_users,$ldap_users);
   // users present in ldap and in the db
   $users_to_update = array_intersect($db_users,$ldap_users);
+  // users not modified
+  $users_nothing_done = array();
 
   // creation of all users;
   if ( sizeof($users_to_create) ) {
@@ -651,7 +887,7 @@ function sync_LDAP(){
             $$k = substr($ldap_timestamp,$v[0],$v[1]);
         $ldap_timestamp = $Y.$m.$d.$H.$M.$S;
       }
-      else if ( preg_match('{^(\d{8})(\d{6})(Z)?$', $ldap_timestamp, $matches ) ) {
+      else if ( preg_match('{^(\d{8})(\d{6})(Z)?$}', $ldap_timestamp, $matches ) ) {
         $ldap_timestamp = $matches[1].'T'.$matches[2].$matches[3];
       }
       else if ( empty($ldap_timestamp) ) {

inc/drivers_rimap.php

@@ -1,112 +0,0 @@
-<?php
-/**
-* Authentication against IMAP using the imap_open function
-*
-* @package   davical
-* @category  Technical
-* @subpackage authentication/drivers
-* @author    Oliver Schulze <oliver@samera.com.py>,
-*            Andrew McMillan <andrew@mcmillan.net.nz>
-* @copyright Based on Eric Seigne script drivers_squid_pam.php
-* @license   http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
-*/
-
-// The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
-if (!function_exists('imap_open')) {
-  die("drivers_rimap: php-imap required.");
-}
-
-require_once("auth-functions.php");
-
-/**
- * Plugin to authenticate against IMAP
- */
-class rimapPamDriver
-{
-  /**#@+
-  * @access private
-  */
-
-  /**#@-*/
-
-
-  /**
-  * The constructor
-  *
-  * @param string $imap_url formated for imap_open()
-  */
-  function __construct($imap_url)
-  {
-      global $c;
-      if (empty($imap_url)){
-          $c->messages[] = sprintf(i18n('drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php'));
-          $this->valid=false;
-          return ;
-      }
-  }
-}
-
-
-/**
-* Check the username / password against the IMAP server, provision from username and email_base
-*/
-function RIMAP_check($username, $password ){
-  global $c;
-
-  $imap_username = $username;
-  if ( function_exists('mb_convert_encoding') ) {
-    $imap_username = mb_convert_encoding($imap_username, "UTF7-IMAP",mb_detect_encoding($imap_username));
-  }
-  else {
-    $imap_username = imap_utf7_encode($imap_username);
-  }
-
-  //$imap_url = '{localhost:143/imap/notls}';
-  //$imap_url = '{localhost:993/imap/ssl/novalidate-cert}';
-  $imap_url = $c->authenticate_hook['config']['imap_url'];
-  $auth_result = "ERR";
-
-  $imap_stream = @imap_open($imap_url, $imap_username, $password, OP_HALFOPEN);
-  //print_r(imap_errors());
-  if ( $imap_stream ) {
-    // disconnect
-    imap_close($imap_stream);
-    // login ok
-    $auth_result = "OK";
-  }
-
-  if ( $auth_result == "OK") {
-    $principal = new Principal('username',$username);
-    if ( ! $principal->Exists() ) {
-      dbg_error_log( "PAM", "Principal '%s' doesn't exist in local DB, we need to create it",$username );
-      if ( strstr($username, '@') ) {
-        $name_arr = explode('@', $username);
-        $fullname = ucfirst(strtolower($name_arr[0]));
-        $email = $username;
-      }
-      else {
-        $fullname = ucfirst(strtolower($username));
-        $email = $username . "@" . $c->authenticate_hook['config']['email_base'];
-      }
-
-      $principal->Create( array(
-                      'username' => $username,
-                      'user_active' => true,
-                      'email' => $email,
-                      'fullname' => ucfirst($fullname)
-              ));
-      if ( ! $principal->Exists() ) {
-        dbg_error_log( "PAM", "Unable to create local principal for '%s'", $username );
-        return false;
-      }
-      CreateHomeCollections($username);
-      CreateDefaultRelationships($username);
-    }
-    return $principal;
-  }
-  else {
-    dbg_error_log( "PAM", "User %s is not a valid username (or password was wrong)", $username );
-    return false;
-  }
-
-}

inc/external-fetch.php

@@ -14,7 +14,7 @@ function create_external ( $path,$is_calendar,$is_addressbook )
 {
   global $request;
   if ( ! function_exists ( "curl_init" ) ) {
-    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    dbg_error_log("ERROR", "external: external resource cannot be fetched without curl, please install PHP curl");
     $request->DoResponse( 503, translate('PHP curl support is required for external binds') );
     return ;
   }
@@ -42,7 +42,7 @@ function create_external ( $path,$is_calendar,$is_addressbook )
 function fetch_external ( $bind_id, $min_age, $ua_string )
 {
   if ( ! function_exists ( "curl_init" ) ) {
-    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    dbg_error_log("ERROR", "external: external resource cannot be fetched without curl, please install PHP curl");
     $request->DoResponse( 503, translate('PHP curl support is required for external binds') );
     return ;
   }
@@ -114,7 +114,7 @@ function update_external ( $request )
   if ( $c->external_refresh < 1 )
     return ;
   if ( ! function_exists ( "curl_init" ) ) {
-    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    dbg_error_log("ERROR", "external: external resource cannot be fetched without curl, please install curl");
     return ;
   }
   $sql = 'SELECT bind_id, external_url as url from dav_binding LEFT JOIN collection ON (collection.collection_id=bound_source_id) WHERE dav_binding.dav_name = :dav_name AND ( collection.modified + interval :interval < NOW() OR collection.modified is NULL )';

inc/iSchedule-POST.php

@@ -17,6 +17,32 @@ include_once('freebusy-functions.php');
 
 
 class FakeSession {
+  private $user_active;
+  private $created;
+  private $modified;
+  private $password;
+  private $fullname;
+  private $email_ok;
+  private $date_format_type;
+  private $locale;
+  private $type_id;
+  private $type_label;
+  private $displayname;
+  private $default_privileges;
+  private $is_principal;
+  private $is_calendar;
+  private $is_addressbook;
+  private $collection_id;
+  private $resourcetypes;
+  private $privileges;
+  private $username;
+  public $user_no;
+  public $principal_id;
+  private $logged_in;
+  private $email;
+  private $dav_name;
+  private $principal;
+
   function __construct($principal) {
     // Assign each field in the selected record to the object
     foreach( $principal AS $k => $v ) {
@@ -82,11 +108,16 @@ if ( $d->validateRequest ( ) ) {
     // TODO: add originator addressbook and existing event lookup as whitelist
   }
   $method =  $ical->GetPValue('METHOD');
+
   $content_type = explode ( ';', $_SERVER['CONTENT_TYPE'] );
   if ( $content_type[0] != 'text/calendar' )
     $reply->XMLResponse( 406, 'content must be text/calendar' );
+
   $content_parts = Array ();
   foreach ( $content_type as $v ) {
+    if ($v == 'text/calendar')
+      continue;
+
     list ( $a, $b ) = explode ( '=', trim ( $v ), 2 );
     $content_parts[strtolower($a)] = strtoupper($b);
   }

inc/iSchedule.php

@@ -33,7 +33,16 @@ class iSchedule
   private $failed = false;
   private $failOnError = true;
   private $subdomainsOK = true;
-  private $remote_public_key ;
+  private $remote_public_key;
+  private $remote_ssl;
+  private $body_cannon;
+  private $header_cannon;
+  private $remote_server;
+  private $remote_selector;
+  private $signed_headers;
+  private $signed_length;
+  private $remote_user_rule;
+
   private $required_headers = Array ( 'host',  // draft 01 section 7.1 required headers
                                       'originator',
                                       'recipient',
@@ -79,13 +88,14 @@ class iSchedule
   {
     global $icfg;
     // TODO handle parents of subdomains and procuration records
-    if ( $icfg [ $this->remote_selector . '._domainkey.' . $this->remote_server ] )
+    $dns_str = $this->remote_selector . '._domainkey.' . $this->remote_server;
-    {
+
-      $this->dk = $icfg [ $this->remote_selector . '._domainkey.' . $this->remote_server ];
+    if ( isset($icfg) && isset($icfg[$dns_str]) ) {
+      $this->dk = $icfg[$dns_str];
       return true;
     }
 
-    $dkim = dns_get_record ( $this->remote_selector . '._domainkey.' . $this->remote_server , DNS_TXT );
+    $dkim = dns_get_record($dns_str, DNS_TXT);
     if ( count ( $dkim ) > 0 )
     {
       $this->dk = $dkim [ 0 ] [ 'txt' ];
@@ -155,17 +165,18 @@ class iSchedule
       dbg_error_log( 'ischedule', 'validateKey ERROR: bad key algorythm, algo was:' . $this->parsed [ 'k' ] );
       return false; // we only speak rsa for now
     }
-    if ( isset ( $this->parsed [ 't' ] ) && ! preg_match ( '/^[y:s]+$/', $this->parsed [ 't' ] ) ) {
+
-      dbg_error_log( 'ischedule', 'validateKey ERROR: type mismatch' );
+    if (isset($this->parsed['t'])) {
-      return false;
+      if ( ! preg_match ( '/^[y:s]+$/', $this->parsed [ 't' ] ) ) {
-    }
+        dbg_error_log( 'ischedule', 'validateKey ERROR: type mismatch' );
-    else
+        return false;
-    {
+      }
       if ( preg_match ( '/y/', $this->parsed [ 't' ] ) )
         $this->failOnError = false;
       if ( preg_match ( '/s/', $this->parsed [ 't' ] ) )
         $this->subdomainsOK = false;
     }
+
     if ( isset ( $this->parsed [ 'g' ] ) )
       $this->remote_user_rule = $this->parsed [ 'g' ];
     else
@@ -180,7 +191,7 @@ class iSchedule
       $this->remote_public_key = $data;
     }
     else {
-      dbg_error_log( 'ischedule', 'validateKey ERROR: no key in dns record' . $this->parsed [ 'p' ] );
+      dbg_error_log( 'ischedule', 'validateKey ERROR: no key in dns record' );
       return false;
     }
     $this->failed = false;
@@ -193,7 +204,7 @@ class iSchedule
   function getServer ( )
   {
     global $icfg;
-    if ( isset($icfg) && $icfg [ $this->domain ] )
+    if ( isset($icfg) && isset($icfg[$this->domain]) )
     {
       $this->remote_server = $icfg [ $this->domain ] [ 'server' ];
       $this->remote_port = $icfg [ $this->domain ] [ 'port' ];
@@ -208,26 +219,22 @@ class iSchedule
       $len = 3; // some country code tlds should have 3 components
     if ( $this->domain == 'mycaldav' || $this->domain == 'altcaldav' )
       $len = 1;
+
     while ( count ( $parts ) >= $len )
     {
       $r = dns_get_record ( '_ischedules._tcp.' . implode ( '.', $parts ) , DNS_SRV );
-      if ($r == false)
-        $r = Array();
 
-      {
+      if (is_array($r) && count($r) > 0) {
         $remote_server            = $r [ 0 ] [ 'target' ];
         $remote_port              = $r [ 0 ] [ 'port' ];
         $this->remote_ssl = true;
         break;
       }
-      if ( ! isset ( $remote_server ) )
-      {
-        $r = dns_get_record ( '_ischedule._tcp.' . implode ( '.', $parts ) , DNS_SRV );
-        if ($r == false)
-          $r = Array();
 
-        if ( 0 < count ( $r ) )
+      if ( ! isset ( $remote_server ) ) {
-        {
+        $r = dns_get_record ( '_ischedule._tcp.' . implode ( '.', $parts ) , DNS_SRV );
+
+        if (is_array($r) && count($r) > 0) {
           $remote_server            = $r [ 0 ] [ 'target' ];
           $remote_port              = $r [ 0 ] [ 'port' ];
           break;
@@ -235,6 +242,7 @@ class iSchedule
       }
       array_shift ( $parts );
     }
+
     if ( ! isset ( $remote_server ) )
     {
       if ( $this->try_anyway == true )
@@ -513,31 +521,39 @@ class iSchedule
 
     $this->failed = true;
     $tags = preg_split ( '/;[\s\t]/', $sig );
+
     foreach ( $tags as $v )
     {
       list($key,$value) = preg_split ( '/=/', $v, 2 );
       $dkim[$key] = $value;
     }
+
     // the canonicalization method is currently undefined as of draft-01 of the iSchedule spec
     // but it does define the value, it should be simple-http.  RFC4871 also defines two methods
     // simple and relaxed, simple is probably the same as simple http
     // relaxed allows for header case folding and whitespace folding, see section 3.4.4 of RFC4871
     if ( ! preg_match ( '{(simple|simple-http|relaxed)(/(simple|simple-http|relaxed))?}', $dkim['c'], $matches ) ) // canonicalization method
       return 'bad canonicalization:' . $dkim['c'] ;
+
     if ( count ( $matches ) > 2 )
       $this->body_cannon = $matches[2];
     else
       $this->body_cannon = $matches[1];
+
     $this->header_cannon = $matches[1];
-    // signing algorythm REQUIRED
+
+    // signing algorithm REQUIRED
     if ( $dkim['a'] != 'rsa-sha1' && $dkim['a'] != 'rsa-sha256' ) // we only support the minimum required
-      return 'bad signing algorythm:' . $dkim['a'] ;
+      return 'bad signing algorithm:' . $dkim['a'] ;
+
     // query method to retrieve public key, could/should we add https to the spec?  REQUIRED
     if ( $dkim['q'] != 'dns/txt' )
       return 'bad query method';
+
     // domain of the signing entity REQUIRED
     if ( ! isset ( $dkim['d'] ) )
       return 'missing signing domain';
+
     $this->remote_server = $dkim['d'];
     // identity of signing AGENT, OPTIONAL
     if ( isset ( $dkim['i'] ) )
@@ -549,10 +565,12 @@ class iSchedule
       if ( strstr ( $dkim [ 'i' ], '@' ) )
         $this->remote_user = substr ( $dkim [ 'i' ], 0, strpos ( $dkim [ 'i' ], '@' ) - 1 );
     }
+
     // selector used to retrieve public key REQUIRED
     if ( ! isset ( $dkim['s'] ) )
       return 'missing selector';
     $this->remote_selector = $dkim['s'];
+
     // signed header fields, colon seperated  REQUIRED
     if ( ! isset ( $dkim['h'] ) )
       return 'missing list of signed headers';
@@ -565,18 +583,23 @@ class iSchedule
       if ( in_array ( strtolower ( $h ), $this->disallowed_headers ) )
         return "$h is NOT allowed in signed header fields per RFC4871 or iSchedule";
     }
+
     foreach ( $this->required_headers as $h )
       if ( ! in_array ( strtolower ( $h ), $sh ) )
         return "$h is REQUIRED but missing in signed header fields per iSchedule";
+
     // body hash REQUIRED
     if ( ! isset ( $dkim['bh'] ) )
       return 'missing body signature';
+
     // signed header hash REQUIRED
     if ( ! isset ( $dkim['b'] ) )
       return 'missing signature in b field';
+
     // length of body used for signing
     if ( isset ( $dkim['l'] ) )
       $this->signed_length = $dkim['l'];
+
     $this->failed = false;
     $this->DKSig = $dkim;
     return true;

inc/interactive-page.php

@@ -38,6 +38,7 @@ $user_menu->AddOption(translate('View My Details'),$c->base_url.'/admin.php?acti
 $user_menu->AddOption(translate('List Users'),$c->base_url.'/admin.php?action=browse&t=principal&type=1');
 $user_menu->AddOption(translate('List Resources'),$c->base_url.'/admin.php?action=browse&t=principal&type=2');
 $user_menu->AddOption(translate('List Groups'),$c->base_url.'/admin.php?action=browse&t=principal&type=3');
+$user_menu->AddOption(translate('List Rooms'),$c->base_url.'/admin.php?action=browse&t=principal&type=4');
 
 $admin_menu = new MenuSet('submenu', 'submenu', 'submenu_active');
 if ( $session->AllowedTo('Admin' )) {

inc/schedule-functions.php

@@ -312,7 +312,7 @@ function processItipCancel( vCalendar $vcal, vProperty $attendee, WritableCollec
 
   if ( $attendee_calendar->actualDeleteCalendarMember($row->dav_name) === false ) {
     dbg_error_log('ERROR', 'Could not delete calendar member %s for %s',
-                                    $row->dav_name(), $attendee->Value());
+                                    $row->dav_name, $attendee->Value());
     trace_bug('Failed to write scheduling resource.');
     return '5.2';
   }

inc/ui/collection-edit.php

@@ -463,7 +463,7 @@ EOTEMPLATE;
   if ($can_write_collection) {
     $browser->AddColumn( 'ticket_id', translate('Ticket ID'), '', '' );
   }
-  $browser->AddColumn( 'target', translate('Target'), '', '<td style="white-space:nowrap;">%s</td>', "'".$c->base_url.'/caldav.php'."' ||COALESCE(d.dav_name,c.dav_name)" );
+  $browser->AddColumn( 'target', translate('Target'), '', '<td style="white-space:nowrap;">%s</td>', "'".$c->base_url.'/public.php'."' ||COALESCE(d.dav_name,c.dav_name)" );
   $browser->AddColumn( 'expiry', translate('Expires'), '', '', 'TO_CHAR(expires,\'YYYYMMDD"T"HH:MI:SS\')');
   $browser->AddColumn( 'privs', translate('Privileges'), '', '', "privileges_list(privileges)" );
   if ($can_write_collection) {

inc/ui/principal-edit.php

@@ -69,8 +69,13 @@ function handle_subaction( $subaction ) {
           dbg_error_log('admin-principal-edit',':handle_action: Allowed to delete collection %s for principal %d', $_GET['collection_id'], $id );
           $qry = new AwlQuery('DELETE FROM collection WHERE collection_id=:collection_id AND user_no = (select user_no from principal where principal_id = :principal_id )', array( ':collection_id' => intval($_GET['collection_id']), ':principal_id' => $id));
           if ( $qry->Exec() ) {
-            $c->messages[] = i18n('Collection deleted.');
+            if ( $qry->rows() == 1) {
-            return true;
+              $c->messages[] = i18n('Collection deleted.');
+              return true;
+            } else {
+              $c->messages[] = i18n('Collection deletion failed.');
+              return false;
+            }
           }
           else {
             $c->messages[] = i18n('There was an error writing to the database.');
@@ -121,8 +126,13 @@ function handle_subaction( $subaction ) {
           dbg_error_log('admin-principal-edit',':handle_action: Allowed to delete ticket "%s" for principal %d', $_GET['ticket_id'], $id );
           $qry = new AwlQuery('DELETE FROM access_ticket WHERE ticket_id=:ticket_id AND dav_owner_id = :dav_owner_id', array( ':ticket_id' => $_GET['ticket_id'], ':dav_owner_id' => $id));
           if ( $qry->Exec() ) {
-            $c->messages[] = i18n('Access ticket deleted.');
+            if ($qry->rows() == 1) {
-            return true;
+              $c->messages[] = i18n('Access ticket deleted.');
+              return true;
+            } else {
+              $c->messages[] = i18n('Access ticket deletion failed.');
+              return false;
+            }
           }
           else {
             $c->messages[] = i18n('There was an error writing to the database.');
@@ -148,8 +158,13 @@ function handle_subaction( $subaction ) {
           dbg_error_log('admin-principal-edit',':handle_action: Allowed to delete binding "%s" for principal %d', $_GET['bind_id'], $id );
           $qry = new AwlQuery('DELETE FROM dav_binding WHERE bind_id=:bind_id AND dav_owner_id = :dav_owner_id',  array( ':bind_id' => $_GET['bind_id'], ':dav_owner_id' => $id));
           if ( $qry->Exec() ) {
-            $c->messages[] = i18n('Binding deleted.');
+            if ( $qry->rows() == 1 ) {
-            return true;
+              $c->messages[] = i18n('Binding deleted.');
+              return true;
+            } else {
+              $c->messages[] = i18n('Binding deletion failed.');
+              return true;
+            }
           }
           else {
             $c->messages[] = i18n('There was an error writing to the database.');
@@ -327,8 +342,10 @@ function principal_editor() {
   }
 
   $admin_row_entry = '';
-  $default_passwd_row_entry  = '<tr> <th class="right">' . $prompt_password_1 . ':</th>  <td class="left">##newpass1.password.$pwstars##</td> </tr>';
+  if ($can_write_principal) {
-  $default_passwd_row_entry .= '<tr> <th class="right">' . $prompt_password_2 . ':</th>  <td class="left">##newpass2.password.$pwstars##</td> </tr>';
+    $default_passwd_row_entry  = '<tr> <th class="right">' . $prompt_password_1 . ':</th>  <td class="left">##newpass1.password.' . $pwstars . '##</td> </tr>';
+    $default_passwd_row_entry .= '<tr> <th class="right">' . $prompt_password_2 . ':</th>  <td class="left">##newpass2.password.' . $pwstars . '##</td> </tr>';
+  }
   $delete_principal_button = '';
   if ( $session->AllowedTo('Admin') ) {
     $passwd_row_entry = $default_passwd_row_entry;
@@ -337,12 +354,14 @@ function principal_editor() {
     if ( isset($id) )
       $delete_principal_button = '<a href="' . $c->base_url . '/admin.php?action=edit&t=principal&subaction=delete_principal&id='.$id.'" class="submit">' . translate("Delete Principal") . '</a>';
   } else {
-    if ( isset($c->password_change_override) ) {
+    if ($can_write_principal) {
-      $passwd_row_entry  = '<tr> <th class="right">' . $prompt_password_1 . ':</th>';
+      if ( isset($c->password_change_override) ) {
-      $passwd_row_entry .= '<td class="left"><a href="' . $c->password_change_override['href'] . '">';
+        $passwd_row_entry  = '<tr> <th class="right">' . $prompt_password_1 . ':</th>';
-      $passwd_row_entry .= $c->password_change_override['label']  . '</a></td> </tr>';
+        $passwd_row_entry .= '<td class="left"><a href="' . $c->password_change_override['href'] . '">';
-    } else {
+        $passwd_row_entry .= $c->password_change_override['label']  . '</a></td> </tr>';
-        $passwd_row_entry = $default_passwd_row_entry;
+      } else {
+          $passwd_row_entry = $default_passwd_row_entry;
+      }
     }
   }
 
@@ -405,7 +424,8 @@ function build_privileges_html( $ed, $fname ) {
   $btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Privileges to allow delivery of scheduling messages'));
   $btn_ss = htmlspecialchars(translate('Schedule Send'));    $btn_ss_title = htmlspecialchars(translate('Privileges to delegate scheduling decisions'));
 
-  $privs_dec = bindec($ed->Value($fname));
+  $privs     = $ed->Value($fname);
+  $privs_dec = isset($privs) ? bindec($privs) : 0;
   $privileges_set = sprintf('<div id="privileges"><input type="hidden" name="%s[fake_privilege_for_input]" value="0">%s', $fname, "\n");
   for( $i=0; $i < count($privilege_names); $i++ ) {
     $privilege_set = ( (1 << $i) & $privs_dec ? ' CHECKED' : '');
@@ -495,9 +515,9 @@ function group_memberships_browser() {
 function group_row_editor() {
   global $c, $id, $editor, $can_write_principal;
   $grouprow = new Editor("Group Members", "group_member");
-  $sql = 'SELECT principal_id, coalesce(displayname,fullname,username) FROM dav_principal ';
+  $sql = 'SELECT principal_id, coalesce(displayname, fullname, username) FROM dav_principal ';
-  $sql .= 'WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = '.$id.') ';
+  $sql .= 'WHERE principal_id NOT IN (SELECT member_id FROM group_member WHERE group_id = ' . $id . ') ';
-  $sql .= 'AND principal_id != '.$id;
+  $sql .= 'AND principal_id != ' . $id . ' ';
   $sql .= 'ORDER BY 2';
   $grouprow->SetLookup( 'member_id', $sql);
   $grouprow->SetSubmitName( 'savegrouprow' );
@@ -937,7 +957,7 @@ function binding_row_editor() {
     $_POST['parent_container'] = $parent;
 
     //  external binds shouldn't ever point back to ourselves but they should be a valid http[s] url
-    $href = $_POST['source'];
+    $href = htmlspecialchars_decode($_POST['source']);
     if ( preg_match ( '{^(?:https?://|file:///)([^/]+)(:[0-9]\+)?/.+$}', $href, $matches )
         && strcasecmp( $matches[0], 'localhost' ) !== 0 && strcasecmp( $matches[0], '127.0.0.1' ) !== 0
         && strcasecmp( $matches[0], $_SERVER['SERVER_NAME'] ) !== 0 && strcasecmp( $matches[0], $_SERVER['SERVER_ADDR'] ) !== 0
@@ -1135,26 +1155,28 @@ if ( isset($id) && $id > 0 ) {
     $page_elements[] = confirm_delete_principal($delete_principal_confirmation_required, $editor->Value('displayname'));
 
 
-  $page_elements[] = group_memberships_browser();
+  if ($can_write_principal) {
-  if ( $editor->Value('type_id') == 3 ) {
+    $page_elements[] = group_memberships_browser();
-    $grouprow = group_row_editor();
+    if ( $editor->Value('type_id') == 3 ) {
-    $page_elements[] = group_members_browser();
+      $grouprow = group_row_editor();
+      $page_elements[] = group_members_browser();
+    }
+    $grantrow = grant_row_editor();
+    $page_elements[] = principal_grants_browser();
+    if ( isset($delete_grant_confirmation_required) ) $page_elements[] = confirm_delete_grant($delete_grant_confirmation_required);
+
+    $ticketrow = ticket_row_editor();
+    $page_elements[] = access_ticket_browser();
+    if ( isset($delete_ticket_confirmation_required) ) $page_elements[] = confirm_delete_ticket($delete_ticket_confirmation_required);
+
+    $page_elements[] = principal_collection_browser();
+    if ( isset($delete_collection_confirmation_required) ) $page_elements[] = confirm_delete_collection($delete_collection_confirmation_required);
+
+    $bindingrow = binding_row_editor();
+    $page_elements[] = bindings_to_other_browser();
+    if ( isset($delete_bind_in_confirmation_required) ) $page_elements[] = confirm_delete_bind_in($delete_bind_in_confirmation_required);
+
+    $page_elements[] = bindings_to_us_browser();
+    if ( isset($delete_binding_confirmation_required) ) $page_elements[] = confirm_delete_binding($delete_binding_confirmation_required);
   }
-  $grantrow = grant_row_editor();
-  $page_elements[] = principal_grants_browser();
-  if ( isset($delete_grant_confirmation_required) ) $page_elements[] = confirm_delete_grant($delete_grant_confirmation_required);
-
-  $ticketrow = ticket_row_editor();
-  $page_elements[] = access_ticket_browser();
-  if ( isset($delete_ticket_confirmation_required) ) $page_elements[] = confirm_delete_ticket($delete_ticket_confirmation_required);
-
-  $page_elements[] = principal_collection_browser();
-  if ( isset($delete_collection_confirmation_required) ) $page_elements[] = confirm_delete_collection($delete_collection_confirmation_required);
-
-  $bindingrow = binding_row_editor();
-  $page_elements[] = bindings_to_other_browser();
-  if ( isset($delete_bind_in_confirmation_required) ) $page_elements[] = confirm_delete_bind_in($delete_bind_in_confirmation_required);
-
-  $page_elements[] = bindings_to_us_browser();
-  if ( isset($delete_binding_confirmation_required) ) $page_elements[] = confirm_delete_binding($delete_binding_confirmation_required);
 }

inc/well-known.php

@@ -95,8 +95,8 @@ function ischedule_get ( )
         <scheme>mailto</scheme>
       </supported-recipient-uri-scheme-set>
       <max-content-length>102400</max-content-length>
-      <min-date-time>19910101T000000Z</min-date-time>
+      <min-date-time>00010101T000000Z</min-date-time>
-      <max-date-time>20381231T000000Z</max-date-time>
+      <max-date-time>99991231T000000Z</max-date-time>
       <max-instances>150</max-instances>
       <max-recipients>250</max-recipients>
 

po/ar.po

@@ -1,30 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Ahmed Hosni <ahmedhosni.contact@gmail.com>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Arabic (http://www.transifex.com/lkraav/davical/language/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : "
-"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"
+"n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -38,10 +37,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -51,7 +46,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -75,33 +70,32 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -116,6 +110,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -125,6 +122,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -157,8 +157,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +166,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr ""
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +202,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +246,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +278,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +354,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +373,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +467,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,9 +530,7 @@ msgstr ""
 msgid "Email Address"
 msgstr "بريد إلكتروني"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -542,6 +540,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -561,9 +563,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -637,19 +636,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +700,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +752,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -782,9 +779,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +811,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -846,9 +845,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +869,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +897,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +936,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +988,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1021,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1034,9 +1031,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1049,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1089,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1105,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1135,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1184,9 +1172,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1185,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1217,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1226,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1248,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1264,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1279,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1323,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1333,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1376,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1461,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1484,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1541,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1571,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1618,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1639,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1651,8 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr ""

po/ca.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # , 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Catalan (http://www.transifex.com/lkraav/davical/language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -38,10 +36,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr "- afegint %s al grup : %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- afegint usuaris %s al grup : %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- creant grups : %s"
@@ -51,8 +45,8 @@ msgid "- creating record for users :  %s"
 msgstr "- creant entrada per els usuaris: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- desactivar grups : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -75,33 +69,32 @@ msgid "- updating user records : %s"
 msgstr "- actualitzant entrades de usuari : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ALERTA: tots els events en aquest camí s'esborraran abans d'afegir tots els del fitxer ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -116,6 +109,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr "Ja existeix un recurs en aquest destí. "
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versió de la biblioteca AWL"
 
@@ -125,6 +121,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acció"
 
@@ -157,8 +156,7 @@ msgstr "Totes les dades de la col·lecció seran esborrades irrecuperablement."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Tots els events de l'usuari \"%s\" s'han esborrat i canviat per els del fitxer %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +165,7 @@ msgstr "Tots els privilegis"
 msgid "All requested changes were made."
 msgstr "Tots els canvis demanats s'han fet."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permetre consultes free/busy dirigies al propietary d'aquesta bústia de planificació"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +201,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +245,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +277,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +353,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +372,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +466,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,9 +529,7 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -542,6 +539,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -561,9 +562,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -637,19 +635,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +699,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +751,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -782,9 +778,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +810,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -846,9 +844,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +868,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +896,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +935,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +987,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1020,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1034,9 +1030,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1048,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1088,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1104,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1134,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1184,9 +1171,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1184,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1216,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1225,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1247,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1263,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1278,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1322,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1332,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1375,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1460,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1483,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1540,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1570,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1617,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1638,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1650,20 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
-"you."
 msgstr ""
+
+msgid "you should log on with the username and password that have been issued to you."
+msgstr ""
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ALERTA: tots els events en aquest camí s'esborraran abans d'afegir tots els del fitxer ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- afegint usuaris %s al grup : %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- desactivar grups : %s"

po/cs_CZ.po

@@ -1,29 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/lkraav/davical/language/cs_CZ/)\n"
+"Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -37,10 +35,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -50,7 +44,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -74,33 +68,32 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -115,6 +108,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -124,6 +120,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -156,8 +155,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -166,8 +164,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr ""
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -203,6 +200,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -244,10 +244,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -277,9 +276,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -352,15 +352,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -372,7 +371,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -465,8 +465,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -529,9 +528,7 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -541,6 +538,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -560,9 +561,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -636,19 +634,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -704,9 +698,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -757,6 +750,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -781,9 +777,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -814,6 +809,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -845,9 +843,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -872,23 +867,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -898,9 +895,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -939,6 +934,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -988,8 +986,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1022,8 +1019,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1033,9 +1029,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1054,8 +1047,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1094,14 +1087,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1114,8 +1103,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1145,8 +1133,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1183,9 +1170,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1198,30 +1183,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1233,8 +1215,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1243,18 +1224,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1270,16 +1246,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1288,13 +1262,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1304,8 +1277,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1349,8 +1321,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1359,38 +1331,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1409,9 +1374,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1495,9 +1459,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1520,8 +1482,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1577,8 +1539,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1607,54 +1569,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1668,11 +1616,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1690,14 +1637,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1706,7 +1649,8 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr ""

po/de.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 # Cyril Giraud <cgiraud@free.fr>, 2017
@@ -18,23 +18,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 11:42+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: German (http://www.transifex.com/lkraav/davical/language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -48,10 +46,6 @@ msgstr "*** unbekannt ***"
 msgid "- adding %s to group : %s"
 msgstr "- füge %s der Gruppe %s hinzu"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- füge Benutzer %s der Gruppe %s hinzu"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- erstelle Gruppen: %s"
@@ -61,8 +55,8 @@ msgid "- creating record for users :  %s"
 msgstr "- erstelle Eintrag für Benutzer: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- deaktiviere Gruppen: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -85,34 +79,50 @@ msgid "- updating user records : %s"
 msgstr "- aktualisiere Benutzereinträge: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Erklärung im DAViCal-Wiki</a>"
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Hilfe</h1>\n<p>Besuchen Sie die <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal-Homepage</a> oder schauen Sie \nin das <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal-Wiki</a> um Hilfe zu erhalten.</p>\n<p>Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über <a href=\"https://de.wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> im\nChannel <b>#davical</b> auf <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> besuchen\noder Ihre Frage an die <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal-Users-Mailingliste</a> schicken.</p>\n<p>Das <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">Archiv der Mailingliste\nkönnte ebenfalls interessant sein.</p>"
+msgstr ""
+"<h1>Hilfe</h1>\n"
+"<p>Besuchen Sie die <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal-Homepage</a> oder "
+"schauen Sie \n"
+"in das <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal-Wiki</a> um Hilfe zu erhalten."
+"</p>\n"
+"<p>Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über <a href=\"https://de."
+"wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> im\n"
+"Channel <b>#davical</b> auf <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> "
+"besuchen\n"
+"oder Ihre Frage an die <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
+"target=\"_blank\">DAViCal-Users-Mailingliste</a> schicken.</p>\n"
+"<p>Das <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">Archiv der Mailingliste\n"
+"könnte ebenfalls interessant sein.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Bitte anmelden</h1><p>Um auf %s zuzugreifen, müssen Sie sich mit dem Benutzernamen und dem Passwort anmelden, die ihnen zugeteilt wurden.</p><p>Um einen Zugang zu beantragen, schreiben Sie eine E-Mail an %s.</p>"
+"<h1>Bitte anmelden</h1><p>Um auf %s zuzugreifen, müssen Sie sich mit dem Benutzernamen und dem "
+"Passwort anmelden, die ihnen zugeteilt wurden.</p><p>Um einen Zugang zu beantragen, schreiben Sie eine "
+"E-Mail an %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten"
@@ -126,6 +136,9 @@ msgstr "Eine Sammlung kann nicht gleichzeitig Kalender und Adressbuch sein. "
 msgid "A resource already exists at the destination."
 msgstr "Die Ressource existiert bereits am Ziel."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Version der AWL-Bibliothek"
 
@@ -135,6 +148,9 @@ msgstr "Zugriffsanfragen"
 msgid "Access ticket deleted."
 msgstr "Zugriffsanfrage gelöscht."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Aktion"
 
@@ -167,8 +183,7 @@ msgstr "Sämtliche Daten der Sammlung werden unwiderruflich gelöscht."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "All Ereignisse des Benutzers \"%s\" wurden gelöscht und durch die aus der Datei %s ersetzt"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Alle Kalender und Termine des Prinzipals werden unwiderruflich gelöscht."
 
 msgid "All privileges"
@@ -177,8 +192,7 @@ msgstr "Alle Rechte"
 msgid "All requested changes were made."
 msgstr "Alle gewünschten Änderungen wurden durchgeführt."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Erlaube Frei-/Beschäftigt-Anfragen an den Besitzer dieser Termineingangsbox "
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -214,6 +228,9 @@ msgstr "Authentifizierungs-Server ist nicht verfügbar"
 msgid "Binding deleted."
 msgstr "Zuordnung gelöscht."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Zuordnungen zu anderen Sammlungen"
 
@@ -255,10 +272,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -288,9 +304,10 @@ msgstr "Sammlungs-ID"
 msgid "Collection deleted."
 msgstr "Sammlung gelöscht."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -363,15 +380,14 @@ msgid "Current DAViCal version "
 msgstr "aktuelle DAViCal-Version"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAV-Pfad"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht werden."
 
 msgid "DAViCal CalDAV Server"
@@ -383,7 +399,8 @@ msgstr "DAViCal CalDAV Server - Konfigurationshilfe"
 msgid "DAViCal DB Schema version "
 msgstr "Version des DAViCal-Datenbankschemas"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -476,8 +493,7 @@ msgstr "Lösche Prinzipalen:"
 msgid "Deleting Ticket:"
 msgstr "Lösche Ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Auslieferung von Termineinladungen von einem Organisator an diese Termineingangsbox"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -540,10 +556,10 @@ msgstr "Benutzereintrag bearbeiten"
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um ein temporäres Passwort per "
-msgstr "Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um ein temporäres Passwort per E-Mail zu erhalten."
+"E-Mail zu erhalten."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich anzumelden."
@@ -552,6 +568,10 @@ msgstr "Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich a
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Fehler NoGroupFound mit Filter >%s<, Attribute >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Der Fehler NoUserFound ist mit dem Filter >%s<, den Attributen >%s< und dn >%s< aufgetreten"
@@ -571,9 +591,6 @@ msgstr "Europäisch"
 msgid "European (d/m/y)"
 msgstr "Europäisch (tt.mm.jjjj)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Bestehende Ressource passt nicht zum \"If-None-Match\"-Header - nicht akzeptiert."
 
@@ -647,20 +664,20 @@ msgstr "Gruppenprinzipalen"
 msgid "Groups &amp; Grants"
 msgstr "Gruppen &amp; Rechte"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
-" in one action"
 msgstr "Gruppen erlauben es, Rechte einer Menge von Prinzipalen in einer Aktion zuzuweisen"
 
-msgid ""
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
-"Groups may be members of other groups, but complex nesting will hurt system "
+msgstr ""
-"performance"
+"Gruppen können Mitglieder anderer Gruppen sein, aber komplexe Verschachtelungen werden die "
-msgstr "Gruppen können Mitglieder anderer Gruppen sein, aber komplexe Verschachtelungen werden die Systemleistung stark beeinflussen"
+"Systemleistung stark beeinflussen"
 
 msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"  They might not have calendars, and they will not usually log on."
+"calendars, and they will not usually log on."
-msgstr "Gruppen erlauben zwischenstufliche Verknüpfungen, um den Verwaltungsaufwand zu reduzieren. Sie können keine Kalender haben und sie melden sich normalerweise nicht an."
+msgstr ""
+"Gruppen erlauben zwischenstufliche Verknüpfungen, um den Verwaltungsaufwand zu reduzieren. Sie können "
+"keine Kalender haben und sie melden sich normalerweise nicht an."
 
 msgid "Has Members"
 msgstr "Hat Mitglieder"
@@ -715,9 +732,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Kalender importieren und LDAP synchronisieren"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -768,6 +784,9 @@ msgstr "Gruppen anzeigen"
 msgid "List Resources"
 msgstr "Ressourcen anzeigen"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Benutzer anzeigen"
 
@@ -792,10 +811,9 @@ msgstr "Abmelden"
 msgid "Member deleted from this Group Principal"
 msgstr "Mitglied wurde von diesem Gruppenprinzipalen entfernt"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird dringend empfohlen. "
 
 msgid "Name"
 msgstr "Name"
@@ -825,6 +843,9 @@ msgstr "Es existiert keine Resource an dem Ziel."
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Nr."
@@ -856,9 +877,6 @@ msgstr "Sperre übersschreiben"
 msgid "PDO PostgreSQL drivers"
 msgstr "PDO-PostgreSQL-Treiber"
 
-msgid "PHP DateTime class"
-msgstr "PHP-DateTime-Klasse"
-
 msgid "PHP Information"
 msgstr "PHP-Informationen"
 
@@ -883,23 +901,26 @@ msgstr "PHP Kalendererweiterung verfügbar"
 msgid "PHP curl support"
 msgstr "PHP curl Unterstützung"
 
+msgid "PHP curl support is required for external binds"
+msgstr "PHP curl Unterstützung wird für externe Anbindung benötigt"
+
 msgid "PHP iconv support"
 msgstr "PHP-iconv-Unterstützung"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP benutzt nicht den Apache Filter-Modus"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "PHP curl Unterstützung wird für externe Anbindung benötigt"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
+msgstr ""
-"calendar collection"
+"PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine Kalender-Collection erlaubt"
-msgstr "PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine Kalender-Collection erlaubt"
 
 msgid "Passed"
 msgstr "Erfolgreich"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Erfolgreich: %s"
 
@@ -909,9 +930,7 @@ msgstr "Passwort"
 msgid "Path"
 msgstr "Pfad"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -950,6 +969,9 @@ msgstr "Typ des Prinzipalen"
 msgid "Principal deleted."
 msgstr "Prinzipal gelöscht."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Prinzipalen: Benutzer, Ressourcen und Gruppen"
 
@@ -999,8 +1021,7 @@ msgstr "Verfügbarkeitsinformationen lesen"
 msgid "Read the content of a resource or collection"
 msgstr "Den Inhalt einer Ressource oder Sammlung lesen"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Lesen der Details der Zugriffsberechtigungen des aktuellen Benutzers. "
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1033,8 +1054,7 @@ msgstr "Feature beantragen"
 msgid "Request body is not valid XML data!"
 msgstr "Anfrage-Body enthält keine gültigen XML-Daten!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Ressource"
 
@@ -1044,9 +1064,6 @@ msgstr "Ressource Kalender Prinzipalen"
 msgid "Resource Not Found."
 msgstr "Resource nicht gefunden. "
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Ressource hat sich auf dem Server geändert - nicht gelöscht"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Ressourcen haben Kalender, aber melden sich nicht an."
 
@@ -1065,9 +1082,11 @@ msgstr "Der SRV-Eintrag für \"%s\" zeigt auf eine falsche Domain: \"%s\" an Ste
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
-msgstr "SRV-Eintrag für \"%s\" fehlt oder DNS-Fehler. Die Domain, von der aus Sie Termine senden möchten, sollte einen SRV-Eintrag haben."
+msgstr ""
+"SRV-Eintrag für \"%s\" fehlt oder DNS-Fehler. Die Domain, von der aus Sie Termine senden möchten, "
+"sollte einen SRV-Eintrag haben."
 
 msgid "Schedule Deliver"
 msgstr "Terminzustellung"
@@ -1105,14 +1124,10 @@ msgstr "Terminverarbeitung: Senden..."
 msgid "Send free/busy enquiries"
 msgstr "Verfügbarkeitsanfragen senden"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "Einladungen als Organisator vom Besitzer dieser Terminausgangsbox verschicken."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox versenden."
 
 msgid "Set free/busy privileges"
@@ -1125,9 +1140,10 @@ msgid "Set read+write privileges"
 msgstr "Schreib-/Leserechte setzen"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Stellen Sie den Pfad für Ihre ics Daten ein, z.B. wird \"Kalender\" referenziert als /caldav.php/username/Kalender/"
+"Stellen Sie den Pfad für Ihre ics Daten ein, z.B. wird \"Kalender\" referenziert als /caldav.php/"
+"username/Kalender/"
 
 msgid "Setup"
 msgstr "Konfiguration"
@@ -1156,8 +1172,7 @@ msgstr "Einige Eigenschaften konnten nicht gesetzt werden."
 msgid "Source resource does not exist."
 msgstr "Quellressource existiert nicht."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen enthalten."
 
 msgid "Specific Privileges"
@@ -1194,10 +1209,10 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr "Der TXT-Eintrag für %s._domainkey.%s ist fehlerhaft oder DNS-Fehler."
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
+msgstr ""
-"is configured"
+"Der TXT-Eintrag für \"%s._domainkey.%s\" fehlt oder DNS-Fehler. Der private RSA-Schlüssel ist "
-msgstr "Der TXT-Eintrag für \"%s._domainkey.%s\" fehlt oder DNS-Fehler. Der private RSA-Schlüssel ist konfiguriert."
+"konfiguriert."
 
 msgid "Target"
 msgstr "Ziel"
@@ -1209,31 +1224,37 @@ msgid "That resource is not present on this server."
 msgstr "Diese Ressource ist auf dem Server nicht vorhanden."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
+msgstr ""
-msgstr "Die <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule-Konfiguration</a> benötigt einige DNS-Einträge. Es müssen für alle unterstützen Domains DNS-SRV-Einträge erstelt werden. Es muss mindestens 1 öffentlicher Schlüssel hinterlegt werden, wenn Sie von diesem Server aus Anfragen versenden möchten."
+"Die <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule-Konfiguration</a> "
+"benötigt einige DNS-Einträge. Es müssen für alle unterstützen Domains DNS-SRV-Einträge erstelt werden. "
+"Es muss mindestens 1 öffentlicher Schlüssel hinterlegt werden, wenn Sie von diesem Server aus Anfragen "
+"versenden möchten."
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
-msgstr "Auf der <a href=\"https://www.davical.org/clients.php\">DAViCal-Webseite</a> gibt es Informationen darüber, wie man Evolution, Sunbird, Lightning und Mulberry einrichtet, so dass sie gehostete Kalender benutzen."
+msgstr ""
+"Auf der <a href=\"https://www.davical.org/clients.php\">DAViCal-Webseite</a> gibt es Informationen "
+"darüber, wie man Evolution, Sunbird, Lightning und Mulberry einrichtet, so dass sie gehostete Kalender "
+"benutzen."
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
+msgstr ""
-msgstr "Auf der <a href=\"https://www.davical.org/installation.php\">DAViCal-Webseite</a> gibt es weitere Informationen darüber, wie Sie diese Anwendungen installieren und konfigurieren können."
+"Auf der <a href=\"https://www.davical.org/installation.php\">DAViCal-Webseite</a> gibt es weitere "
+"Informationen darüber, wie Sie diese Anwendungen installieren und konfigurieren können."
 
 msgid "The BIND Request MUST identify an existing resource."
 msgstr "Die BIND-Anfrage MUSS eine bestehende Ressource bezeichnen."
@@ -1244,8 +1265,7 @@ msgstr "Die URI der BIND-Anfrage MUSS eine Sammlung bezeichnen."
 msgid "The BIND method is not allowed at that location."
 msgstr "Die BIND-Methode ist an dieser Stelle nicht erlaubt."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "Das Attribut \"CalDAV:schedule-calendar-transp\" darf nur bei Kalendern gesetzt werden."
 
 msgid "The DAViCal Home Page"
@@ -1254,18 +1274,13 @@ msgstr "Die DAViCal-Startseite"
 msgid "The access ticket will be deleted."
 msgstr "Das Zugriffsticket wird gelöscht."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "addressbook-query darf nur bei einem Adressbuch ausgeführt werden"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr "Die Verwaltung dieser Anwendung sollte relativ einfach sein. Sie können Folgendes verwalten:"
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "Das Admin-Interface hat keine Möglichkeit Kalenderdaten einzusehen oder zu bearbeiten."
 
 msgid "The application failed to understand that request."
@@ -1281,16 +1296,16 @@ msgid "The calendar path contains illegal characters."
 msgstr "Der Kalenderpfad enthält ungültige Zeichen."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "Das Attribut \"calendar-free-busy-set\" wird vom Attribut \"schedule-calendar-transp\" einer Kalendersammlung übertrumpft."
+msgstr ""
+"Das Attribut \"calendar-free-busy-set\" wird vom Attribut \"schedule-calendar-transp\" einer "
+"Kalendersammlung übertrumpft."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "calendar-query darf nicht für diese URL ausgeführt werden."
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "calendar-query darf nur bei einem Kalender oder einer Terminsammlung ausgeführt werden"
 
 msgid "The collection name may not be blank."
@@ -1299,13 +1314,12 @@ msgstr "Der Name für die Sammlung darf nicht leer sein."
 msgid "The destination collection does not exist"
 msgstr "Die angeforderte Sammlung existiert nicht"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "Der Anzeigenname darf nur für Sammlungen, Prinzipale oder Verknüpfungen gesetzt werden."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1315,8 +1329,7 @@ msgstr "Das Feld für die E-Mail-Adresse sollte auf keinen Fall leer bleiben."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Die Datei \"%s\" ist nicht UTF-8-kodiert; weitere Details stehen in der Fehlermeldung."
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Die Datei ist nicht in UTF-8-kodiert, bitte Fehler überprüfen für mehr Details."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1360,9 +1373,10 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Der Benutzername darf nicht leer sein und keinen Slash enthalten"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
-msgstr "Es gibt im Admin-Interface keine Möglichkeit Kalender oder Termine anzusehen und/oder zu verwalten."
+msgstr ""
+"Es gibt im Admin-Interface keine Möglichkeit Kalender oder Termine anzusehen und/oder zu verwalten."
 
 msgid "There was an error reading from the database."
 msgstr "Es ist ein Fehler beim Lesen von der Datenbank aufgetreten"
@@ -1370,39 +1384,62 @@ msgstr "Es ist ein Fehler beim Lesen von der Datenbank aufgetreten"
 msgid "There was an error writing to the database."
 msgstr "Beim Schreiben in die Datenbank ist ein Fehler aufgetreten."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
+msgstr ""
-"calendars)."
+"Dies sind die Elemente, welche Sammlungen von Kalenderressourcen (sprich Kalender) enthalten können."
-msgstr "Dies sind die Elemente, welche Sammlungen von Kalenderressourcen (sprich Kalender) enthalten können."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Diese Funktion erledigt die folgenden Aufgaben:\n"
-msgstr "Diese Funktion erledigt die folgenden Aufgaben:\n<ul>\n  <li>überprüfen der gültigen Gruppen im LDAP-Verzeichnis</li>\n  <li>überprüfen der Gruppen in DAViCal</li>\n</ul> danach\n<ul>\n  <li>falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv markieren</li>\n  <li>falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen</li>\n  <li>falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</li>\n</ul>"
+"<ul>\n"
+"  <li>überprüfen der gültigen Gruppen im LDAP-Verzeichnis</li>\n"
+"  <li>überprüfen der Gruppen in DAViCal</li>\n"
+"</ul> danach\n"
+"<ul>\n"
+"  <li>falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv "
+"markieren</li>\n"
+"  <li>falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen</li>\n"
+"  <li>falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</"
+"li>\n"
+"</ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Diese Funktion erledigt die folgenden Aufgaben:\n"
-msgstr "Diese Funktion erledigt die folgenden Aufgaben:\n<ul>\n  <li>überprüfen der gültigen Benutzer im LDAP-Verzeichnis</li>\n  <li>überprüfen der Benutzer in DAViCal</li>\n</ul> danach\n<ul>\n  <li>falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv markieren</li>\n  <li>falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen</li>\n  <li>falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</li>\n</ul>"
+"<ul>\n"
+"  <li>überprüfen der gültigen Benutzer im LDAP-Verzeichnis</li>\n"
+"  <li>überprüfen der Benutzer in DAViCal</li>\n"
+"</ul> danach\n"
+"<ul>\n"
+"  <li>falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv "
+"markieren</li>\n"
+"  <li>falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen</li>\n"
+"  <li>falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal "
+"aktualisieren</li>\n"
+"</ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für korrektes Fuktionieren benötigt wird. Vorschläge oder Korrekturen, um diese Seite noch sinnvoller zu gestalten werden dankbar angenommen."
+"Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für korrektes Fuktionieren "
+"benötigt wird. Vorschläge oder Korrekturen, um diese Seite noch sinnvoller zu gestalten werden dankbar "
+"angenommen."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Dieser Prozess wird jede Datei eines Verzeichnis in der Form \"Benutzer.ics\" importieren und die entsprechenden Benutzer anlegen."
+msgstr ""
+"Dieser Prozess wird jede Datei eines Verzeichnis in der Form \"Benutzer.ics\" importieren und die "
+"entsprechenden Benutzer anlegen."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Der Server unterstützt nur das text/calendar-Format für FreeBusy-URLs"
@@ -1420,10 +1457,11 @@ msgid "To ID"
 msgstr "Zur ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
+msgstr ""
-msgstr "Für dies benötigen Sie eine Kalenderanwendung mit CalDAV-Unterstützung, wie zum Beispiel Evolution, Sunbird, Thunderbird (mit der Lightning-Erweiterung) oder Mulberry."
+"Für dies benötigen Sie eine Kalenderanwendung mit CalDAV-Unterstützung, wie zum Beispiel Evolution, "
+"Sunbird, Thunderbird (mit der Lightning-Erweiterung) oder Mulberry."
 
 msgid "Toggle all privileges"
 msgstr "Alle Rechte umschalten"
@@ -1506,9 +1544,7 @@ msgstr "Benutzername"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Benutzer (oder Ressourcen oder Gruppen) und deren Beziehung untereinander"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr "Benutzer haben wahrscheinlich Kalender und melden sich am System an."
 
 msgid "View My Details"
@@ -1531,9 +1567,12 @@ msgid "Want: %s, Currently: %s"
 msgstr "Erwartet: %s, erhalten: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Warnung: Es sind keine aktiven Admin-Benutzer. Sie sollten dies vor dem Abmelden beheben. \n\nZiehen sie die Option $c->do_not_sync_from_ldap in Erwägung."
+msgstr ""
+"Warnung: Es sind keine aktiven Admin-Benutzer. Sie sollten dies vor dem Abmelden beheben. \n"
+"\n"
+"Ziehen sie die Option $c->do_not_sync_from_ldap in Erwägung."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Sobald das E-Mail-Konto des Benutzers bestätigt wurde."
@@ -1588,9 +1627,11 @@ msgid "You are viewing"
 msgstr "Sie sehen"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
-msgstr "Sie können auf einen Benutzer klicken, um die vollständigen Details für diese Person (oder Gruppe oder Ressource - aber von hier an, werden wie sie einfach als Benutzer bezeichnen) einsehen."
+msgstr ""
+"Sie können auf einen Benutzer klicken, um die vollständigen Details für diese Person (oder Gruppe oder "
+"Ressource - aber von hier an, werden wie sie einfach als Benutzer bezeichnen) einsehen."
 
 msgid "You do not have permission to modify this collection."
 msgstr ""
@@ -1618,54 +1659,42 @@ msgstr "Die Eigenschaft \"calendar-timezone\" ist nur für einen Kalender gülti
 msgid "directory %s is not readable"
 msgstr "Verzeichnis %s kann nicht gelesen werden"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist fehlgeschlagen"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s ist fehlgeschlagen"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap: LDAP Protokoll-Version 3 konnte nicht gesetzt werden, TLS wird nicht unterstützt"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, ob bindDN und passDN richtig konfiguriert sind, und ob der LDAP Server erreichbar ist"
+msgstr ""
+"drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, ob bindDN und passDN "
+"richtig konfiguriert sind, und ob der LDAP Server erreichbar ist"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap: LDAP-Verbindung zu Port %s auf Host %s fehlgeschlagen"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap: Funktion ldap_connect nicht definiert, bitte php_ldap Modul überprüfen"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam: Kann Datei %s nicht finden"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Kann Datei %s nicht finden"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "angemeldet bleiben"
-
 msgid "from principal"
 msgstr "von Prinzipal"
 
@@ -1679,12 +1708,15 @@ msgid "iSchedule OK"
 msgstr "iSchedule OK"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
+msgstr ""
-msgstr "iSchedule erlaubt CalDAV-Servern direkt untereinander zu kommunizieren, ohne das Einladungen per E-Mail für geplante Termine versandt werden müssen, deren Teilnehmer verschiedene Server und Anbieter nutzen. Zusätzlich ermöglicht es Verfügbarkeitsanfragen für externe Teilnehmer. Temine und Aufgaben, die über iSchedule empfangen werden, werden in einem speziellen Eingang \"scheduling inbox\" angezeigt."
+"iSchedule erlaubt CalDAV-Servern direkt untereinander zu kommunizieren, ohne das Einladungen per E-"
+"Mail für geplante Termine versandt werden müssen, deren Teilnehmer verschiedene Server und Anbieter "
+"nutzen. Zusätzlich ermöglicht es Verfügbarkeitsanfragen für externe Teilnehmer. Temine und Aufgaben, "
+"die über iSchedule empfangen werden, werden in einem speziellen Eingang \"scheduling inbox\" angezeigt."
 
 msgid "invalid request"
 msgstr "ungültige Anfrage"
@@ -1701,15 +1733,15 @@ msgstr "Bitte fügen Sie die folgenden Zeilen zu Ihrer DAViCal-Konfigurationsdat
 msgid "recipient must be organizer or attendee of event"
 msgstr "Empfänger muss Organisator oder Teilnehmer des Ereignisses sein"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
+msgstr ""
-" configuration file)"
+"Der Wert für \"scheduling_dkim_domain\" stimmt nicht mit dem Servernamen überein (bitte überprüfen Sie "
-msgstr "Der Wert für \"scheduling_dkim_domain\" stimmt nicht mit dem Servernamen überein (bitte überprüfen Sie Ihre DAViCal-Konfigurationsdatei)"
+"Ihre DAViCal-Konfigurationsdatei)"
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
+msgstr ""
-"file)"
+"Kein Wert für \"scheduling_dkim_domain\" gesetzt (bitte überprüfen Sie Ihre DAViCal-"
-msgstr "Kein Wert für \"scheduling_dkim_domain\" gesetzt (bitte überprüfen Sie Ihre DAViCal-Konfigurationsdatei)"
+"Konfigurationsdatei)"
 
 msgid "sender must be organizer or attendee of event"
 msgstr "Absender muss Organisator oder Teilnehmer des Ereignisses sein"
@@ -1717,7 +1749,41 @@ msgstr "Absender muss Organisator oder Teilnehmer des Ereignisses sein"
 msgid "unauthenticated"
 msgstr "Nicht angemeldet"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr "DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird dringend empfohlen. "
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "PHP-DateTime-Klasse"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- füge Benutzer %s der Gruppe %s hinzu"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- deaktiviere Gruppen: %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Ressource hat sich auf dem Server geändert - nicht gelöscht"
+
+#~ msgid "forget me not"
+#~ msgstr "angemeldet bleiben"

po/es_AR.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/lkraav/davical/language/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -38,10 +36,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -51,7 +45,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -75,34 +69,35 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Por favor, iniciar sesión</h1><p>Para acceder al %s debe conectarse con el nombre de usuario y contraseña que le han sido asignado.</p><p>Si desea solicitar el acceso, por favor, e-mail %s.</p>"
+"<h1>Por favor, iniciar sesión</h1><p>Para acceder al %s debe conectarse con el nombre de usuario y "
+"contraseña que le han sido asignado.</p><p>Si desea solicitar el acceso, por favor, e-mail %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -116,6 +111,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -125,6 +123,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acción"
 
@@ -157,8 +158,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +167,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr ""
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +203,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +247,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +279,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +355,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +374,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +468,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,9 +531,7 @@ msgstr "Mostrar el registro de éste usuario"
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -542,6 +541,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -561,9 +564,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr "Formato Europeo (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -637,19 +637,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +701,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +753,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -782,9 +780,8 @@ msgstr "Desconectarse"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +812,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "No"
@@ -846,9 +846,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +870,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +898,7 @@ msgstr "Constraseña"
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +937,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +989,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1022,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1034,9 +1032,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1050,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1090,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1106,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1136,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1184,9 +1173,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1186,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1218,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1227,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1249,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1265,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1280,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1324,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1334,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "Hubo un error al grabar en la base de datos."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1377,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1462,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1485,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1542,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1572,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1619,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1640,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1652,8 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "Para conectarse debe utilizar el nombre de usuario y contraseña que le ha sido asignado."

po/es_ES.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # Eugene Ciurana <transifex@cime.net>, 2011
@@ -11,23 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:46+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/lkraav/davical/language/es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -41,10 +39,6 @@ msgstr "*** Desconocido ***"
 msgid "- adding %s to group : %s"
 msgstr "- agregando %s al grupo %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- agregando usuarios %s al grupo %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- creando los grupos:  %s"
@@ -54,8 +48,8 @@ msgid "- creating record for users :  %s"
 msgstr "- creando el registro para usuarios:  %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- grupos %s desactivados"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -78,34 +72,45 @@ msgid "- updating user records : %s"
 msgstr "- actualizando los registros de usuario:  %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ADVERTENCIA:  todos los eventos en este contenedor serán eliminados antes de insertar el archivo ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Ayuda</h>\n<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='https://www.oftc.net/' target='_blank'>irc.oftc.net</a>,\no envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
+msgstr ""
+"<h1>Ayuda</h>\n"
+"<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para "
+"ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>."
+"</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/"
+"Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='https://www.oftc."
+"net/' target='_blank'>irc.oftc.net</a>,\n"
+"o envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' "
+"target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
+"<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users "
+"Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Por favor, autentíquese</h1><p>Para acceder a %s debe identificarse con su nombre de usuario y su clave de acceso.</p><p>Escriba a %s si desea solicitar acceso."
+"<h1>Por favor, autentíquese</h1><p>Para acceder a %s debe identificarse con su nombre de usuario y su "
+"clave de acceso.</p><p>Escriba a %s si desea solicitar acceso."
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Una colección de un Principal de DAViCal solo puede contener otras colecciones"
@@ -119,6 +124,9 @@ msgstr "Una colección no puede ser un calendario y una agenda de direcciones a
 msgid "A resource already exists at the destination."
 msgstr "Ya existe un recurso en ese destino."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versión de la biblioteca AWL"
 
@@ -128,6 +136,9 @@ msgstr "Tickets de acceso"
 msgid "Access ticket deleted."
 msgstr "Ticket de acceso eliminado."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acción"
 
@@ -158,10 +169,11 @@ msgstr "Todos los datos de esta colección serán eliminados permanentemente."
 
 #, php-format
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
-msgstr "Todos los eventos del usuario \"%s\" fueron eliminados y reemplazados por los contenidos en el fichero %s"
+msgstr ""
+"Todos los eventos del usuario \"%s\" fueron eliminados y reemplazados por los contenidos en el fichero "
+"%s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Todos los calendarios y eventos de este Principal serán eliminados permanentemente."
 
 msgid "All privileges"
@@ -170,8 +182,7 @@ msgstr "Todos los privilegios"
 msgid "All requested changes were made."
 msgstr "Todos los cambios solicitados fueron aplicados."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permitir consultas libre/ocupado sobre el dueño de este buzón de planificación"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -207,6 +218,9 @@ msgstr "Servidor de autenticación no disponible"
 msgid "Binding deleted."
 msgstr "Enlace eliminado."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Enlaces a otras colecciones"
 
@@ -248,10 +262,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -281,9 +294,10 @@ msgstr "ID de la colección"
 msgid "Collection deleted."
 msgstr "Colección eliminada."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono CardDAV al mismo tiempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -356,15 +370,14 @@ msgid "Current DAViCal version "
 msgstr "Versión actual de DAViCal"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Ruta DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype sólo puede tener un nuevo valor, no puede ser eliminado"
 
 msgid "DAViCal CalDAV Server"
@@ -376,7 +389,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "Versión del esquema de la base de datos de DAViCal "
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -469,8 +483,7 @@ msgstr "Eliminando Principal:"
 msgid "Deleting Ticket:"
 msgstr "Eliminando ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Permitir al organizador de un evento enviar una invitación a este buzón de planificación"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -533,10 +546,9 @@ msgstr "Editar el registro de este usuario"
 msgid "Email Address"
 msgstr "Dirección de email"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Proporcione un nombre de usuario, si lo sabe, y haga click aquí para enviarle una contraseña temporal."
-msgstr "Proporcione un nombre de usuario, si lo sabe, y haga click aquí para enviarle una contraseña temporal."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Proporcione su nombre de usuario y contraseña, depues haga click aquí para acceder."
@@ -545,6 +557,10 @@ msgstr "Proporcione su nombre de usuario y contraseña, depues haga click aquí
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoGroupFound con el filtro >%s<, atributos >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoUserFound con filtro >%s<, atributos >%s< , dn >%s<"
@@ -564,9 +580,6 @@ msgstr "Europeo"
 msgid "European (d/m/y)"
 msgstr "Europeo (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "El recurso existente coincide con el encabezado \"If-None-Match\" - rechazado."
 
@@ -640,19 +653,15 @@ msgstr "Principals del grupo"
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -708,9 +717,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importar calendarios y sincronizar con LDAP."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -761,6 +769,9 @@ msgstr "Listar grupos"
 msgid "List Resources"
 msgstr "Listar recursos"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listar usuarios"
 
@@ -785,10 +796,9 @@ msgstr "Salir"
 msgid "Member deleted from this Group Principal"
 msgstr "Miembro eliminado de este grupo"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o más reciente."
 
 msgid "Name"
 msgstr "Nombre"
@@ -818,6 +828,9 @@ msgstr "No existe ningún recurso en el destino"
 msgid "No summary"
 msgstr "Sin resumen"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Núm."
@@ -849,9 +862,6 @@ msgstr "Ignorar un bloqueo"
 msgid "PDO PostgreSQL drivers"
 msgstr "Drivers PDO para PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Clase DateTime de PHP"
-
 msgid "PHP Information"
 msgstr ""
 
@@ -876,23 +886,26 @@ msgstr "Extensión de calendarios para PHP disponible"
 msgid "PHP curl support"
 msgstr "Soporte de cURL en PHP"
 
+msgid "PHP curl support is required for external binds"
+msgstr "El soporte cURL para PHP se necesita para binds externos"
+
 msgid "PHP iconv support"
 msgstr "Soporte PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP sin usar el modo filtro de Apache"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "El soporte cURL para PHP se necesita para binds externos"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
+msgstr ""
-"calendar collection"
+"El método PUT con contenido de tipo text/calendar sólo se permite en una colección de tipo calendario"
-msgstr "El método PUT con contenido de tipo text/calendar sólo se permite en una colección de tipo calendario"
 
 msgid "Passed"
 msgstr "Aceptado"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Aceptado: %s"
 
@@ -902,9 +915,7 @@ msgstr "Contraseña"
 msgid "Path"
 msgstr "Ruta"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -943,6 +954,9 @@ msgstr "Tipo de Principal"
 msgid "Principal deleted."
 msgstr "'Principal' eliminado."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -992,8 +1006,7 @@ msgstr "Consultar información libre/ocupado"
 msgid "Read the content of a resource or collection"
 msgstr "Leer el contenido de un recurso o colección"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Leer los detalles de control de acceso para el usuario actual a este recurso"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1026,8 +1039,7 @@ msgstr "Solicitar una funcionalidad"
 msgid "Request body is not valid XML data!"
 msgstr "¡El cuerpo de la petición no contiene datos XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1037,9 +1049,6 @@ msgstr "Principals de tipo recurso con calendario"
 msgid "Resource Not Found."
 msgstr "Recurso no encontrado."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "El recurso fue modificado en el servidor - no se eliminó"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1058,8 +1067,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1098,15 +1107,15 @@ msgstr "Planificación: envío"
 msgid "Send free/busy enquiries"
 msgstr "Enviar comprobaciones de libre/ocupado"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
+msgstr ""
-"scheduling outbox."
+"Envío de invitaciones de planificación como organizador por parte del dueño de este buzón de "
-msgstr "Envío de invitaciones de planificación como organizador por parte del dueño de este buzón de planificación"
+"planificación"
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
+msgstr ""
-"outbox."
+"Envío de respuestas a propuestas de planificación como asistente por parte del dueño de este buzón de "
-msgstr "Envío de respuestas a propuestas de planificación como asistente por parte del dueño de este buzón de planificación"
+"planificación"
 
 msgid "Set free/busy privileges"
 msgstr "Activar permisos libre/ocupado"
@@ -1118,9 +1127,10 @@ msgid "Set read+write privileges"
 msgstr "Activar permisos de lectura+escritura"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Indique la ruta en la que se almacenarán sus ics. Por ejemplo, 'calendario' se traducirá en '/caldav.php/usuario/calendario/'"
+"Indique la ruta en la que se almacenarán sus ics. Por ejemplo, 'calendario' se traducirá en '/caldav."
+"php/usuario/calendario/'"
 
 msgid "Setup"
 msgstr "Configuración"
@@ -1149,8 +1159,7 @@ msgstr "No fue posible configurar algunas propiedades."
 msgid "Source resource does not exist."
 msgstr "El recurso de origen no existe."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Las colecciones especiales no pueden contener un calendario u otra colección especial."
 
 msgid "Specific Privileges"
@@ -1187,9 +1196,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1202,30 +1209,27 @@ msgid "That resource is not present on this server."
 msgstr "El recurso no existe en este servidor."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1237,8 +1241,7 @@ msgstr "El URI de la solicitud BIND DEBE identificar a una colección."
 msgid "The BIND method is not allowed at that location."
 msgstr "No está permitido el método BIND en esa ruta."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "La propiedad CalDAV:schedule-calendar-transp sólo puede ser configurada en calendarios."
 
 msgid "The DAViCal Home Page"
@@ -1247,18 +1250,14 @@ msgstr "Página principal de DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "El ticket de acceso será eliminado."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
+msgstr ""
-msgstr "La solicitud addressbook-query debe ejecutarse contra una colección de tipo libreta de direcciones"
+"La solicitud addressbook-query debe ejecutarse contra una colección de tipo libreta de direcciones"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1274,17 +1273,18 @@ msgid "The calendar path contains illegal characters."
 msgstr "La ruta al calendario contiene caracteres no permitidos."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "La opción calendar-free-busy-set es sustituida por la propiedad schedule-calendar-transp en una colección de tipo calendario"
+msgstr ""
+"La opción calendar-free-busy-set es sustituida por la propiedad schedule-calendar-transp en una "
+"colección de tipo calendario"
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "La petición calendar-query no puede lanzarse contra esa URL"
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
+msgstr ""
-"collection"
+"La petición calendar-query debe ejecutarse contra un calendario o una colección de planificación."
-msgstr "La petición calendar-query debe ejecutarse contra un calendario o una colección de planificación."
 
 msgid "The collection name may not be blank."
 msgstr "El nombre de la colección no puede dejarse en blanco."
@@ -1292,13 +1292,12 @@ msgstr "El nombre de la colección no puede dejarse en blanco."
 msgid "The destination collection does not exist"
 msgstr "La colección de destino no existe."
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "El nombre mostrado puede asignarse sólo en colecciones, Principals, o enlaces."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1306,11 +1305,13 @@ msgstr "La dirección de correo electrónico no debería estar vacía."
 
 #, php-format
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
-msgstr "El fichero \"%s\" no está codificado en UTF-8, por favor compruebe el log de errores para conocer más detalles"
+msgstr ""
+"El fichero \"%s\" no está codificado en UTF-8, por favor compruebe el log de errores para conocer más "
+"detalles"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
-msgstr "El fichero no está codificado en UTF-8, por favor compruebe el log de errores para conocer más detalles"
+"El fichero no está codificado en UTF-8, por favor compruebe el log de errores para conocer más detalles"
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "El nombre completo de esta persona, grupo, u otro tipo de Principal"
@@ -1353,8 +1354,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "El nombre de usuario no puede estar vacío, y no debe contener barras inclinadas."
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1363,39 +1364,44 @@ msgstr "Ocurrió un error al leer la base de datos."
 msgid "There was an error writing to the database."
 msgstr "Ocurrió un error al escribir en la base de datos."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operación hace lo siguiente: <ul> <li>comprobar los grupos válidos en LDAP</li> <li>comprobar los "
-msgstr "Esta operación hace lo siguiente: <ul> <li>comprobar los grupos válidos en LDAP</li> <li>comprobar los grupos en DAViCal</li> </ul>, tras esto: <ul> <li>si un grupo está en DAViCal pero no en LDAP, marcarlo como inactivo</li> <li>si un grupo está en LDAP pero no en DAViCal, crearlo en DAViCal</li> <li>si está en ambos, actualizar la información en DAViCal</li> </ul>"
+"grupos en DAViCal</li> </ul>, tras esto: <ul> <li>si un grupo está en DAViCal pero no en LDAP, "
+"marcarlo como inactivo</li> <li>si un grupo está en LDAP pero no en DAViCal, crearlo en DAViCal</li> "
+"<li>si está en ambos, actualizar la información en DAViCal</li> </ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operación hace lo siguiente: <ul> <li>comprobar los usuarios válidos en LDAP</li> <li>comprobar "
-msgstr "Esta operación hace lo siguiente: <ul> <li>comprobar los usuarios válidos en LDAP</li> <li>comprobar los usuarios en DAViCal</li> </ul>, tras esto: <ul> <li>si un usuario está en DAViCal pero no en LDAP, marcarlo como inactivo</li> <li>si un usuario está en LDAP pero no en DAViCal, crearlo en DAViCal</li> <li>si está en ambos, actualizar la información en DAViCal</li> </ul>"
+"los usuarios en DAViCal</li> </ul>, tras esto: <ul> <li>si un usuario está en DAViCal pero no en LDAP, "
+"marcarlo como inactivo</li> <li>si un usuario está en LDAP pero no en DAViCal, crearlo en DAViCal</li> "
+"<li>si está en ambos, actualizar la información en DAViCal</li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Esta página comprueba si el entorno es el necesario para que DAViCal funcione correctamente.  Las sugerencias y los parches para hacerla más útil son bienvenidos."
+"Esta página comprueba si el entorno es el necesario para que DAViCal funcione correctamente.  Las "
+"sugerencias y los parches para hacerla más útil son bienvenidos."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Este proceso importará de un directorio cada fichero \"usuario.ics\", creando un usuario con el nombre indicado y un calendario, uno por cada fichero encontrado."
+msgstr ""
+"Este proceso importará de un directorio cada fichero \"usuario.ics\", creando un usuario con el nombre "
+"indicado y un calendario, uno por cada fichero encontrado."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Este servidor sólo soporta el formato text/calendar para URLs freebusy"
@@ -1413,9 +1419,8 @@ msgid "To ID"
 msgstr "Al ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1499,9 +1504,7 @@ msgstr "Nombre de usuario"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1524,9 +1527,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Quiere: %s, Actualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Precaución:  ¡No hay usuarios con privilegios de administración activos!  Debe reparar esto antes de salir. Plantéese utilizar el parámetro $c->do_not_sync_from_ldap en la configuración."
+msgstr ""
+"Precaución:  ¡No hay usuarios con privilegios de administración activos!  Debe reparar esto antes de "
+"salir. Plantéese utilizar el parámetro $c->do_not_sync_from_ldap en la configuración."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Cuando la dirección de correo electrónico del usuario fue validada."
@@ -1581,8 +1586,8 @@ msgid "You are viewing"
 msgstr "Está viendo"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1611,54 +1616,43 @@ msgstr "La propiedad calendar-timezone sólo es válida en calendarios."
 msgid "directory %s is not readable"
 msgstr "no se puede leer el directorio %s"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : el parámetro imap_url parámetro no está configurado en /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : no se pudo usar TLS:  ldap_start_tls() falló"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : falló el bind en el host %1$s por el puerto %2$s con DN %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : no se pudo usar LDAP versión 3, el uso de TLS no está soportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : no se pudo hacer bind en LDAP - compruebe la configuración de los parámetros bindDN y passDN, y asegúrese de que su servidor LDAP es accesible."
+msgstr ""
+"drivers_ldap : no se pudo hacer bind en LDAP - compruebe la configuración de los parámetros bindDN y "
+"passDN, y asegúrese de que su servidor LDAP es accesible."
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : no se pudo conectar a LDAP por el puerto %s en el host %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
-msgstr "drivers_ldap : la función ldap_connect no existe; compruebe que tiene instalado el módulo php_ldap"
+"drivers_ldap : la función ldap_connect no existe; compruebe que tiene instalado el módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : no se encontró el fichero %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : el parámetro imap_url parámetro no está configurado en /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : no se encontró el fichero %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "recuérdame"
-
 msgid "from principal"
 msgstr "del Principal"
 
@@ -1672,11 +1666,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1694,14 +1687,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr "el receptor debe ser organizador o asistente al evento"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1710,7 +1699,46 @@ msgstr "el remitente debe ser organizador o asistente al evento"
 msgid "unauthenticated"
 msgstr "no autenticado"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "deberá autenticarse con el nombre de usuario y contraseña que se le comunicaron."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr ""
+#~ "drivers_imap_pam : el parámetro imap_url parámetro no está configurado en /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr ""
+#~ "drivers_rimap : el parámetro imap_url parámetro no está configurado en /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o "
+#~ "más reciente."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Clase DateTime de PHP"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ADVERTENCIA:  todos los eventos en este contenedor serán eliminados antes de insertar el archivo "
+#~ "ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- agregando usuarios %s al grupo %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- grupos %s desactivados"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "El recurso fue modificado en el servidor - no se eliminó"
+
+#~ msgid "forget me not"
+#~ msgstr "recuérdame"

po/es_MX.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # Eugene Ciurana <transifex@cime.net>, 2011
@@ -10,23 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:43+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/lkraav/davical/language/es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -40,10 +38,6 @@ msgstr "*** Desconocido ***"
 msgid "- adding %s to group : %s"
 msgstr "- agregando %s al grupo %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- agregando usuarios %s al grupo %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- creando los grupos:  %s"
@@ -53,8 +47,8 @@ msgid "- creating record for users :  %s"
 msgstr "- creando el registro para usuarios:  %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- groupos %s desactivados"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -77,34 +71,45 @@ msgid "- updating user records : %s"
 msgstr "- actualizando los registros de usuario:  %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ADVERTENCIA:  todos los eventos en este repositorio serán eliminados antes de insertar el archivo ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Ayuda</h>\n<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='https://www.oftc.net/' target='_blank'>irc.oftc.net</a>,\no envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
+msgstr ""
+"<h1>Ayuda</h>\n"
+"<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para "
+"ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>."
+"</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/"
+"Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='https://www.oftc."
+"net/' target='_blank'>irc.oftc.net</a>,\n"
+"o envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' "
+"target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
+"<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users "
+"Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Por Favor Entra Identifícate</h1><p>Debes para entrar a %s debes identificarte con tu nombre de usuario y tu clave de acceso.</p><p>Notifica a %s si deseas solicitar acceso."
+"<h1>Por Favor Entra Identifícate</h1><p>Debes para entrar a %s debes identificarte con tu nombre de "
+"usuario y tu clave de acceso.</p><p>Notifica a %s si deseas solicitar acceso."
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Una colección principal de DAViCal solo puede contener colecciones"
@@ -118,6 +123,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr "Un recurso ya existe en ese destino."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Biblioteca AWL versión"
 
@@ -127,6 +135,9 @@ msgstr "Boletos de Acceso"
 msgid "Access ticket deleted."
 msgstr "Boleto de acceso eliminado."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acción"
 
@@ -159,8 +170,7 @@ msgstr "Todos los datos de esta colección serán eliminados."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Todos los calendarios y eventos de este principal serán eliminados permanentemente."
 
 msgid "All privileges"
@@ -169,8 +179,7 @@ msgstr "Todos los privilegios"
 msgid "All requested changes were made."
 msgstr "Todos los cambios solicitados fueron hechos."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permite solicitudes libre/ocupado para el dueño de este buzón de itinerario."
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -206,6 +215,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr "Enlace eliminado."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Enlaces a otras colecciones"
 
@@ -247,10 +259,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -280,9 +291,10 @@ msgstr "ID de Colección"
 msgid "Collection deleted."
 msgstr "Colección eliminada."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono CardDAV al mismo tiempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -355,15 +367,14 @@ msgid "Current DAViCal version "
 msgstr "Versión actual de DAViCal "
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Camino DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype solo puede tener un valor nuevo, y no puede ser eliminado."
 
 msgid "DAViCal CalDAV Server"
@@ -375,7 +386,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "Esquema de Datos de DAViCal versión "
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -468,8 +480,7 @@ msgstr "Eliminando Principal:"
 msgid "Deleting Ticket:"
 msgstr "Eliminando Boleto:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Enviar invitaciones de itinerario de un organizador a este buzón de itinerarios"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -532,10 +543,10 @@ msgstr "Editar este registro de usuario"
 msgid "Email Address"
 msgstr "Dirección de Email"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Proporcione un nombre de usuario, si lo sabe, y haga click aquí, para enviarle una clave de acceso "
-msgstr "Proporcione un nombre de usuario, si lo sabe, y haga click aquí, para enviarle una clave de acceso temporal."
+"temporal."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Proporcione su nombre de usuario y clave de accesso, depues haga click aquí para entrar."
@@ -544,6 +555,10 @@ msgstr "Proporcione su nombre de usuario y clave de accesso, depues haga click a
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoGroupFound con el filtro >%s<, atributos >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoUserFound con filtro >%s<, atributos >%s< , dn >%s<"
@@ -563,9 +578,6 @@ msgstr "Europeo"
 msgid "European (d/m/y)"
 msgstr "Europeo (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "El recurso existente coincide con el encabezado \"If-None-Match\" - rechazado."
 
@@ -639,19 +651,15 @@ msgstr "Principales del Grupo"
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -707,9 +715,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importar calendarios y Sincronizar LDAP."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -760,6 +767,9 @@ msgstr "Listar Grupos"
 msgid "List Resources"
 msgstr "Listar Recursos"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listar Usuarios"
 
@@ -784,10 +794,9 @@ msgstr "Salida"
 msgid "Member deleted from this Group Principal"
 msgstr "Miembro eliminado de este Grupo de Principales"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o mas reciente."
 
 msgid "Name"
 msgstr "Nombre"
@@ -817,6 +826,9 @@ msgstr ""
 msgid "No summary"
 msgstr "Sin resumen"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "No."
@@ -848,9 +860,6 @@ msgstr "Anular un Seguro"
 msgid "PDO PostgreSQL drivers"
 msgstr "Drivers PDO para PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Clase DateTime de PHP"
-
 msgid "PHP Information"
 msgstr ""
 
@@ -875,23 +884,27 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr "Soporte PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
+msgstr ""
-"calendar collection"
+"PUT solo se permite para una colección si el contenido es text/calendar para una colección de "
-msgstr "PUT solo se permite para una colección si el contenido es text/calendar para una colección de calendario"
+"calendario"
 
 msgid "Passed"
 msgstr "Aceptado"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Aceptado: %s"
 
@@ -901,9 +914,7 @@ msgstr "Clave de Acceso"
 msgid "Path"
 msgstr "Camino"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -942,6 +953,9 @@ msgstr "Tipo del Principal"
 msgid "Principal deleted."
 msgstr "Principal eliminado."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -991,8 +1005,7 @@ msgstr "Leer Información Libre/Ocupado"
 msgid "Read the content of a resource or collection"
 msgstr "Leer el contenido de un recurso o colección"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Leer los detalles de control de acceso para el usuario actaul respecto a este recurso."
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1025,8 +1038,7 @@ msgstr "Solicitar una Prestación"
 msgid "Request body is not valid XML data!"
 msgstr "¡El cuerpo de la solicitud no contiene datos XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1036,9 +1048,6 @@ msgstr "Recursos de Principales de Calendario"
 msgid "Resource Not Found."
 msgstr "Recurso No Encontrado."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "El Recurso cambió en el servidor - no eliminado"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1057,8 +1066,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1097,14 +1106,11 @@ msgstr "Itinerario:  Enviando"
 msgid "Send free/busy enquiries"
 msgstr "Enviar verificaciones de libre/ocupado"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
+msgstr ""
-"scheduling outbox."
+"Enviar invitaciones de itinerario como el organizador desde el dueño de  este buzón de itinerario."
-msgstr "Enviar invitaciones de itinerario como el organizador desde el dueño de  este buzón de itinerario."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Enviando respuestas como participante desde el dueño de este buzón de salida para itinerarios."
 
 msgid "Set free/busy privileges"
@@ -1117,8 +1123,7 @@ msgid "Set read+write privileges"
 msgstr "Activar privilegios de lectura+escritura"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1148,8 +1153,7 @@ msgstr "No fue posible configurar algunas propiedades."
 msgid "Source resource does not exist."
 msgstr "El recurso fuente no existe."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Las colecciones especiales no pueden contener un calendario u otra colección especial."
 
 msgid "Specific Privileges"
@@ -1186,9 +1190,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1201,30 +1203,27 @@ msgid "That resource is not present on this server."
 msgstr "El recurso no está presente en este servidor."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1236,8 +1235,7 @@ msgstr "El URI de la Solicitud BIND DEBE identificar una colección."
 msgid "The BIND method is not allowed at that location."
 msgstr "No está permitido el método BIND en esa localización."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "La propiedad CalDAV:schedule-calendar-transp solo puede ser configurada en calendarios."
 
 msgid "The DAViCal Home Page"
@@ -1246,18 +1244,15 @@ msgstr "La Página Principal de DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "El boleto de acceso será eliminado."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
+msgstr ""
-msgstr "El reporte de solicitud-lista-de-direcciones debe ejecutarse con respecto a una colección de lista de direcciones."
+"El reporte de solicitud-lista-de-direcciones debe ejecutarse con respecto a una colección de lista de "
+"direcciones."
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1273,16 +1268,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "La trayectoria del calendario contiene caracteres ilegales."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "El reporte calendar-query debe ejecutarse contra un calendario o una colecciónde itinerario"
 
 msgid "The collection name may not be blank."
@@ -1291,13 +1284,12 @@ msgstr "El nombre de la colección no puede dejarse en blanco."
 msgid "The destination collection does not exist"
 msgstr "La colección de destino no existe."
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "El nombre de despliegue puede asignarse solo en colecciones, principales, o enlaces."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1307,9 +1299,9 @@ msgstr "La dirección de correo electrónico no deberá estar en blanco."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
-msgstr "Ël archivo no está codificado en UTF-8, por favor verifica el mensaje de error para mayores detalles."
+"Ël archivo no está codificado en UTF-8, por favor verifica el mensaje de error para mayores detalles."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "El nombre completo de esta persona, grupo, u otro tipo de principal."
@@ -1352,8 +1344,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "El nombre de usuario no puede estar en blanco, y no debe contener diagonales."
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1362,38 +1354,43 @@ msgstr "Ocurrió un error al leer la base de datos."
 msgid "There was an error writing to the database."
 msgstr "Ocurrió un error al escribir en la base de datos."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operación hace lo sigiente: <ul><li>verificar los grupos en el directorio LDAP</li><li>checar los "
-msgstr "Esta operación hace lo sigiente: <ul><li>verificar los grupos en el directorio LDAP</li><li>checar los grupos en DAViCal</li></ul> luego <ul><li>si un grupo existe en DAViCal mas no en LDAP, asignarlo como inactivo en DAViCal</li> <li>si un grupo está presente en LDAP pero no ed DAViCal, crear el grupo en DAViCal</li> <li>si un grupo está presente en ambos LDAP y DAViCal, actualizar la información en DAViCal</li></ul>"
+"grupos en DAViCal</li></ul> luego <ul><li>si un grupo existe en DAViCal mas no en LDAP, asignarlo como "
+"inactivo en DAViCal</li> <li>si un grupo está presente en LDAP pero no ed DAViCal, crear el grupo en "
+"DAViCal</li> <li>si un grupo está presente en ambos LDAP y DAViCal, actualizar la información en "
+"DAViCal</li></ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operación hace lo siguiente:  <ul><li>verificar que los usuarios son válidos en el directorio "
-msgstr "Esta operación hace lo siguiente:  <ul><li>verificar que los usuarios son válidos en el directorio LDAP</li><li>checar los usuarios en DAViCal</li></ul> luego <ul><li>si un usuario está presente en DAViCal pero no en LDAP, assignarlo como inactivo en DAViCal</li> <li>si un usuario está presente en LDAP mas no en DAViCal, crear al usuario en DAViCal</li><li>si un usuario está presente en LDAP y en DAViCal, actualizar la información en DAViCal</li></ul>"
+"LDAP</li><li>checar los usuarios en DAViCal</li></ul> luego <ul><li>si un usuario está presente en "
+"DAViCal pero no en LDAP, assignarlo como inactivo en DAViCal</li> <li>si un usuario está presente en "
+"LDAP mas no en DAViCal, crear al usuario en DAViCal</li><li>si un usuario está presente en LDAP y en "
+"DAViCal, actualizar la información en DAViCal</li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Esta página valida el ambiente operativo necesario para que DAViCal funcione correctamente.  Sugestiones o parches para hacerla mas útil o efectiva serán graciosamente recibidas."
+"Esta página valida el ambiente operativo necesario para que DAViCal funcione correctamente.  "
+"Sugestiones o parches para hacerla mas útil o efectiva serán graciosamente recibidas."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1412,9 +1409,8 @@ msgid "To ID"
 msgstr "Al ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1498,9 +1494,7 @@ msgstr "Nombre de Usuario"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1523,9 +1517,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Quiere: %s, Actualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Precaución:  ¡No hay usuarios administrativos activos!  Debe reparar esto antes de salirdel sistema.  Considere utilizar el parámetro $c->do_not_sync_from_ldap de configuración."
+msgstr ""
+"Precaución:  ¡No hay usuarios administrativos activos!  Debe reparar esto antes de salirdel sistema.  "
+"Considere utilizar el parámetro $c->do_not_sync_from_ldap de configuración."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Cuando la dirección de correo electrónico del usuario fue validada."
@@ -1580,8 +1576,8 @@ msgid "You are viewing"
 msgstr "Usted ve"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1610,54 +1606,43 @@ msgstr "calendar-timezone es una propiedad válida solamente para un calendario.
 msgid "directory %s is not readable"
 msgstr "el directorio %s no es legible"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : imap_url parámetro no configurado en /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : No pudo arrancar TLS:  ldap_start_tls() falló"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : Falló la atadura entre el sistema %1$s en el puerto %2$s con atadura DN de %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+msgstr ""
-"supported"
+"drivers_ldap : Falló en establecer que LDAP utilice la versión 3 del protocol, TLS no es soportada"
-msgstr "drivers_ldap : Falló en establecer que LDAP utilice la versión 3 del protocol, TLS no es soportada"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Incapaz de atar a LDAP - verifique su configuración de bindDN y passDN, y que su servidor LDAP sea accesible"
+msgstr ""
+"drivers_ldap : Incapaz de atar a LDAP - verifique su configuración de bindDN y passDN, y que su "
+"servidor LDAP sea accesible"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Incapaz de conectar a LDAP en el puerto %s del servidor %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : la función ldap_connect no fue definida; cheque su módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : Incapz de encontrar al archivo %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Incapaz de encontrar el archivo %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "no me olvides"
-
 msgid "from principal"
 msgstr "del principal"
 
@@ -1671,11 +1656,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1693,14 +1677,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1709,7 +1689,41 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "Desautenticado"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "deberá identificarse con el nombre de usuario y clave de acceso que le fueron otorgados."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : imap_url parámetro no configurado en /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o "
+#~ "mas reciente."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Clase DateTime de PHP"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ADVERTENCIA:  todos los eventos en este repositorio serán eliminados antes de insertar el "
+#~ "archivo ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- agregando usuarios %s al grupo %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- groupos %s desactivados"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "El Recurso cambió en el servidor - no eliminado"
+
+#~ msgid "forget me not"
+#~ msgstr "no me olvides"

po/es_VE.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # Hector Colina <hcolina@gmail.com>, 2011,2014
@@ -11,23 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:49+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/lkraav/davical/language/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -41,10 +39,6 @@ msgstr "** Desconocido **"
 msgid "- adding %s to group : %s"
 msgstr "- agregando %s al grupo: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- agregando usuarios %s al grupo: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- creando grupos: %s"
@@ -54,8 +48,8 @@ msgid "- creating record for users :  %s"
 msgstr "- creando registros para usuarios: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- desactivar grupos: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -78,34 +72,45 @@ msgid "- updating user records : %s"
 msgstr "- actualizando registros de usuario: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ADVERTENCIA: Todos los eventos en este contenedor serán borrados antes de insertar el archivo ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Ayuda</h>\n<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/Internet_Relay_Chat' target='_blank'>IRC</a> en el canal <b>#davical</b> en <a href='https://www.oftc.net/' target='_blank'>irc.oftc.net</a>,\no envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil. "
+msgstr ""
+"<h1>Ayuda</h>\n"
+"<p>Visita <a href='https://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para "
+"ayuda inicial, o consulta<a href='https://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>."
+"</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='https://wikipedia.org/wiki/"
+"Internet_Relay_Chat' target='_blank'>IRC</a> en el canal <b>#davical</b> en <a href='https://www.oftc."
+"net/' target='_blank'>irc.oftc.net</a>,\n"
+"o envía tus preguntas a <a href='https://lists.sourceforge.net/mailman/listinfo/davical-general' "
+"target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
+"<p>El <a href='https://sourceforge.net/p/davical/mailman/davical-general/' title='DAViCal Users "
+"Mailing List' target='_blank'>archivo de la lista de correo</a>tambien te será útil. "
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Por favor autentíquese</h1><p>para acceder a %s debe identificarse con su nombre de usuario y su clave de acceso.</p><p>Escriba a %s si desea solicitar acceso. "
+"<h1>Por favor autentíquese</h1><p>para acceder a %s debe identificarse con su nombre de usuario y su "
+"clave de acceso.</p><p>Escriba a %s si desea solicitar acceso. "
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Una colección DAViCAL princiipal sólo puede contener colecciones"
@@ -119,6 +124,9 @@ msgstr "Una colección no puede ser al mismo tiempo un calendario y una agenda d
 msgid "A resource already exists at the destination."
 msgstr "Ya existe un recurso en ese destino."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versión de la librería AWL"
 
@@ -128,6 +136,9 @@ msgstr "Ticket de acceso"
 msgid "Access ticket deleted."
 msgstr "Ticket de acceso borrado."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acción"
 
@@ -158,10 +169,11 @@ msgstr "Todos los datos de la colección serán eliminados de forma permanente"
 
 #, php-format
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
-msgstr "Todos los eventos del usuario \"%s\" fueron eliminados y reeemplazados por los definidos en el archivo %s"
+msgstr ""
+"Todos los eventos del usuario \"%s\" fueron eliminados y reeemplazados por los definidos en el archivo "
+"%s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Todos los calendarios y eventos de este Principal serán eliminados permanentemente"
 
 msgid "All privileges"
@@ -170,8 +182,7 @@ msgstr "Todos los privilegios"
 msgid "All requested changes were made."
 msgstr "Todos los cambios propuestos fueron realizados"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permitir consultas libre/ocupado sobre el dueño de este buzón de planificación"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -207,6 +218,9 @@ msgstr "El servidor de autenticación no está disponible"
 msgid "Binding deleted."
 msgstr "Enlace eliminado."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Enlaces hacia otras colecciones"
 
@@ -248,10 +262,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -281,10 +294,12 @@ msgstr "ID de la colección"
 msgid "Collection deleted."
 msgstr "Colección eliminada."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
-msgstr "Las colecciones no pueden ser, al mismo tiempo, calendarios CalDAV y libretas de direcciones CardDAV"
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgstr ""
+"Las colecciones no pueden ser, al mismo tiempo, calendarios CalDAV y libretas de direcciones CardDAV"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "Configurando los clientes de calendario para DAViCal"
@@ -356,15 +371,14 @@ msgid "Current DAViCal version "
 msgstr "Vesión DAViCal actual"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Ruta DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype sólo puede ser configurado hacia un nuevo valor, no puede ser removido"
 
 msgid "DAViCal CalDAV Server"
@@ -376,7 +390,8 @@ msgstr "Servidor DAViCal CAlDAV - Ayuda de configuración"
 msgid "DAViCal DB Schema version "
 msgstr "Versón del esquema de la base de datos DAViCal"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -469,8 +484,7 @@ msgstr "Eliminando principal"
 msgid "Deleting Ticket:"
 msgstr "Borrando ticket"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Permitir al organizador de un evento enviar una invitación a este buzón de planificación"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -533,10 +547,9 @@ msgstr "Editar el registro de este usuario"
 msgid "Email Address"
 msgstr "Dirección de correo"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Proporcione un nombre de usuario, si lo conoces, y de click aquí, para enviarle una contraseña temporal"
-msgstr "Proporcione un nombre de usuario, si lo conoces, y de click aquí, para enviarle una contraseña temporal"
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Proporcione su nombre de usuario y contraseña, depués haga click aquí para acceder."
@@ -545,6 +558,10 @@ msgstr "Proporcione su nombre de usuario y contraseña, depués haga click aquí
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error,  NoGroupFound con filtro >%s<, attributes >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoUserFound con filtro >%s<, attributes >%s< , dn >%s<"
@@ -564,9 +581,6 @@ msgstr "Europea"
 msgid "European (d/m/y)"
 msgstr "Europea (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Recurso existente no concuerda \"If-Match\" encabezado no aceptado"
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Recurso existente concuerda \"If-None-Match\" encabezado - no aceptado "
 
@@ -640,19 +654,15 @@ msgstr "Grupos principales"
 msgid "Groups &amp; Grants"
 msgstr "Grupos &amp; Privilegios"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -708,9 +718,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importar caledarios y sincronizar LDAP"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -761,6 +770,9 @@ msgstr "Listar grupos"
 msgid "List Resources"
 msgstr "Listar recursos"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listar usuarios"
 
@@ -785,10 +797,9 @@ msgstr "Desconectar"
 msgid "Member deleted from this Group Principal"
 msgstr "Miembro eliminado de este grupo Principal"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "En su mayoría, DAViCal debería trabajar pero actualizando a PHP 5.2 o superior es altamente recomendado"
 
 msgid "Name"
 msgstr "Nombre"
@@ -818,6 +829,9 @@ msgstr "No existen recursos en ese destino"
 msgid "No summary"
 msgstr "Sin resumen"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Núm."
@@ -849,9 +863,6 @@ msgstr "Ignorar un bloqueo"
 msgid "PDO PostgreSQL drivers"
 msgstr "Controlador PDO de PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Clase PHP DateTime"
-
 msgid "PHP Information"
 msgstr "Información PHP"
 
@@ -876,23 +887,25 @@ msgstr "Extensión PHP calendar disponible"
 msgid "PHP curl support"
 msgstr "PHP curl soportado"
 
+msgid "PHP curl support is required for external binds"
+msgstr "El soporte para curl en PHP es requerido para una petición externa"
+
 msgid "PHP iconv support"
 msgstr "PHP iconv soportado"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP no está usando Apache Filter mode"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "El soporte para curl en PHP es requerido para una petición externa"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr "Pasado"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Pasado: %s"
 
@@ -902,9 +915,7 @@ msgstr "Contraseña"
 msgid "Path"
 msgstr "Ruta"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -943,6 +954,9 @@ msgstr "Tipo del Principal"
 msgid "Principal deleted."
 msgstr "Principal eliminado."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -992,8 +1006,7 @@ msgstr "Leer información libre/ocupado"
 msgid "Read the content of a resource or collection"
 msgstr "Leer el contenido de un recurso o colección"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Leer los detalles del control de acceso a este recurso por parte del usuario actual"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1026,8 +1039,7 @@ msgstr "Característica solicitada"
 msgid "Request body is not valid XML data!"
 msgstr "¡El cuerpo de la petición no contiene datos XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1037,9 +1049,6 @@ msgstr "Principals de tipo recurso con calendario"
 msgid "Resource Not Found."
 msgstr "Recurso no encontrado"
 
-msgid "Resource has changed on server - not deleted"
-msgstr "El recurso ha cambiado en el servidor  no  borrado"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1058,8 +1067,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1098,14 +1107,12 @@ msgstr "Agendando: enviando"
 msgid "Send free/busy enquiries"
 msgstr "Enviar comprobaciones de libre/ocupado"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
+msgstr ""
-"scheduling outbox."
+"Enviar planificación de invitaciones  como un organizador desde el propietario de este buzón de "
-msgstr "Enviar planificación de invitaciones  como un organizador desde el propietario de este buzón de planificación"
+"planificación"
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1118,9 +1125,10 @@ msgid "Set read+write privileges"
 msgstr "Configurar privilegios de lectura/escritura"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Configure la ruta para almacenar tu ics. Por ejemplo si colocas 'calendario' éste será referenciado como /caldav.php/username/calendar/ "
+"Configure la ruta para almacenar tu ics. Por ejemplo si colocas 'calendario' éste será referenciado "
+"como /caldav.php/username/calendar/ "
 
 msgid "Setup"
 msgstr "Configuración"
@@ -1149,8 +1157,7 @@ msgstr "Algunas propiedades no pudieron establecerse."
 msgid "Source resource does not exist."
 msgstr "Algunos recursos no existen"
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Las colecciones especiales no pueden contener un calendario u otra colección especial."
 
 msgid "Specific Privileges"
@@ -1187,10 +1194,9 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr "Registro TXT corrupto para %s._domainkey.%s  o falla de DNS"
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
+msgstr ""
-"is configured"
+"registro TXT extraviado para \"%s._domainkey.%s\" o falla en el servidor DNS, clave RSA privada  "
-msgstr "registro TXT extraviado para \"%s._domainkey.%s\" o falla en el servidor DNS, clave RSA privada  "
 
 msgid "Target"
 msgstr "Destino"
@@ -1202,30 +1208,27 @@ msgid "That resource is not present on this server."
 msgstr "El recurso solicitado no se encuentra presente en este servidor"
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1237,8 +1240,7 @@ msgstr "El URI de la solicitud BIND DEBE identificar a una colección."
 msgid "The BIND method is not allowed at that location."
 msgstr "El método BIND no está permitido para esta localización"
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1247,18 +1249,13 @@ msgstr "Página principal del proyecto DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "El ticket de acceso será borrado"
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "La interfaz administrativa no tiene facilidades para ver o modificar datos del calendario"
 
 msgid "The application failed to understand that request."
@@ -1274,16 +1271,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "La ruta del calendario contiene caracteres ilegales"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1292,13 +1287,12 @@ msgstr "El nombre de la colección no puede estar en blanco"
 msgid "The destination collection does not exist"
 msgstr "La colección de destino no existe"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1306,11 +1300,13 @@ msgstr "La dirección de correo no debe estar en blanco"
 
 #, php-format
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
-msgstr "El archivo \"%s\" no se encuentra en formarto UTF-8, por favor, chequee los errores para mayores detalles "
+msgstr ""
+"El archivo \"%s\" no se encuentra en formarto UTF-8, por favor, chequee los errores para mayores "
+"detalles "
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
-msgstr "El archivo no se encuentra en formarto UTF-8, por favor, chequee los errores para mayores detalles "
+"El archivo no se encuentra en formarto UTF-8, por favor, chequee los errores para mayores detalles "
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "El nombre completo de esta persona, grupo, u otro tipo de Principal"
@@ -1353,8 +1349,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "El nombre de usuario no debe estar en blanco y no puede contender el símbolo de slash \"/\""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1363,39 +1359,34 @@ msgstr "Hubo un error leyendo la base de datos"
 msgid "There was an error writing to the database."
 msgstr "Hubo un error al escribir a la base de datos"
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Este proceso importará cada archivo dentro de un directorio nombrado \"username.ics\" y creará un usuario y un calendario por cada archivo a importar"
+msgstr ""
+"Este proceso importará cada archivo dentro de un directorio nombrado \"username.ics\" y creará un "
+"usuario y un calendario por cada archivo a importar"
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr ""
@@ -1413,9 +1404,8 @@ msgid "To ID"
 msgstr "Para ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1499,9 +1489,7 @@ msgstr "Nombre de usuario"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Usuarios (e Recursos o Grupos) y las relaciones entre ellos"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1524,8 +1512,8 @@ msgid "Want: %s, Currently: %s"
 msgstr "Deseado: %s, Actual: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1581,8 +1569,8 @@ msgid "You are viewing"
 msgstr "Estás viendo..."
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1611,54 +1599,43 @@ msgstr "la propiedad zona horaria-calendario sólo es válida para un calendario
 msgid "directory %s is not readable"
 msgstr "El directorio %s no es legible"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : parámetros de imap_url no configurados en /etc/davical/*-conf.php "
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: no se puede comenzar TLS: ldap_start_tls() falló"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap: Falló al vincular el equipo %1$s en el puerto  %2$s con bindDN de %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+msgstr ""
-"supported"
+"drivers_ldap: hubo una falla al configirar LDAP usando la versión 3 del protocolo. TLS no soportado"
-msgstr "drivers_ldap: hubo una falla al configirar LDAP usando la versión 3 del protocolo. TLS no soportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap: Incapaz de vincular al LDAP - chequee su configuración para bindDN y passDN, y verifique que su servidor LDAP esté funcionando y sea alcanzable"
+msgstr ""
+"drivers_ldap: Incapaz de vincular al LDAP - chequee su configuración para bindDN y passDN, y verifique "
+"que su servidor LDAP esté funcionando y sea alcanzable"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap: incapaz de conectarse al servidor LDAP en %s utilizando el puerto %s "
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : función ldap_connect no definida, chequea tu módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "driver_pwauth_pam: Incapaz de encontrar el archivo %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : parámetros de imap_url no configurados en /etc/davical/*-conf.php "
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "driver_squid_pam: Incapaz de encontrar el archivo %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Mantener la sesión activa"
-
 msgid "from principal"
 msgstr "del Principal"
 
@@ -1672,11 +1649,10 @@ msgid "iSchedule OK"
 msgstr "iSchedule Ok"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1694,14 +1670,10 @@ msgstr "por favor, agrega la siguiente sección a tu archivo de configuración d
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr "scheduling_dkim_domain no configurado (por favor chequea tu archivo de configuración DAViCal"
 
 msgid "sender must be organizer or attendee of event"
@@ -1710,7 +1682,44 @@ msgstr "el remitente debe ser organizador o asistente al evento"
 msgid "unauthenticated"
 msgstr "No autenticado"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
-"you."
 msgstr ""
+
+msgid "you should log on with the username and password that have been issued to you."
+msgstr ""
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : parámetros de imap_url no configurados en /etc/davical/*-conf.php "
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap : parámetros de imap_url no configurados en /etc/davical/*-conf.php "
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "En su mayoría, DAViCal debería trabajar pero actualizando a PHP 5.2 o superior es altamente "
+#~ "recomendado"
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Clase PHP DateTime"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ADVERTENCIA: Todos los eventos en este contenedor serán borrados antes de insertar el archivo "
+#~ "ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- agregando usuarios %s al grupo: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- desactivar grupos: %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Recurso existente no concuerda \"If-Match\" encabezado no aceptado"
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "El recurso ha cambiado en el servidor  no  borrado"
+
+#~ msgid "forget me not"
+#~ msgstr "Mantener la sesión activa"

po/et.po

@@ -1,29 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Estonian (http://www.transifex.com/lkraav/davical/language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -37,10 +35,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -50,7 +44,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -74,33 +68,32 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -115,6 +108,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -124,6 +120,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -156,8 +155,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -166,8 +164,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr ""
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -203,6 +200,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -244,10 +244,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -277,9 +276,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -352,15 +352,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -372,7 +371,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -465,8 +465,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -529,9 +528,7 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -541,6 +538,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -560,9 +561,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -636,19 +634,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -704,9 +698,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -757,6 +750,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -781,9 +777,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -814,6 +809,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -845,9 +843,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -872,23 +867,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -898,9 +895,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -939,6 +934,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -988,8 +986,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1022,8 +1019,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1033,9 +1029,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1054,8 +1047,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1094,14 +1087,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1114,8 +1103,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1145,8 +1133,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1183,9 +1170,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1198,30 +1183,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1233,8 +1215,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1243,18 +1224,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1270,16 +1246,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1288,13 +1262,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1304,8 +1277,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1349,8 +1321,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1359,38 +1331,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1409,9 +1374,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1495,9 +1459,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1520,8 +1482,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1577,8 +1539,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1607,54 +1569,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1668,11 +1616,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1690,14 +1637,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1706,7 +1649,8 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr ""

po/fi.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:28+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Finnish (http://www.transifex.com/lkraav/davical/language/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -38,10 +36,6 @@ msgstr "*** Tuntematon ***"
 msgid "- adding %s to group : %s"
 msgstr "– lisätään %s ryhmään: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "– lisätään käyttäjät %s ryhmään: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "– luodaan ryhmät: %s"
@@ -51,8 +45,8 @@ msgid "- creating record for users :  %s"
 msgstr "– luodaan tietueet käyttäjille: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "– poistetaan käytöstä ryhmät: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -75,34 +69,35 @@ msgid "- updating user records : %s"
 msgstr "– päivitetään käyttäjätietueita: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>VAROITUS: kaikki tapahtumat tässä polussa poistetaan ennen kaikkien ics-tiedostossa olevien tuontia</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Kirjaudu sisään</h1><p>Päästäksesi sivulle %s, kirjaudu sisään tunnuksella ja salasanalla jotka on annettu sinulle.</p><p>Jos haluat pyytää pääsyä, lähetä sähköpostia osoitteeseen %s.</p>"
+"<h1>Kirjaudu sisään</h1><p>Päästäksesi sivulle %s, kirjaudu sisään tunnuksella ja salasanalla jotka on "
+"annettu sinulle.</p><p>Jos haluat pyytää pääsyä, lähetä sähköpostia osoitteeseen %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -116,6 +111,9 @@ msgstr "Kokoelma ei voi olla sekä kalenteri että osoitekirja."
 msgid "A resource already exists at the destination."
 msgstr "Antamassasi sijainnissa on jo resurssi."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "AWL-kirjaston versio"
 
@@ -125,6 +123,9 @@ msgstr "Pääsytiketit"
 msgid "Access ticket deleted."
 msgstr "Pääsytiketti poistettu."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Toiminto"
 
@@ -157,8 +158,7 @@ msgstr "Kaikki kokoelmatiedot poistetaan peruuttamattomasti."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Kaikki käyttäjän ”%s” tapahtumat on poistettu ja korvattu tiedoston %s tapahtumilla"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +167,7 @@ msgstr "Kaikki oikeudet"
 msgid "All requested changes were made."
 msgstr "Kaikki pyydetyt muutokset tehtiin."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +203,9 @@ msgstr "Tunnistuspalvelin saavuttamattomissa."
 msgid "Binding deleted."
 msgstr "Liitos poistettu."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Liitokset muihin kokoelmiin"
 
@@ -245,10 +247,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +279,10 @@ msgstr "Kokoelman tunniste"
 msgid "Collection deleted."
 msgstr "Kokoelma poistettu."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Kokoelmat eivät voi olla samaan aikaan CalDAV-kalentereita jaCardDAV-osoitekirjoja."
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +355,14 @@ msgid "Current DAViCal version "
 msgstr "Nykyinen DAViCalin versio "
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAV-polku"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetypeen voi asettaa vain uuden arvon, sitä ei voi poistaa."
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +374,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "DAViCal tietokantaskeeman versio "
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +468,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr "Poistetaan tiketti:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,10 +531,9 @@ msgstr "Muokkaa tätä käyttäjätietuetta"
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Syötä käyttäjänimesi (jos tiedät sen) ja klikkaa tästä saadaksesi sähköpostilla väliaikaisen salasanan."
-msgstr "Syötä käyttäjänimesi (jos tiedät sen) ja klikkaa tästä saadaksesi sähköpostilla väliaikaisen salasanan."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Syötä käyttäjätunnus ja salasana, klikkaa sitten tästä kirjautuaksesi sisään."
@@ -542,6 +542,10 @@ msgstr "Syötä käyttäjätunnus ja salasana, klikkaa sitten tästä kirjautuak
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Virhe ryhmää ei löytynyt (NoGroupFound) suodattimella >%s<, attribuutit >%s<, DN >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Virhe käyttäjää ei löytynyt (NoUserFound) suodattimella >%s<, attribuutit >%s<, DN >%s<"
@@ -561,9 +565,6 @@ msgstr "Eurooppalainen"
 msgid "European (d/m/y)"
 msgstr "Eurooppalainen (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Olemassaoleva resurssi ei täsmää ”If-Match”-otsakkeen kanssa – ei hyväksytty."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Olemassaoleva resurssi täsmää ”If-Match”-otsakkeen kanssa – ei hyväksytty."
 
@@ -637,19 +638,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +702,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Tuo kalenterit ja synkronoi LDAP."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +754,9 @@ msgstr "Listaa ryhmät"
 msgid "List Resources"
 msgstr "Listaa resurssit"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listaa käyttäjät"
 
@@ -782,10 +781,9 @@ msgstr "Kirjaudu ulos"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "Suurin osa DAViCalista toimii, mutta päivittäminen PHP 5.2:een tai uudempaan on suositeltavaa."
 
 msgid "Name"
 msgstr "Nimi"
@@ -815,6 +813,9 @@ msgstr "Annetussa sijainnissa ei ole resurssia."
 msgid "No summary"
 msgstr "Ei yhteenvetoa"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Nro."
@@ -846,9 +847,6 @@ msgstr "Yliaja lukitus"
 msgid "PDO PostgreSQL drivers"
 msgstr "PDO PostgreSQL -ajurit"
 
-msgid "PHP DateTime class"
-msgstr "PHP DateTime-luokka"
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +871,25 @@ msgstr "PHP kalenteriliitännäinen käytettävissä"
 msgid "PHP curl support"
 msgstr "PHP curl-tuki"
 
+msgid "PHP curl support is required for external binds"
+msgstr "PHP curl-tuki vaaditaan ulkoisiin liitoksiin"
+
 msgid "PHP iconv support"
 msgstr "PHP iconv-tuki"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP ei käytä Apache Filter -tilaa"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "PHP curl-tuki vaaditaan ulkoisiin liitoksiin"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +899,7 @@ msgstr "Salasana"
 msgid "Path"
 msgstr "Polku"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +938,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +990,7 @@ msgstr "Näytä vapaa/varattu-tieto"
 msgid "Read the content of a resource or collection"
 msgstr "Näytä resurssin tai kokoelman sisältö"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Näytä yksityiskohdat nykyisen käyttäjän pääsyoikeuksista tähän resurssiin."
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1023,7 @@ msgstr "Pyydä ominaisuutta"
 msgid "Request body is not valid XML data!"
 msgstr "Pyynnön vartalo ei ole kelvollista XML-tietoa!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Resurssi"
 
@@ -1034,9 +1033,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr "Resurssia ei löytynyt."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Resurssia on muutettu palvelimella – ei poistettu"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1051,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1091,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr "Lähetä vapaa/varattu-kyselyjä"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1107,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1137,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1184,9 +1174,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1187,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1219,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "CalDAV:schedule-calendar-transp-ominaisuuden voi asettaa vain kalentereille."
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1228,13 @@ msgstr "DAViCal-Web-sivusto"
 msgid "The access ticket will be deleted."
 msgstr "Pääsytiketti poistetaan."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "Osoitekirja-kyselyraportti täytyy ajaa osoitekirjakokoelmalle"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1250,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Kalenteripolku sisältää kiellettyjä merkkejä."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "Kalenteri-kyselyraportti täytyy ajaa kalenteri- tai ajoituskokoelmalle"
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1266,12 @@ msgstr "Kokoelmanimi ei voi olla tyhjä."
 msgid "The destination collection does not exist"
 msgstr "Kohdekokoelmaa ei ole olemassa"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1281,7 @@ msgstr "Sähköpostiosoitteen ei oikeasti pitäisi olla tyhjä."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Tiedosto ”%s” ei ole UTF-8-koodattu, tarkista virhe saadaksesi lisätietoja"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Tiedosto ei ole UTF-8-koodattu, tarkista virhe saadaksesi lisätietoja."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1325,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Käyttäjätunnus ei voi olla tyhjä, eikä saa sisältää kauttaviivaa (/)"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1335,31 @@ msgstr "Virhe luettaessa tietokannasta."
 msgid "There was an error writing to the database."
 msgstr "Virhe kirjoitettaessa tietokantaan."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1378,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1463,7 @@ msgstr "Käyttäjätunnus"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1486,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1543,8 @@ msgid "You are viewing"
 msgstr "Katsot"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1573,40 @@ msgstr "calendar-timezone-ominaisuus ei ole kelvollinen kalenterille."
 msgid "directory %s is not readable"
 msgstr "hakemisto %s ei ole luettavissa"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "muista minut"
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1620,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1641,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1653,37 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "tunnistamaton"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "kirjaudu sisään käyttäjätunnuksella ja salasanalla jotka on annettu sinulle."
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "Suurin osa DAViCalista toimii, mutta päivittäminen PHP 5.2:een tai uudempaan on suositeltavaa."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "PHP DateTime-luokka"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>VAROITUS: kaikki tapahtumat tässä polussa poistetaan ennen kaikkien ics-tiedostossa olevien "
+#~ "tuontia</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "– lisätään käyttäjät %s ryhmään: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "– poistetaan käytöstä ryhmät: %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Olemassaoleva resurssi ei täsmää ”If-Match”-otsakkeen kanssa – ei hyväksytty."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Resurssia on muutettu palvelimella – ei poistettu"
+
+#~ msgid "forget me not"
+#~ msgstr "muista minut"

po/fr.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Adrien Malgoyre <adrien.malgoyre@gmail.com>, 2014
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
@@ -14,23 +14,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 11:23+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/lkraav/davical/language/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -44,10 +42,6 @@ msgstr "*** Inconnu ***"
 msgid "- adding %s to group : %s"
 msgstr "- ajout de %s au groupe : %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- ajout de l'utilisateur %s au groupe : %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- création du groupe : %s"
@@ -57,8 +51,8 @@ msgid "- creating record for users :  %s"
 msgstr "- création d'un enregistrement pour les utilisateurs : %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- désactivation des groupes : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -81,34 +75,49 @@ msgid "- updating user records : %s"
 msgstr "- mise à jour des enregistrements de l'utilisateur : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
+msgstr ""
-" DAViCal Wiki</a>"
+"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explications sur le Wiki DAViCal</a> (en "
-msgstr "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explications sur le Wiki DAViCal</a> (en anglais)"
+"anglais)"
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>Attention : tous les événements de ce chemin seront supprimés avant l'insertion de tous ceux du fichier ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Aide</h1>\n<p>Pour obtenir de l'aide, vous devez commencer par aller voir sur le site <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> (en anglais) ou sur le <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">Wiki DAViCal</a> (presque complètement traduit en français).</p>\n<p>Si vous n'y trouvez pas ce que vous cherchez, prenez contact avec nous en anglais par <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> sur le canal <b>#davical</b> du serveur <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\nou envoyez une question en anglais sur <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n<p>Les archives <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\"> peuvent également vous être utiles.</p>"
+msgstr ""
+"<h1>Aide</h1>\n"
+"<p>Pour obtenir de l'aide, vous devez commencer par aller voir sur le site <a href=\"https://www."
+"davical.org/\" target=\"_blank\">DAViCal Home Page</a> (en anglais) ou sur le <a href=\"https://wiki."
+"davical.org/%s\" target=\"_blank\">Wiki DAViCal</a> (presque complètement traduit en français).</p>\n"
+"<p>Si vous n'y trouvez pas ce que vous cherchez, prenez contact avec nous en anglais par <a "
+"href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> sur le canal "
+"<b>#davical</b> du serveur <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"ou envoyez une question en anglais sur <a href=\"https://lists.sourceforge.net/mailman/listinfo/"
+"davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>Les archives <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal "
+"Users Mailing List\" target=\"_blank\"> peuvent également vous être utiles.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Veuillez vous connecter</h1><p>Pour accéder à %s vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui vous ont été fournis.</p><p>Si vous voulez demander un accès, envoyez un courriel à %s.</p>"
+"<h1>Veuillez vous connecter</h1><p>Pour accéder à %s vous devez vous connecter avec le nom "
+"d'utilisateur et le mot de passe qui vous ont été fournis.</p><p>Si vous voulez demander un accès, "
+"envoyez un courriel à %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Un compte collection DAViCal ne peut contenir que des collections"
@@ -122,6 +131,9 @@ msgstr "Une collection ne peut pas être à la fois un agenda et un carnet d'adr
 msgid "A resource already exists at the destination."
 msgstr "Une ressource existe déjà à cette destination."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Version de la librairie AWL "
 
@@ -131,6 +143,9 @@ msgstr "Ticket d'accès"
 msgid "Access ticket deleted."
 msgstr "Ticket d'accès supprimé."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Action"
 
@@ -161,10 +176,10 @@ msgstr "Toutes les données de la collection seront effacées définitivement."
 
 #, php-format
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
-msgstr "Tous les événements de l'utilisateur \"%s\" ont été supprimés et remplacés par ceux du fichier %s"
+msgstr ""
+"Tous les événements de l'utilisateur \"%s\" ont été supprimés et remplacés par ceux du fichier %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Tous les agendas et les évènements de l'utilisateur seront effacées définitivement."
 
 msgid "All privileges"
@@ -173,9 +188,9 @@ msgstr "Tous les Privilèges"
 msgid "All requested changes were made."
 msgstr "Toutes les modifications demandées ont été effectuées"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
-msgstr "Autoriser les requêtes Libre/Occupé envoyées au propriétaire de cette boîte de réception planification"
+"Autoriser les requêtes Libre/Occupé envoyées au propriétaire de cette boîte de réception planification"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
 msgstr "Mise à jour d'enregistrement de principal."
@@ -210,6 +225,9 @@ msgstr "Authentification serveur non disponible."
 msgid "Binding deleted."
 msgstr "Liaison supprimée."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Liaison vers d'autres collections"
 
@@ -251,11 +269,13 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr "On ne peut lier des collections que dans le compte courant"
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
+msgstr ""
+"Impossible de déterminer la version courante car PHP est configuré avec “<a href=\"https://secure.php."
+"net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” à "
 "“<code>FALSE</code>”."
-msgstr "Impossible de déterminer la version courante car PHP est configuré avec “<a href=\"https://secure.php.net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” à “<code>FALSE</code>”."
 
 msgid "Categories"
 msgstr "Catégories"
@@ -284,10 +304,12 @@ msgstr "Id. de la collection"
 msgid "Collection deleted."
 msgstr "Collection supprimée."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
-msgstr "Les collections ne peuvent pas être des agendas CalDAV et des carnets d'adresses CardDAV en même temps"
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgstr ""
+"Les collections ne peuvent pas être des agendas CalDAV et des carnets d'adresses CardDAV en même temps"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "Configurer les clients d'agendas pour DAViCal"
@@ -359,15 +381,16 @@ msgid "Current DAViCal version "
 msgstr "Version DAViCal courante "
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
-msgstr "Pour le moment, cette page ne fait rien. Les suggestions ou contributions pour lui faire faire quelque-chose d'utile seront bien accueillies."
+msgstr ""
+"Pour le moment, cette page ne fait rien. Les suggestions ou contributions pour lui faire faire quelque-"
+"chose d'utile seront bien accueillies."
 
 msgid "DAV Path"
 msgstr "Chemin DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype ne peut qu'être positionné à une nouvelle valeur, pas supprimé."
 
 msgid "DAViCal CalDAV Server"
@@ -379,8 +402,9 @@ msgstr "Serveur CalDAV DAViCal - Aide à la configuration"
 msgid "DAViCal DB Schema version "
 msgstr "Version du schéma de la base DAViCal "
 
-msgid "DAViCal Fatal Error"
+#, php-format
-msgstr "Erreur Fatale DAViCal"
+msgid "DAViCal Fatal Error, request ID: %s"
+msgstr ""
 
 msgid "DAViCal Homepage"
 msgstr "Page d'accueil DAViCal"
@@ -472,9 +496,9 @@ msgstr "Suppression du compte :"
 msgid "Deleting Ticket:"
 msgstr "Suppression du Ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
-msgstr "Envoyer des invitations (programmées par un organisateur à cette boîte de réception planification)"
+"Envoyer des invitations (programmées par un organisateur à cette boîte de réception planification)"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
 msgstr "Envoyer des réponses aux invitations (d'un participant à cette boîte de réception planification)"
@@ -525,7 +549,9 @@ msgid "ERROR: The new password must match the confirmed password."
 msgstr "ERREUR : Le nouveau mot de passe doit être identique au mot de passe confirmé."
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "ERREUR: Il y a eu une erreur lors de l'écriture dans la base de données des informations pour les rôles !"
+msgstr ""
+"ERREUR: Il y a eu une erreur lors de l'écriture dans la base de données des informations pour les "
+"rôles !"
 
 msgid "Edit"
 msgstr "Modifier"
@@ -536,10 +562,10 @@ msgstr "Modifier l'enregistrement de cet utilisateur"
 msgid "Email Address"
 msgstr "Adresse de courriel"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Indiquez un nom d'utilisateur, si vous le connaissez et cliquez ici pour recevoir un mot de passe "
-msgstr "Indiquez un nom d'utilisateur, si vous le connaissez et cliquez ici pour recevoir un mot de passe temporaire."
+"temporaire."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Indiquez votre nom d'utilisateur et votre mot de passe puis cliquez ici pour vous connecter"
@@ -548,6 +574,10 @@ msgstr "Indiquez votre nom d'utilisateur et votre mot de passe puis cliquez ici
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erreur NoGroupFound avec le filtre >%s<, attributs >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erreur NoUserFound avec le filtre >%s<, attributs >%s<, dn >%s<"
@@ -567,9 +597,6 @@ msgstr "Européen (jj/mm/aa)"
 msgid "European (d/m/y)"
 msgstr "Européen (jj/mm/aa)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "La ressource existante ne correspond pas à l'entête (HTTP) 'If-Match' - pas accepté."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "La ressource existante correspond à l'entête (HTTP) 'if-None-Match' - pas accepté."
 
@@ -643,20 +670,21 @@ msgstr "Liste des groupes"
 msgid "Groups &amp; Grants"
 msgstr "Groupes &amps; Droits"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+"Les groupes permettent d'assigner des droits d'accès a un ensemble de comptes en une seule action"
-msgstr "Les groupes permettent d'assigner des droits d'accès a un ensemble de comptes en une seule action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
+msgstr ""
+"Les groupes peuvent être inclus à d'autres groupes cependant des imbrications complexes altéreront les "
+"performances du système."
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr "Les groupes peuvent être inclus à d'autres groupes cependant des imbrications complexes altéreront les performances du système."
+msgstr ""
-
+"Les groupes permettent un lien intermédiaire pour réduire l'effort d'administration des comptes. Ils "
-msgid ""
+"ne devraient pas avoir d'agenda et ne se logguent généralement pas."
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
-msgstr "Les groupes permettent un lien intermédiaire pour réduire l'effort d'administration des comptes. Ils ne devraient pas avoir d'agenda et ne se logguent généralement pas."
 
 msgid "Has Members"
 msgstr "A des membres"
@@ -711,10 +739,11 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importer les agendas et synchroniser l'annuaire LDAP."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
+msgstr ""
-msgstr "En temps utile ce programme fera ce qui est prévu dans le script, mais d'ici là vérifiez bien que vous ayez vraiment besoin de l'exécuter."
+"En temps utile ce programme fera ce qui est prévu dans le script, mais d'ici là vérifiez bien que vous "
+"ayez vraiment besoin de l'exécuter."
 
 msgid "Inactive Principals"
 msgstr "Comptes inactifs"
@@ -764,6 +793,9 @@ msgstr "Liste des Groupes"
 msgid "List Resources"
 msgstr "Liste des ressources"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Liste des utilisateurs"
 
@@ -788,10 +820,9 @@ msgstr "Déconnexion"
 msgid "Member deleted from this Group Principal"
 msgstr "Membre supprimé de ce groupe"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "La plupart des fonctions DAViCal fonctionneront, mais une mise à jour vers PHP 5.2 ou ultérieure est fortement recommandé."
 
 msgid "Name"
 msgstr "Nom"
@@ -821,6 +852,9 @@ msgstr "Aucune ressource existante pour la destination."
 msgid "No summary"
 msgstr "Aucun résumé"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "No."
@@ -852,9 +886,6 @@ msgstr "Passer outre un verrou"
 msgid "PDO PostgreSQL drivers"
 msgstr "Pilote PDO pour PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Classe PHP DateTime"
-
 msgid "PHP Information"
 msgstr "Informations PHP"
 
@@ -879,23 +910,25 @@ msgstr "Extension d'agenda PHP disponible"
 msgid "PHP curl support"
 msgstr "Support de PHP curl"
 
+msgid "PHP curl support is required for external binds"
+msgstr "Le support de PHP curl est requis pour les liaisons externes"
+
 msgid "PHP iconv support"
 msgstr "support PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP n'utilise pas le mode Apache Filter"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "Le support de PHP curl est requis pour les liaisons externes"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr "Mise à jour d'une collection agenda autorisée uniquement pour un contenu text/calendar"
 
 msgid "Passed"
 msgstr "Passé"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Passé: %s"
 
@@ -905,10 +938,10 @@ msgstr "Mot de passe"
 msgid "Path"
 msgstr "Chemin"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
+msgstr ""
-"https://cal.example.com/user2/cal/"
+"Chemin à la collection que vous voulez lier, par exemple /user1/calendar/ ou https://cal.example.com/"
-msgstr "Chemin à la collection que vous voulez lier, par exemple /user1/calendar/ ou https://cal.example.com/user2/cal/"
+"user2/cal/"
 
 msgid "Person"
 msgstr "Personne"
@@ -946,6 +979,9 @@ msgstr "Type de compte"
 msgid "Principal deleted."
 msgstr "Compte supprimé."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Comptes : Utilisateurs, Ressources et Groupes"
 
@@ -995,8 +1031,7 @@ msgstr "Lire les informations Libre/Occupé"
 msgid "Read the content of a resource or collection"
 msgstr "Lire le contenu de la ressource ou de la collection"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Lire les détails du contrôle d'accès de l'utilisateur courant à cette ressource."
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1029,8 +1064,7 @@ msgstr "Demander une amélioration"
 msgid "Request body is not valid XML data!"
 msgstr "Le corps de la requête n'est pas du XML valide !"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Ressource"
 
@@ -1040,9 +1074,6 @@ msgstr "Liste des Ressources"
 msgid "Resource Not Found."
 msgstr "Ressource introuvable."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "La ressource a été modifiée sur le serveur - non supprimée"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Les ressources ont aussi des agendas, mais ne se logguent généralement pas."
 
@@ -1061,9 +1092,11 @@ msgstr "Le SRV record pour \"%s\" pointe sur le mauvais domaine \"%s\" au lieu d
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
-msgstr "Enregistrement DNS type SRV manquant pour \"%s\" ou échec DNS. Le domaine duquel vous allez envoyer des événements doit avoir un enregistrement DNS de type SRV (en anglais: SRV record)"
+msgstr ""
+"Enregistrement DNS type SRV manquant pour \"%s\" ou échec DNS. Le domaine duquel vous allez envoyer "
+"des événements doit avoir un enregistrement DNS de type SRV (en anglais: SRV record)"
 
 msgid "Schedule Deliver"
 msgstr "Planif: Invitations"
@@ -1101,15 +1134,14 @@ msgstr "Planification: Délégation d'envoi"
 msgid "Send free/busy enquiries"
 msgstr "Envoyer une requête Libre/Occupé"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
+msgstr ""
-"scheduling outbox."
+"Envoyer des invitations en tant qu'organisateur depuis cette boîte d’envoi planification (délégation)."
-msgstr "Envoyer des invitations en tant qu'organisateur depuis cette boîte d’envoi planification (délégation)."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
+msgstr ""
-"outbox."
+"Envoyer des réponses aux invitations en tant que participant depuis cette boîte d’envoi planification "
-msgstr "Envoyer des réponses aux invitations en tant que participant depuis cette boîte d’envoi planification (délégation)"
+"(délégation)"
 
 msgid "Set free/busy privileges"
 msgstr "Attribuer le privilège Libre/Occupé"
@@ -1121,9 +1153,10 @@ msgid "Set read+write privileges"
 msgstr "Définir des privilèges de lecture + écriture"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Positionnez le chemin d'accès à l'agenda, par exemple 'calendar' pour y accéder par le chemin /caldav.php/username/calendar/"
+"Positionnez le chemin d'accès à l'agenda, par exemple 'calendar' pour y accéder par le chemin /caldav."
+"php/username/calendar/"
 
 msgid "Setup"
 msgstr "Configuration"
@@ -1152,8 +1185,7 @@ msgstr "Des propriétés n'ont pu être établies."
 msgid "Source resource does not exist."
 msgstr "La ressource source n'existe pas"
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Les collections spéciales ne peuvent pas contenir un agenda ou une autre collection spéciale."
 
 msgid "Specific Privileges"
@@ -1190,10 +1222,10 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr "Erreur DNS ou enregistrement TXT incorrect pour %s._domainkey.%s"
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
+msgstr ""
-"is configured"
+"Enregistrement DNS type TXT manquant pour \"%s._domainkey.%s\" (en anglais: TXT record missing) ou "
-msgstr "Enregistrement DNS type TXT manquant pour \"%s._domainkey.%s\" (en anglais: TXT record missing) ou échec DNS. Clé privée RSA configurée"
+"échec DNS. Clé privée RSA configurée"
 
 msgid "Target"
 msgstr "Cible"
@@ -1205,31 +1237,42 @@ msgid "That resource is not present on this server."
 msgstr "Cette ressource n'est pas présente sur ce serveur"
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
+msgstr ""
-msgstr "La <a href=\"https://wiki.davical.org/w/Update-davical-database\">procédure de mise à jour de la base de données</a> doit être faite manuellement après mise à jour du logiciel  DAViCal."
+"La <a href=\"https://wiki.davical.org/w/Update-davical-database\">procédure de mise à jour de la base "
+"de données</a> doit être faite manuellement après mise à jour du logiciel  DAViCal."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
+msgstr ""
-msgstr "La <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">configuration iSchedule</a> nécessite quelques entrées DNS. Des enregistrements DNS type SRV devront être créés pour tous les domaines dont vous voulez accepter les requêtes (en anglais: SRV record). Ce sont les parties des noms des domaines des adresses courriel des Comptes. Des exemples DAViCal sont listés ci-dessous pour les domaines trouvés dans votre base de données. Au moins 1 clé publique doit également être publiée si vous voulez envoyer des requêtes depuis ce serveur."
+"La <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">configuration iSchedule</a> "
+"nécessite quelques entrées DNS. Des enregistrements DNS type SRV devront être créés pour tous les "
+"domaines dont vous voulez accepter les requêtes (en anglais: SRV record). Ce sont les parties des noms "
+"des domaines des adresses courriel des Comptes. Des exemples DAViCal sont listés ci-dessous pour les "
+"domaines trouvés dans votre base de données. Au moins 1 clé publique doit également être publiée si "
+"vous voulez envoyer des requêtes depuis ce serveur."
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
-msgstr "La <a href=\"https://www.davical.org/clients.php\">page de configuration des clients sur le site web de DAViCal</a> contient des informations sur la façon de configurer Evolution, Sunbird, Lightning et Mulberry pour utiliser des agendas distants (en anglais)."
+msgstr ""
+"La <a href=\"https://www.davical.org/clients.php\">page de configuration des clients sur le site web "
+"de DAViCal</a> contient des informations sur la façon de configurer Evolution, Sunbird, Lightning et "
+"Mulberry pour utiliser des agendas distants (en anglais)."
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
+msgstr ""
-msgstr "La <a href=\"https://www.davical.org/installation.php\">page d'installation de DAViCal</a> (en anglais) sur le site web de DAViCal contient des informations complémentaires sur la façon d'installer et de configurer cette application."
+"La <a href=\"https://www.davical.org/installation.php\">page d'installation de DAViCal</a> (en "
+"anglais) sur le site web de DAViCal contient des informations complémentaires sur la façon d'installer "
+"et de configurer cette application."
 
 msgid "The BIND Request MUST identify an existing resource."
 msgstr "La requête BIND DOIT identifier une ressource existante."
@@ -1240,8 +1283,7 @@ msgstr "La requête-URI BIND DOIT identifier une collection."
 msgid "The BIND method is not allowed at that location."
 msgstr "La méthode de connexion (BIND) n'est pas autorisée à cet endroit."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "La propriété CalDAV:schedule-calendar-transp ne peut être positionnée que sur des agendas."
 
 msgid "The DAViCal Home Page"
@@ -1250,18 +1292,13 @@ msgstr "Page d'accueil DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "Le ticket d'accès sera supprimé."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "Le rapport de carnet d'adresses doit être demandé sur une collection de type carnet d'adresses"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr "L'administration de cette application devrait être assez simple. Vous pouvez administrer :"
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "L'interface d'administration n'a d'interface ni pour voir ni pour modifier les entrées d'agenda."
 
 msgid "The application failed to understand that request."
@@ -1277,16 +1314,16 @@ msgid "The calendar path contains illegal characters."
 msgstr "Le chemin vers l'agenda contient des caractères interdits."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "La propriété calendar-free-busy-set est écrasée par la propriété schedule-calendar-transp de la collection d'agendas."
+msgstr ""
+"La propriété calendar-free-busy-set est écrasée par la propriété schedule-calendar-transp de la "
+"collection d'agendas."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "La requête de rapport d'agenda ne devrait pas être lancée sur cette URL."
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "Le rapport d'agenda doit être demandé sur un agenda ou une collection planification"
 
 msgid "The collection name may not be blank."
@@ -1295,14 +1332,15 @@ msgstr "Le nom de la collection ne devrait pas être vide."
 msgid "The destination collection does not exist"
 msgstr "La collection de destination n'existe pas"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "Le nom à afficher ne peut être défini que pour une Collection, un Compte ou une liaison."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
-msgstr "L'adresse courriel identifie le compte pour traiter les invitations et la disponibilité des participants. Elle doit être unique."
+msgstr ""
+"L'adresse courriel identifie le compte pour traiter les invitations et la disponibilité des "
+"participants. Elle doit être unique."
 
 msgid "The email address really should not be blank."
 msgstr "L'adresse courriel ne devrait vraiment pas être vide."
@@ -1311,8 +1349,7 @@ msgstr "L'adresse courriel ne devrait vraiment pas être vide."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Le fichier \"%s\" n'est pas au format UTF-8, merci de regarder les erreurs pour plus de détail"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Le fichier n'est pas encodé en UTF-8, veuillez vérifier les erreurs pour plus d'information."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1356,9 +1393,11 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Le nom de l'utilisateur ne devrait pas être vide et ne devrait pas contenir de slash ('/')"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
-msgstr "Il n'y a pas aucun moyen de visualiser ou de mettre à jour les agendas ou les événements depuis cette interface d'administration."
+msgstr ""
+"Il n'y a pas aucun moyen de visualiser ou de mettre à jour les agendas ou les événements depuis cette "
+"interface d'administration."
 
 msgid "There was an error reading from the database."
 msgstr "Il y a eu une erreur lors de la lecture de la base de données."
@@ -1366,39 +1405,47 @@ msgstr "Il y a eu une erreur lors de la lecture de la base de données."
 msgid "There was an error writing to the database."
 msgstr "Il s'est produit une erreur lors de l'écriture des données."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr "Ce sont les éléments susceptibles d'avoir des entrées d'agenda."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Cette action: <ul><li>regarde les groupes valides dans l'annuaire LDAP</li> <li>regarde les groupes "
-msgstr "Cette action: <ul><li>regarde les groupes valides dans l'annuaire LDAP</li> <li>regarde les groupes dans DAViCal</li></ul> puis <ul><li>si un groupe est présent dans DAViCal et pas dans l'annuaire LDAP, le positionne inactif dans DAViCal</li> <li>si un groupe est présent dans l'annuaire LDAP et pas dans DAViCal, crée le groupe dans DAViCal</li> <li>si un groupe est présent dans l'annuaire LDAP et dans DAViCal, le met à jour dans DAViCal</li> </ul>"
+"dans DAViCal</li></ul> puis <ul><li>si un groupe est présent dans DAViCal et pas dans l'annuaire LDAP, "
+"le positionne inactif dans DAViCal</li> <li>si un groupe est présent dans l'annuaire LDAP et pas dans "
+"DAViCal, crée le groupe dans DAViCal</li> <li>si un groupe est présent dans l'annuaire LDAP et dans "
+"DAViCal, le met à jour dans DAViCal</li> </ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Cette action: <ul><li>regarde des comptes utilisateurs valides dans l'annuaire LDAP</li> <li>regarde "
-msgstr "Cette action: <ul><li>regarde des comptes utilisateurs valides dans l'annuaire LDAP</li> <li>regarde les comptes utilisateurs dans DAViCal</li></ul> puis <ul><li>si un compte est présent dans DAViCal et pas dans l'annuaire LDAP, le rend inactif dans DAViCal</li> <li>si un compte est présent dans l'annuaire LDAP mais pas dans DAViCal, le crée dans DAViCal</li> <li>si un compte est présent dans LDAP et dans DAViCal, le met à jour dans DAViCal</li> </ul>"
+"les comptes utilisateurs dans DAViCal</li></ul> puis <ul><li>si un compte est présent dans DAViCal et "
+"pas dans l'annuaire LDAP, le rend inactif dans DAViCal</li> <li>si un compte est présent dans "
+"l'annuaire LDAP mais pas dans DAViCal, le crée dans DAViCal</li> <li>si un compte est présent dans "
+"LDAP et dans DAViCal, le met à jour dans DAViCal</li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Cette page vérifie principalement l'environnement nécessaire pour faire fonctionner DAViCal correctement. Les suggestions ou correctifs pour lui faire faire des choses plus utiles sont les bienvenus."
+"Cette page vérifie principalement l'environnement nécessaire pour faire fonctionner DAViCal "
+"correctement. Les suggestions ou correctifs pour lui faire faire des choses plus utiles sont les "
+"bienvenus."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Cette action va importer chaque fichier dans un répertoire nommé \"username.ics\" et créer un utilisateur et un agenda pour chaque fichier à importer."
+msgstr ""
+"Cette action va importer chaque fichier dans un répertoire nommé \"username.ics\" et créer un "
+"utilisateur et un agenda pour chaque fichier à importer."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Ce serveur ne supporte que le format texte/calendrier pour l'URL Libre/occupé"
@@ -1416,10 +1463,11 @@ msgid "To ID"
 msgstr "Pour l'ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
+msgstr ""
-msgstr "Pour cela, vous aurez besoin d'utiliser un logiciel d'agenda CalDAV comme Evolution, Sunbird, Thunderbird (avec l'extension Lightning) ou Mulberry."
+"Pour cela, vous aurez besoin d'utiliser un logiciel d'agenda CalDAV comme Evolution, Sunbird, "
+"Thunderbird (avec l'extension Lightning) ou Mulberry."
 
 msgid "Toggle all privileges"
 msgstr "Inverser tous les privilèges"
@@ -1502,10 +1550,10 @@ msgstr "Utilisateur"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Les utilisateurs (et les ressources, les groupes) et les relations entre eux"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
+msgstr ""
-"system."
+"Les utilisateurs auront probablement des agendas, et sont généralement amenés à se logguer sur le "
-msgstr "Les utilisateurs auront probablement des agendas, et sont généralement amenés à se logguer sur le système."
+"système."
 
 msgid "View My Details"
 msgstr "Mes informations"
@@ -1527,9 +1575,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Nécessite: %s , actuellement: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Attention: il n'y a pas de compte admin actif ! Vous devez corriger ça avant de vous déconnecter. Utilisez éventuellement le paramétrage $c->do_not_sync_from_ldap."
+msgstr ""
+"Attention: il n'y a pas de compte admin actif ! Vous devez corriger ça avant de vous déconnecter. "
+"Utilisez éventuellement le paramétrage $c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Date à laquelle l'adresse courriel de cet utilisateur a été validée."
@@ -1584,9 +1634,11 @@ msgid "You are viewing"
 msgstr "Vous regardez"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
-msgstr "Vous pouvez cliquer sur un utilisateur pour voir le détail complet du compte (ou groupe ou ressource, mais pour le moment nous les appellerons utilisateurs)."
+msgstr ""
+"Vous pouvez cliquer sur un utilisateur pour voir le détail complet du compte (ou groupe ou ressource, "
+"mais pour le moment nous les appellerons utilisateurs)."
 
 msgid "You do not have permission to modify this collection."
 msgstr "Vous n'avez pas l'autorisation de modifier cette collection."
@@ -1614,54 +1666,43 @@ msgstr "La propriété fuseau horaire n'est valide que pour un agenda."
 msgid "directory %s is not readable"
 msgstr "le répertoire %s n'est pas accessible en lecture."
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : le paramètre imap_url n'est pas configuré dans /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : impossible de démarrer TLS : ldap_start_tlf() a échoué."
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : impossible de se connecter à l'hôte %1$s sur le port %2$s avec bindDN %3$s."
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : impossible pour LDAP d'utiliser le protocole version 3, TLS n'est pas géré."
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Impossible de se lier à LDAP, veuillez vérifier votre bindDN et passDN de votre configuration ou si votre serveur LDAP est accessible."
+msgstr ""
+"drivers_ldap : Impossible de se lier à LDAP, veuillez vérifier votre bindDN et passDN de votre "
+"configuration ou si votre serveur LDAP est accessible."
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : impossible de se connecter à l'annuaire LDAP sur le port %s de l'hôte %s."
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
-msgstr "drivers_ldap : la fonction ldap_connect n'est pas définie, vérifiez que vous avez l'extension php_ldap."
+"drivers_ldap : la fonction ldap_connect n'est pas définie, vérifiez que vous avez l'extension php_ldap."
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : Fichier %s introuvable."
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : le paramètre imap_url n'est pas configuré dans /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Fichier %s introuvable."
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Ne pas m'oublier"
-
 msgid "from principal"
 msgstr "depuis le compte"
 
@@ -1675,12 +1716,16 @@ msgid "iSchedule OK"
 msgstr "iSchedule OK"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
+msgstr ""
-msgstr "iSchedule permet aux serveurs caldav de communiquer directement entre eux, sans avoir besoin de passer par des invitations courriel, pour les événements où les invités utilisent différents serveurs d'agenda. De plus, cela permet la consultation libre-occupé pour les invités distants. Les événements et tâches reçus par iSchedule seront présentés dans la boite de réception des événements des utilisateurs."
+"iSchedule permet aux serveurs caldav de communiquer directement entre eux, sans avoir besoin de passer "
+"par des invitations courriel, pour les événements où les invités utilisent différents serveurs "
+"d'agenda. De plus, cela permet la consultation libre-occupé pour les invités distants. Les événements "
+"et tâches reçus par iSchedule seront présentés dans la boite de réception des événements des "
+"utilisateurs."
 
 msgid "invalid request"
 msgstr "Requête invalide"
@@ -1697,15 +1742,14 @@ msgstr "merci d'ajouter la section suivante dans le fichier de configuration DAV
 msgid "recipient must be organizer or attendee of event"
 msgstr "Le destinataire doit être organisateur ou participant de l'événement"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
+msgstr ""
-" configuration file)"
+"La variable scheduling_dkim_domain ne correspond pas au nom de votre serveur (vérifiez votre fichier "
-msgstr "La variable scheduling_dkim_domain ne correspond pas au nom de votre serveur (vérifiez votre fichier de configuration DAViCal)"
+"de configuration DAViCal)"
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
+msgstr ""
-"file)"
+"Variable scheduling_dkim_domain non initialisée (vérifiez votre fichier de configuration DAViCal)"
-msgstr "Variable scheduling_dkim_domain non initialisée (vérifiez votre fichier de configuration DAViCal)"
 
 msgid "sender must be organizer or attendee of event"
 msgstr "L’expéditeur doit être organisateur ou participant de l'événement"
@@ -1713,7 +1757,47 @@ msgstr "L’expéditeur doit être organisateur ou participant de l'événement"
 msgid "unauthenticated"
 msgstr "non authentifié"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "Vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui vous ont été fournis."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : le paramètre imap_url n'est pas configuré dans /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap : le paramètre imap_url n'est pas configuré dans /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "La plupart des fonctions DAViCal fonctionneront, mais une mise à jour vers PHP 5.2 ou ultérieure "
+#~ "est fortement recommandé."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Classe PHP DateTime"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>Attention : tous les événements de ce chemin seront supprimés avant l'insertion de tous ceux du "
+#~ "fichier ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- ajout de l'utilisateur %s au groupe : %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- désactivation des groupes : %s"
+
+#~ msgid "DAViCal Fatal Error"
+#~ msgstr "Erreur Fatale DAViCal"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "La ressource existante ne correspond pas à l'entête (HTTP) 'If-Match' - pas accepté."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "La ressource a été modifiée sur le serveur - non supprimée"
+
+#~ msgid "forget me not"
+#~ msgstr "Ne pas m'oublier"

po/hu.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Hungarian (http://www.transifex.com/lkraav/davical/language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -38,10 +36,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -51,7 +45,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -75,34 +69,35 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Lépjen be</h1><p>'%s' - hozzáféréshez lépjen befelhasználónevével és jelszavával</p><p>Ha hozzáférést szeretne kapni, írjon ide: %s</p>"
+"<h1>Lépjen be</h1><p>'%s' - hozzáféréshez lépjen befelhasználónevével és jelszavával</p><p>Ha "
+"hozzáférést szeretne kapni, írjon ide: %s</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -116,6 +111,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -125,6 +123,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Akció"
 
@@ -157,8 +158,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +167,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr "Minden változás mentve"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +203,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +247,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +279,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +355,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +374,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +468,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,9 +531,7 @@ msgstr "Felhasználó szerkesztése"
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Írja be a felhasználónevet. Egy e-mailt fog kapni egy új ideiglenes jelszóval."
 
 msgid "Enter your username and password then click here to log in."
@@ -542,6 +541,10 @@ msgstr "Írja be a felhasználónevét és jelszavát a belépéshez"
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -561,9 +564,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr "Európai (nap/hónap/év)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -637,19 +637,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +701,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +753,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -782,9 +780,8 @@ msgstr "Kilépés"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +812,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Szám"
@@ -846,9 +846,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +870,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +898,7 @@ msgstr "Jelszó"
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +937,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +989,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1022,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Erőforrás"
 
@@ -1034,9 +1032,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Az erőforrás a szerveren módosítva - törlés elutasítva."
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1050,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1090,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1106,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1136,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1184,9 +1173,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1186,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1218,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1227,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1249,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "A naptár elérési útja érvénytelen karaktert tartalmaz."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1265,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1280,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1324,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1334,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "Adatbázis-hiba történt íráskor."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1377,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1462,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1485,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1542,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1572,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Emlékezzen rám"
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1619,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1640,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1652,14 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "Lépjen be felhasználónevével és jelszavával."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Az erőforrás a szerveren módosítva - törlés elutasítva."
+
+#~ msgid "forget me not"
+#~ msgstr "Emlékezzen rám"

po/id_ID.po

@@ -1,29 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/lkraav/davical/language/id_ID/)\n"
+"Language: id_ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -37,10 +35,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -50,7 +44,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -74,33 +68,32 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
-"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -115,6 +108,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -124,6 +120,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -156,8 +155,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -166,8 +164,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr ""
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -203,6 +200,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -244,10 +244,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -277,9 +276,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -352,15 +352,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -372,7 +371,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -465,8 +465,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -529,9 +528,7 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -541,6 +538,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -560,9 +561,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -636,19 +634,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -704,9 +698,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -757,6 +750,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -781,9 +777,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -814,6 +809,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -845,9 +843,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -872,23 +867,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -898,9 +895,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -939,6 +934,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -988,8 +986,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1022,8 +1019,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1033,9 +1029,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1054,8 +1047,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1094,14 +1087,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1114,8 +1103,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1145,8 +1133,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1183,9 +1170,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1198,30 +1183,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1233,8 +1215,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1243,18 +1224,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1270,16 +1246,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1288,13 +1262,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1304,8 +1277,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1349,8 +1321,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1359,38 +1331,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1409,9 +1374,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1495,9 +1459,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1520,8 +1482,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1577,8 +1539,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1607,54 +1569,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1668,11 +1616,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1690,14 +1637,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1706,7 +1649,8 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr ""

po/it.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 # Mcihele Schiavo <micheleschi@gmail.com>, 2015
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Italian (http://www.transifex.com/lkraav/davical/language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -39,10 +37,6 @@ msgstr "*** Sconosciuta ***"
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -52,7 +46,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -76,34 +70,35 @@ msgid "- updating user records : %s"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ATTENZIONE: tutti gli eventi in questo path saranno cancellati dall'inserimento del file ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Log On</h1><p>Per accedere a %s devi autenticarti con le credenziali username e password che ti sono state assegnate.</p><p>Se desideri ottenere un accesso, invia una richiesta e-mail a %s.</p>"
+"<h1>Log On</h1><p>Per accedere a %s devi autenticarti con le credenziali username e password che ti "
+"sono state assegnate.</p><p>Se desideri ottenere un accesso, invia una richiesta e-mail a %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -117,6 +112,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versione della libreria AWL"
 
@@ -126,6 +124,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Azione"
 
@@ -158,8 +159,7 @@ msgstr ""
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -168,8 +168,7 @@ msgstr "Tutti i privilegi"
 msgid "All requested changes were made."
 msgstr "Tutte le modifiche richieste sono state apportate."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -205,6 +204,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -246,10 +248,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -279,9 +280,10 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -354,15 +356,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr ""
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -374,7 +375,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -467,8 +469,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -531,9 +532,7 @@ msgstr "Modifica questo record utente"
 msgid "Email Address"
 msgstr ""
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -543,6 +542,10 @@ msgstr "Inserire nome utente e password quindi clicca su log in per accedere"
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -562,9 +565,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr "Europeo (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -638,19 +638,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -706,9 +702,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -759,6 +754,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -783,9 +781,8 @@ msgstr "Esci"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -816,6 +813,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "No."
@@ -847,9 +847,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -874,23 +871,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -900,9 +899,7 @@ msgstr "Password"
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -941,6 +938,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -990,8 +990,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1024,8 +1023,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1035,9 +1033,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1056,8 +1051,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1096,14 +1091,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1116,8 +1107,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1147,8 +1137,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1185,9 +1174,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1200,30 +1187,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1235,8 +1219,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1245,18 +1228,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1272,16 +1250,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1290,13 +1266,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1306,8 +1281,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1351,8 +1325,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1361,38 +1335,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1411,9 +1378,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1497,9 +1463,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1522,8 +1486,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1579,8 +1543,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1609,54 +1573,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Mantieni aperta la connessione"
-
 msgid "from principal"
 msgstr ""
 
@@ -1670,11 +1620,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1692,14 +1641,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1708,7 +1653,15 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
-"you."
 msgstr ""
+
+msgid "you should log on with the username and password that have been issued to you."
+msgstr ""
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ATTENZIONE: tutti gli eventi in questo path saranno cancellati dall'inserimento del file ics</b>"
+
+#~ msgid "forget me not"
+#~ msgstr "Mantieni aperta la connessione"

po/ja.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Japanese (http://www.transifex.com/lkraav/davical/language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -38,10 +36,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -51,7 +45,7 @@ msgid "- creating record for users :  %s"
 msgstr "- ユーザーの情報を作成中： %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -75,34 +69,35 @@ msgid "- updating user records : %s"
 msgstr "- ユーザー情報を更新中: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>警告：このパス内の全てのイベントは、icsファイルの挿入の前に削除されます。</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<H1>ログオンして下さい</H1><P>%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワードでログオンして下さい。</P><P>アクセスをリクエストしたい場合は、%sにメールを送ってください。</P>"
+"<H1>ログオンして下さい</H1><P>%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワード"
+"でログオンして下さい。</P><P>アクセスをリクエストしたい場合は、%sにメールを送ってください。</P>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -116,6 +111,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -125,6 +123,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "アクション"
 
@@ -157,8 +158,7 @@ msgstr "全てのコレクションデータが回復不能な方法で削除さ
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "そのプリンシパルの全てのカレンダーとイベントが回復不能な方法で削除されます。"
 
 msgid "All privileges"
@@ -167,8 +167,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr "全てのリクエストされた変更が実行されました。"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "このスケジュール受信箱のオーナーに対する予定の有無の問い合わせを許可する。"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +203,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +247,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +279,10 @@ msgstr "コレクションID"
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +355,14 @@ msgid "Current DAViCal version "
 msgstr "現在のDAViCalバージョン"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAVパス"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +374,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "DAViCal DBスキーマバージョン"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +468,7 @@ msgstr "プリンシパルを削除中:"
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "主催者からのスケジュール招待をこのスケジュール受信箱に届ける"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,10 +531,9 @@ msgstr "このユーザー情報を編集"
 msgid "Email Address"
 msgstr "Emailアドレス"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"知っている場合はユーザー名を入力し、ここをクリックしてください。暫定パスワードがメールで送信されます。"
-msgstr "知っている場合はユーザー名を入力し、ここをクリックしてください。暫定パスワードがメールで送信されます。"
 
 msgid "Enter your username and password then click here to log in."
 msgstr "あなたのユーザー名とパスワードを入力してから、ここをクリックしてログインして下さい。"
@@ -542,6 +542,10 @@ msgstr "あなたのユーザー名とパスワードを入力してから、こ
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "NoUserFoundエラーがフィルター>%s<, attributes >%s< , dn >%s<で発生しました。"
@@ -561,9 +565,6 @@ msgstr "ヨーロッパ"
 msgid "European (d/m/y)"
 msgstr "ヨーロッパ (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "既存の資源が\"If-Match\"ヘッダと一致しません - 受け付けられません。"
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "既存の資源が\"If-Match\"ヘッダと一致します - 受け付けられません。"
 
@@ -637,19 +638,15 @@ msgstr "グループプリンシパル"
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +702,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +754,9 @@ msgstr "グループのリスト"
 msgid "List Resources"
 msgstr "資源のリスト"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "ユーザーのリスト"
 
@@ -782,9 +781,8 @@ msgstr "ログアウト"
 msgid "Member deleted from this Group Principal"
 msgstr "このグループプリンシパルからメンバーを削除しました"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +813,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "No."
@@ -846,9 +847,6 @@ msgstr "ロックをオーバーライドする"
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +871,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +899,7 @@ msgstr "パスワード"
 msgid "Path"
 msgstr "パス"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +938,9 @@ msgstr "プリンシパルタイプ"
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +990,7 @@ msgstr "予定有無情報を読み取る"
 msgid "Read the content of a resource or collection"
 msgstr "資源またはコレクションの内容を読み取る"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "この資源への現在のユーザーのアクセス制御の詳細を読み取る"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1023,7 @@ msgstr "機能をリクエストする"
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "資源"
 
@@ -1034,9 +1033,6 @@ msgstr "資源カレンダープリンシパル"
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr "資源はサーバー上で既に変更されています - 削除されません。"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1051,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1091,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr "予定の有無の問い合わせを送信する"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "このスケジュール送信箱のオーナーから、主催者としてスケジュール招待を送信する"
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "このスケジュール送信箱のオーナーから、出席者としてスケジュール返信を送信する"
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1107,7 @@ msgid "Set read+write privileges"
 msgstr "読み書き権限を設定する"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1137,7 @@ msgstr "いくつかの特性は設定できませんでした。"
 msgid "Source resource does not exist."
 msgstr "元の資源が存在しません。"
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "特殊なコレクションは、カレンダーまたは他の特殊なコレクションを含めません。"
 
 msgid "Specific Privileges"
@@ -1184,9 +1174,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1187,27 @@ msgid "That resource is not present on this server."
 msgstr "その資源はこのサーバー上にありません。"
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1219,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1228,13 @@ msgstr "DAViCal Home Page"
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1250,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "カレンダーパスに不正な文字が使用されています。"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1266,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,9 +1281,9 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
-msgstr "そのファイル%sはUTF-8でエンコードされていません。さらなる詳細についてはそのエラーを確認して下さい。"
+"そのファイル%sはUTF-8でエンコードされていません。さらなる詳細についてはそのエラーを確認して下さい。"
 
 msgid "The full name for this person, group or other type of principal."
 msgstr ""
@@ -1350,8 +1326,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1336,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "データベースへの書き込み中にエラーがありました。"
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1379,8 @@ msgid "To ID"
 msgstr "宛先ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1464,7 @@ msgstr "ユーザー名"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1487,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1544,8 @@ msgid "You are viewing"
 msgstr "閲覧中"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1574,42 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr "ディレクトリ%sは読み取り可能ではありません。"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : TLSを開始できませんでした : ldap_start_tls()failed"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : ホスト%1$sにポート%2$s、bindDN%3$sでバインドに失敗しました"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : LDAPをプロトコルバージョン３で使用に失敗しました、TLSはサポートされていません"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : LDAPにバインドできません - bindDNとpassDNの設定を確認し、LDAPサーバーに到達可能であること確認して下さい。"
+msgstr ""
+"drivers_ldap : LDAPにバインドできません - bindDNとpassDNの設定を確認し、LDAPサーバーに到達可能であるこ"
+"と確認して下さい。"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : ホスト%2$sのポート%1$sでLDAPに接続できませんでした"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : 関数ldap_connectが定義できませんでした、php_ldap moduleを確認して下さい"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : ファイル%sが見つかりません"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "私を忘れないで"
-
 msgid "from principal"
 msgstr "プリンシパルから"
 
@@ -1669,11 +1623,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1644,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1656,20 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "あなたに発行したユーザー名とパスワードでログオンして下さい。"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b>警告：このパス内の全てのイベントは、icsファイルの挿入の前に削除されます。</b>"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "既存の資源が\"If-Match\"ヘッダと一致しません - 受け付けられません。"
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "資源はサーバー上で既に変更されています - 削除されません。"
+
+#~ msgid "forget me not"
+#~ msgstr "私を忘れないで"

po/ko_KR.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # keithwrites <inbox@keithwrites.so>, 2014
@@ -10,23 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:32+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/lkraav/davical/language/ko_KR/)\n"
+"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -40,10 +38,6 @@ msgstr "*** 알 수 없음 ***"
 msgid "- adding %s to group : %s"
 msgstr "- %s 를 그룹에 추가중: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- 사용자 %s 를 그룹에 추가중: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- 그룹 생성중: %s"
@@ -53,8 +47,8 @@ msgid "- creating record for users :  %s"
 msgstr "- 사용자 레코드 생성중: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- 그룹 비활성화 : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -77,34 +71,35 @@ msgid "- updating user records : %s"
 msgstr "- 사용자 레코드 업데이트 : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b> 경고: 현재 경로에 ICS 파일을 불러오기 하면 기존 내용은 모두 삭제됩니다.</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>로그인 해주세요</h1><p> %s에 엑세스 하려면 먼저 로그인해야 합니다.</p><p>권한을 요청하려면 %s로 이메일을 보내세요.</p>"
+"<h1>로그인 해주세요</h1><p> %s에 엑세스 하려면 먼저 로그인해야 합니다.</p><p>권한을 요청하려면 %s로 이"
+"메일을 보내세요.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -118,6 +113,9 @@ msgstr "컬렉션은 캘린더와 주소록 모두가 될 수 없습니다."
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "AWL 라이브러리 버전"
 
@@ -127,6 +125,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -159,8 +160,7 @@ msgstr "모든 컬렉션 데이터가 복구 불가능하게 삭제 되었습니
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "사용자 \"%s\"의 모든 일정이 지워지고 %s 파일의 내용으로 변경됩니다."
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "모든 캘린더와 이벤트가 복구 불가능하게 삭제 되었습니다."
 
 msgid "All privileges"
@@ -169,8 +169,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr "모든 변경사항이 적용되었습니다."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -206,6 +205,9 @@ msgstr "인증서버가 응답하지 않습니다."
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "다른 컬렉션으로의 연결"
 
@@ -247,10 +249,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -280,9 +281,10 @@ msgstr "컬렉션 ID"
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "컬렉션은 CalDAV 캘린더와 CardDAV 주소록 모두가 될 수 없습니다."
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -355,15 +357,14 @@ msgid "Current DAViCal version "
 msgstr "현재 DAViCal 버전"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAV 경로"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -375,7 +376,8 @@ msgstr "DAViCal CalDAV 서버 - 설정 도움말"
 msgid "DAViCal DB Schema version "
 msgstr "DAViCal 데이터베이스 구조 버전"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -468,8 +470,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -532,9 +533,7 @@ msgstr ""
 msgid "Email Address"
 msgstr "이메일 주소"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "사용자명을 안다면 입력하고 여기를 눌러주세요. 등록된 이메일 주소로 임시 비밀번호가 발송됩니다."
 
 msgid "Enter your username and password then click here to log in."
@@ -544,6 +543,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -563,9 +566,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr "유럽식 (일/월/년)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -639,19 +639,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -707,9 +703,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "캘린더를 불러오고 LDAP와 동기화"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -760,6 +755,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -784,9 +782,8 @@ msgstr "로그아웃"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -817,6 +814,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -848,9 +848,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr "PDO PostgreSQL 드라이버"
 
-msgid "PHP DateTime class"
-msgstr "PHP DateTime 클래스"
-
 msgid "PHP Information"
 msgstr "PHP 정보"
 
@@ -875,23 +872,25 @@ msgstr "PHP 캘린더 확장 사용 가능 여부"
 msgid "PHP curl support"
 msgstr "PHP curl 지원"
 
+msgid "PHP curl support is required for external binds"
+msgstr "외부 연결을 위해서는 PHP curl 지원이 필수적입니다."
+
 msgid "PHP iconv support"
 msgstr "PHP iconv 지원 여부"
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "외부 연결을 위해서는 PHP curl 지원이 필수적입니다."
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr "정상"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "정상: %s"
 
@@ -901,9 +900,7 @@ msgstr "비밀번호"
 msgid "Path"
 msgstr "경로"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -942,6 +939,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -991,8 +991,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1025,8 +1024,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -1036,9 +1034,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1057,8 +1052,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1097,14 +1092,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1117,8 +1108,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1148,8 +1138,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1186,9 +1175,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1201,30 +1188,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1236,8 +1220,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr "BIND를 할 수 없는 위치입니다."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1246,18 +1229,13 @@ msgstr "DAViCal 홈페이지"
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1273,16 +1251,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1291,13 +1267,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1307,8 +1282,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "파일 인코딩이 UTF-8이 아닙니다. 추가 정보는 에러메세지를 확인하세요."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1352,8 +1326,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1362,38 +1336,31 @@ msgstr "데이터베이스로부터 데이터를 불러오는데 실패했습니
 msgid "There was an error writing to the database."
 msgstr ""
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1412,9 +1379,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1498,9 +1464,7 @@ msgstr "아이디"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1523,8 +1487,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1580,8 +1544,8 @@ msgid "You are viewing"
 msgstr ""
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1610,54 +1574,40 @@ msgstr "calendar-timezone 속성은 캘린더에만 유효한 속성입니다."
 msgid "directory %s is not readable"
 msgstr "%s 디렉토리가 읽기가능하지 않습니다."
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : /etc/davical/*-conf.php 파일에 imap_url 이 지정되지 않았습니다."
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : /etc/davical/*-conf.php 파일에 imap_url 이 지정되지 않았습니다."
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "자동 로그인"
-
 msgid "from principal"
 msgstr ""
 
@@ -1671,11 +1621,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1693,14 +1642,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1709,7 +1654,31 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "올바른 사용자명과 패스워드를 사용하세요."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : /etc/davical/*-conf.php 파일에 imap_url 이 지정되지 않았습니다."
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap : /etc/davical/*-conf.php 파일에 imap_url 이 지정되지 않았습니다."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "PHP DateTime 클래스"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b> 경고: 현재 경로에 ICS 파일을 불러오기 하면 기존 내용은 모두 삭제됩니다.</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- 사용자 %s 를 그룹에 추가중: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- 그룹 비활성화 : %s"
+
+#~ msgid "forget me not"
+#~ msgstr "자동 로그인"

po/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:40+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,10 +35,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -48,7 +44,7 @@ msgid "- creating record for users :  %s"
 msgstr ""
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -78,7 +74,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+"<b>WARNING: all events in this path will be deleted before inserting all of "
 "the ics file</b>"
 msgstr ""
 
@@ -87,12 +83,12 @@ msgid ""
 "<h1>Help</h1>\n"
 "<p>For initial help you should visit the <a href=\"https://www.davical.org/"
 "\" target=\"_blank\">DAViCal Home Page</a> or take\n"
-"a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank"
+"a look at the <a href=\"https://wiki.davical.org/%s\" "
-"\">DAViCal Wiki</a>.</p>\n"
+"target=\"_blank\">DAViCal Wiki</a>.</p>\n"
 "<p>If you can't find the answers there, visit us on <a href=\"https://"
 "wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
-"the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target="
+"the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" "
-"\"_blank\">irc.oftc.net</a>,\n"
+"target=\"_blank\">irc.oftc.net</a>,\n"
 "or send a question to the <a href=\"https://lists.sourceforge.net/mailman/"
 "listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>."
 "</p>\n"
@@ -120,6 +116,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -129,6 +128,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -209,6 +211,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -251,8 +256,8 @@ msgstr ""
 
 msgid ""
 "Cannot determine upstream version, because PHP has set “<a href=\"https://"
-"secure.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen"
+"secure.php.net/manual/en/filesystem.configuration.php#ini.allow-url-"
-"\"><code>allow_url_fopen</code></a>” to “<code>FALSE</code>”."
+"fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -282,6 +287,9 @@ msgstr ""
 msgid "Collection deleted."
 msgstr ""
 
+msgid "Collection deletion failed."
+msgstr ""
+
 msgid ""
 "Collections may not be both CalDAV calendars and CardDAV addressbooks at the "
 "same time"
@@ -377,7 +385,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -546,6 +555,10 @@ msgstr ""
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -565,9 +578,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr ""
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -762,6 +772,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -786,9 +799,8 @@ msgstr ""
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -819,6 +831,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr ""
@@ -850,9 +865,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -877,13 +889,16 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
 msgid ""
@@ -894,6 +909,10 @@ msgstr ""
 msgid "Passed"
 msgstr ""
 
+#, php-format
+msgid "Passed: %s"
+msgstr ""
+
 msgid "Password"
 msgstr ""
 
@@ -941,6 +960,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -1033,9 +1055,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1606,11 +1625,6 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf."
-"php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
@@ -1629,6 +1643,10 @@ msgid ""
 "and passDN, and that your LDAP server is reachable"
 msgstr ""
 
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
+
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
@@ -1641,18 +1659,10 @@ msgstr ""
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr ""
-
 msgid "from principal"
 msgstr ""
 
@@ -1703,6 +1713,9 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
+msgid "unimplemented"
+msgstr ""
+
 msgid ""
 "you should log on with the username and password that have been issued to "
 "you."

po/nb_NO.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # bruberg <bruberg@gmail.com>, 2014
 # Cyril Giraud <cgiraud@free.fr>, 2017
@@ -12,23 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:24+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/lkraav/davical/language/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -42,10 +40,6 @@ msgstr "*** Ukjent ***"
 msgid "- adding %s to group : %s"
 msgstr "- legger til %s i gruppe : %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- legger til brukerne %s i gruppe : %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- oppretter grupper : %s"
@@ -55,8 +49,8 @@ msgid "- creating record for users :  %s"
 msgstr "- oppretter post for brukere : %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- deaktiverer grupper : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -79,34 +73,46 @@ msgid "- updating user records : %s"
 msgstr "- oppdaterer brukerdata : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ADVARSEL: alle hendelser i denne banen vil bli slettet ved innsetting av ics-filen</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Hjelp</h1>\n<p>For oppstartshjelp bør du besøke <a href=\"https://www.davical.org\" target=\"_blank\">DAViCal-hjemmesiden</a> eller ta en titt på <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal wikien.</a></p>\n<p>Kan du ikke finne svaret der, kom innom vår <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a>-kanal <b>#davical</b> på <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>-nettverket,\neller send spørsmålet til <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal epostlisten for brukere</a>.</p>\n<p><a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">Epostlistearkivene</a> kan også være nyttige.</p>"
+msgstr ""
+"<h1>Hjelp</h1>\n"
+"<p>For oppstartshjelp bør du besøke <a href=\"https://www.davical.org\" target=\"_blank\">DAViCal-"
+"hjemmesiden</a> eller ta en titt på <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal "
+"wikien.</a></p>\n"
+"<p>Kan du ikke finne svaret der, kom innom vår <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a>-kanal <b>#davical</b> på <a href=\"https://www.oftc."
+"net/\" target=\"_blank\">irc.oftc.net</a>-nettverket,\n"
+"eller send spørsmålet til <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
+"target=\"_blank\">DAViCal epostlisten for brukere</a>.</p>\n"
+"<p><a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">Epostlistearkivene</a> kan også være nyttige.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Logg deg inn</h1><p>For tilgang til %s skal du oppgi brukernavnet og passordet du fikk</p><p>Vil du be om tilgang, kontakt %s.</p>"
+"<h1>Logg deg inn</h1><p>For tilgang til %s skal du oppgi brukernavnet og passordet du fikk</p><p>Vil "
+"du be om tilgang, kontakt %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "En DAViCal kontosamling kan bare inneholde samlinger"
@@ -120,6 +126,9 @@ msgstr "En samling kan ikke være både en kalender og en adressebok."
 msgid "A resource already exists at the destination."
 msgstr "En ressurs finnes allerede der "
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "AWL bibliotekversjon "
 
@@ -129,6 +138,9 @@ msgstr "Adgangstilganger"
 msgid "Access ticket deleted."
 msgstr "Adgangstilgang slettet."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Handling"
 
@@ -161,8 +173,7 @@ msgstr "Alle data til samlingen vil ugjenopprettelig bli slettet"
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Alle hendelser tilhørende \"%s\" ble slettet og erstattet med de fra filen %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Alle kontoens kalendre og hendelser vil ugjenopprettelig bli slettet"
 
 msgid "All privileges"
@@ -171,8 +182,7 @@ msgstr "Alle privilegier"
 msgid "All requested changes were made."
 msgstr "Alle forespurte endringer ble utført"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Tillat ledig/opptatt-forespørsler rettet til eieren av denne innboksen"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -208,6 +218,9 @@ msgstr "Autentiseringsserver utilgjengelig"
 msgid "Binding deleted."
 msgstr "Forbindelse slettet."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Forbindelse til andre samlinger"
 
@@ -249,10 +262,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -282,9 +294,10 @@ msgstr "Samlings-ID"
 msgid "Collection deleted."
 msgstr "Samling slettet."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Samlinger kan ikke være både CalDAV og CardDAV adressebøker samtidig"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -357,15 +370,14 @@ msgid "Current DAViCal version "
 msgstr "Gjeldende DAViCal versjon"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAV bane"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::ressurstype kan bare settes til ny verdi, kan ikke slettes"
 
 msgid "DAViCal CalDAV Server"
@@ -377,7 +389,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "DAViCal DB Schema-versjon "
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -470,8 +483,7 @@ msgstr "Sletter konto:"
 msgid "Deleting Ticket:"
 msgstr "Sletter tilgang"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Levér invitasjoner fra en organisator til denne innboksen"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -534,9 +546,7 @@ msgstr "Redigér denne brukerens post"
 msgid "Email Address"
 msgstr "Epostadresse"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Oppgi brukernavnet, om du vet det, og klikk her for tilsending av midlertidig passord "
 
 msgid "Enter your username and password then click here to log in."
@@ -546,6 +556,10 @@ msgstr "Oppgi brukernavn og passord og klikk her for å logge inn"
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Feil NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -565,9 +579,6 @@ msgstr "Europeisk"
 msgid "European (d/m/y)"
 msgstr "Europeisk (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Eksisterende ressurs passer ikke \"If-Match\" header - ikke akseptert."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Eksisterende ressurs passer \"If-None-Match\" header - ikke akseptert,"
 
@@ -641,19 +652,15 @@ msgstr "Gruppekontoer"
 msgid "Groups &amp; Grants"
 msgstr "Grupper og rettigheter"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -709,9 +716,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importér kalendre og synkronisér LDAP"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -762,6 +768,9 @@ msgstr "Liste grupper"
 msgid "List Resources"
 msgstr "Liste ressurser"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Liste brukere"
 
@@ -786,10 +795,9 @@ msgstr "Logg ut"
 msgid "Member deleted from this Group Principal"
 msgstr "Medlem slettet fra denne gruppekonto"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "De fleste funksjoner av DAViCal vil fungere, men å oppgradere til PHP 5.2 eller nyere er anbefalt på det sterkeste."
 
 msgid "Name"
 msgstr "Navn"
@@ -819,6 +827,9 @@ msgstr "Ingen ressurs eksisterer på det angitte målet"
 msgid "No summary"
 msgstr "Ingen oppsummering"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Nr."
@@ -850,9 +861,6 @@ msgstr "Bryt en lås"
 msgid "PDO PostgreSQL drivers"
 msgstr "PDO PostgreSQL drivere"
 
-msgid "PHP DateTime class"
-msgstr "PHP DateTime class"
-
 msgid "PHP Information"
 msgstr "PHP-informasjon"
 
@@ -877,23 +885,25 @@ msgstr "PHP kalenderutvidelse er tilgjengelig."
 msgid "PHP curl support"
 msgstr "PHP curl-støtte"
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr "Støtte for PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP er ikke satt til å bruke Apache Filter-modus."
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr "PUT på en samling er bare tillatt for tekst-/kalenderinnhold i en kalendersamling"
 
 msgid "Passed"
 msgstr "Godkjent"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Godkjent: %s"
 
@@ -903,9 +913,7 @@ msgstr "Passord"
 msgid "Path"
 msgstr "Bane"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -944,6 +952,9 @@ msgstr "Kontotype"
 msgid "Principal deleted."
 msgstr "Konto slettet."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Kontoer: Brukere, ressurser og grupper"
 
@@ -993,8 +1004,7 @@ msgstr "Les Ledig/Opptatt informasjon"
 msgid "Read the content of a resource or collection"
 msgstr "Les innholdet til en ressurs eller samling"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Les detaljer om gjeldende brukers adgangskontroll til denne ressursen"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1027,8 +1037,7 @@ msgstr "Be om funksjonalitet"
 msgid "Request body is not valid XML data!"
 msgstr "Request body er ikke gyldig XML-data!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Ressurs"
 
@@ -1038,9 +1047,6 @@ msgstr "Ressurskalender-kontoer"
 msgid "Resource Not Found."
 msgstr "Ressurs ikke funnet"
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Ressurs er endret på tjener - ikke slettet"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Ressurser har kalendre, men vil normalt ikke logge inn."
 
@@ -1059,8 +1065,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1099,14 +1105,10 @@ msgstr "Hendelse: Sender"
 msgid "Send free/busy enquiries"
 msgstr "Send Ledig/Opptatt forespørsel"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "Send hendelsesinvitasjon som organisator fra eieren av denne utboksen"
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Send invitasjonssvar som deltaker fra eieren av denne utboksen"
 
 msgid "Set free/busy privileges"
@@ -1119,9 +1121,10 @@ msgid "Set read+write privileges"
 msgstr "Sett lese+skriverettigheter"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Angi en sti for lagring av ics. For eksempel ‹kalender› vil bli referert som /caldav.php/brukernavn/kalender/"
+"Angi en sti for lagring av ics. For eksempel ‹kalender› vil bli referert som /caldav.php/brukernavn/"
+"kalender/"
 
 msgid "Setup"
 msgstr "Oppsett"
@@ -1150,8 +1153,7 @@ msgstr "Noen egenskaper kunne ikke settes"
 msgid "Source resource does not exist."
 msgstr "Ressurskilde finnes ikke"
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Spesielle samlinger kan ikke inneholde kalendre eller andre spesialsamlinger"
 
 msgid "Specific Privileges"
@@ -1188,9 +1190,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1203,30 +1203,27 @@ msgid "That resource is not present on this server."
 msgstr "Ressursen er ikke tilstede på denne tjeneren"
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1238,8 +1235,7 @@ msgstr "BIND Request-URI MÅ identifisere en samling."
 msgid "The BIND method is not allowed at that location."
 msgstr "BIND-metoden er ikke tillatt på den lokasjonen."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "CalDAV:schedule-calendar-transp egenskap kan bare settes på kalendre"
 
 msgid "The DAViCal Home Page"
@@ -1248,18 +1244,13 @@ msgstr "DAViCal Hjemmeside"
 msgid "The access ticket will be deleted."
 msgstr "Adgangstilgangen vil bli slettet"
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "Adressebok-forespørselsrapport må kjøres mot en adressebok-samling"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1275,16 +1266,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Kalenderbanen inneholder ulovlige karakterer"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "Den angitte URL kan ikke svare på kalenderforespørselsrapport."
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "Kalender forespørselsrapport må kjøres mot en kalender eller hendelsessamling"
 
 msgid "The collection name may not be blank."
@@ -1293,13 +1282,12 @@ msgstr "Samlingens navn kan ikke være tom"
 msgid "The destination collection does not exist"
 msgstr "Målsamlingen eksisterer ikke"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "Visningsnavn kan bare settes på samlinger, kontoer eller forbindelser"
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1309,8 +1297,7 @@ msgstr "Epostadressen bør absolutt ikke være tom"
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Filen \"%s\" er ikke inkodet i UTF-8 encoded. Kontroller feilen for flere detaljer."
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Filen er ikke UTF-8 encoded, sjekk feilen for flere detaljer"
 
 msgid "The full name for this person, group or other type of principal."
@@ -1354,8 +1341,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Brukernavnet kan ikke være tomt og kan ikke inneholde slash"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1364,39 +1351,45 @@ msgstr "En feil oppsto ved lesing fra databasen."
 msgid "There was an error writing to the database."
 msgstr "Det oppsto en feil under skriving til databasen"
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige grupper i LDAP katalogen</li> <li>sjekker "
-msgstr "Denne operasjonen gjør følgende: <ul><li>sjekker gyldige grupper i LDAP katalogen</li> <li>sjekker grupper i DAViCal</li></ul> deretter <ul><li>hvis en gruppe finnes i DAViCal men ikke i LDAP setter som inaktiv i DAViCal</li> <li>hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter en gruppe i DAViCal</li> <li>hvis en gruppe finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</li> </ul>"
+"grupper i DAViCal</li></ul> deretter <ul><li>hvis en gruppe finnes i DAViCal men ikke i LDAP setter "
+"som inaktiv i DAViCal</li> <li>hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter en gruppe i "
+"DAViCal</li> <li>hvis en gruppe finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</li> </ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige gruppe i LDAP katalogen</li> <li>sjekker "
-msgstr "Denne operasjonen gjør følgende: <ul><li>sjekker gyldige gruppe i LDAP katalogen</li> <li>sjekker brukere i DAViCal</li></ul> deretter <ul><li>hvis en bruker finnes i DAViCal men ikke i LDAP setter denne sim inaktiv i DAViCal</li> <li>hvis en bruker finnes i LDAP men ikke i DAViCal oppretter brukeren i DAViCal</li> <li>hvis brukeren finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</li> </ul>"
+"brukere i DAViCal</li></ul> deretter <ul><li>hvis en bruker finnes i DAViCal men ikke i LDAP setter "
+"denne sim inaktiv i DAViCal</li> <li>hvis en bruker finnes i LDAP men ikke i DAViCal oppretter "
+"brukeren i DAViCal</li> <li>hvis brukeren finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</"
+"li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Denne siden sjekker miljøet nødvendig for at DAViCal skal virke korrekt.  Forslag eller patsjer for å gjøre det enda bedre vil mottas med takk."
+"Denne siden sjekker miljøet nødvendig for at DAViCal skal virke korrekt.  Forslag eller patsjer for å "
+"gjøre det enda bedre vil mottas med takk."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Prosesen vil hente inn hver fil i mappen med navnet \"brukernavn.ics\" og opprette en bruker og kalender for hver bruker og kalender som hentes inn."
+msgstr ""
+"Prosesen vil hente inn hver fil i mappen med navnet \"brukernavn.ics\" og opprette en bruker og "
+"kalender for hver bruker og kalender som hentes inn."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Denne tjeneren støtter bare text/calendar-formatet for freebusy-adresser."
@@ -1414,9 +1407,8 @@ msgid "To ID"
 msgstr "Til ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1500,9 +1492,7 @@ msgstr "Brukernavn"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr "Brukere vil normalt ha kalendre, og er også i stand til å logge på systemet."
 
 msgid "View My Details"
@@ -1525,9 +1515,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Ønsket: %s, Nåværende: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Advarsel: det finnes ingen administratorbrukere! Du bør rette feilen før du logger ut. Foreslår bruk av $c->do_not_sync_from_ldap konfigurasjonsinstillingen."
+msgstr ""
+"Advarsel: det finnes ingen administratorbrukere! Du bør rette feilen før du logger ut. Foreslår bruk "
+"av $c->do_not_sync_from_ldap konfigurasjonsinstillingen."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Da brukerens epost ble kontrollert"
@@ -1582,8 +1574,8 @@ msgid "You are viewing"
 msgstr "Du ser på"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1612,54 +1604,42 @@ msgstr "kalender-tidssone egenskap er kun gyldig for en kalender"
 msgid "directory %s is not readable"
 msgstr "mappen %s er ikke lesbar"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : imap_url parameter ikke konfigurert i /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Kunne ikke starte TLS: ldap_start_tls() feilet"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : Feilet å binde til vert %1$s på port %2$s with bindDN of %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : Feilet å sette LDAP til å bruke protokoll version 3, TLS ikke støttet"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Ute av stand til å binde til LDAP - sjekk din konfigurasjon for bindDN og passDN, og at din  LDAP server kan nås"
+msgstr ""
+"drivers_ldap : Ute av stand til å binde til LDAP - sjekk din konfigurasjon for bindDN og passDN, og at "
+"din  LDAP server kan nås"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Ute av stand til kommunikasjon med LDAP med port %s på vert %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : function ldap_connect ikke definert, sjekk din php_ldap modul"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : Unable to find %s file"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : imap_url parameter ikke konfigurert i /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Unable to find %s file"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "forglem meg ei"
-
 msgid "from principal"
 msgstr "fra konto"
 
@@ -1673,11 +1653,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1695,14 +1674,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1711,7 +1686,42 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "Ikke-autentisert"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "logg på med brukernavnet og passordet du fikk utstedt"
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : imap_url parameter ikke konfigurert i /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap : imap_url parameter ikke konfigurert i /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "De fleste funksjoner av DAViCal vil fungere, men å oppgradere til PHP 5.2 eller nyere er anbefalt "
+#~ "på det sterkeste."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "PHP DateTime class"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b>ADVARSEL: alle hendelser i denne banen vil bli slettet ved innsetting av ics-filen</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- legger til brukerne %s i gruppe : %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- deaktiverer grupper : %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Eksisterende ressurs passer ikke \"If-Match\" header - ikke akseptert."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Ressurs er endret på tjener - ikke slettet"
+
+#~ msgid "forget me not"
+#~ msgstr "forglem meg ei"

po/nl.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 # Cyril Giraud <cgiraud@free.fr>, 2017
@@ -12,23 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 11:27+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Dutch (http://www.transifex.com/lkraav/davical/language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -42,10 +40,6 @@ msgstr "*** Onbekend ***"
 msgid "- adding %s to group : %s"
 msgstr "- toevoegen van %s aan groep: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- toevoegen van gebruikers %s aan groep: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- aanmaken van groepen: %s"
@@ -55,8 +49,8 @@ msgid "- creating record for users :  %s"
 msgstr "- aanmaken van gebruikers: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- groepen: %s uitschakelen"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -79,34 +73,44 @@ msgid "- updating user records : %s"
 msgstr "- wijzigen van gebruikers: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Uitleg op de wiki van DAViCal</a>"
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer het ics-bestand wordt ingevoegd</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Help</h1><p>Voor de eerste hulp kunt u terecht op de<a href=\"https://www.davical.org/\" target=\"_blank\">website van DAViCal</a>. Neem ook eens een kijkje op de <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal-wiki</a>.</p><p>Als u daar de antwoorden niet kunt vinden, kom dan binnen op <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in het kanaal <b>#davical</b> op <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>, of stuur een vraag aan de <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users-mailinglijst</a>.</p><p>De<a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">archieven van de mailinglijst</a> kunnen ook nuttig zijn.</p>"
+msgstr ""
+"<h1>Help</h1><p>Voor de eerste hulp kunt u terecht op de<a href=\"https://www.davical.org/\" "
+"target=\"_blank\">website van DAViCal</a>. Neem ook eens een kijkje op de <a href=\"https://wiki."
+"davical.org/%s\" target=\"_blank\">DAViCal-wiki</a>.</p><p>Als u daar de antwoorden niet kunt vinden, "
+"kom dan binnen op <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> "
+"in het kanaal <b>#davical</b> op <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>, "
+"of stuur een vraag aan de <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
+"target=\"_blank\">DAViCal Users-mailinglijst</a>.</p><p>De<a href=\"https://sourceforge.net/p/davical/"
+"mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">archieven van de "
+"mailinglijst</a> kunnen ook nuttig zijn.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Aanmelden</h1><p>Om toegang te krijgen tot de %s moet u zich aanmelden met de gebruikersnaam en het wachtwoord dat u heeft gekregen.</p><p>Wilt u toegang aanvragen, stuur dan een e-mail aan %s.</p>"
+"<h1>Aanmelden</h1><p>Om toegang te krijgen tot de %s moet u zich aanmelden met de gebruikersnaam en "
+"het wachtwoord dat u heeft gekregen.</p><p>Wilt u toegang aanvragen, stuur dan een e-mail aan %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Een DAViCal principaalcollectie kan alleen collecties bevatten"
@@ -120,6 +124,9 @@ msgstr "Een collectie kan niet tegelijkertijd een agenda en een adressenboek zij
 msgid "A resource already exists at the destination."
 msgstr "Er bestaat al een bron op die bestemming."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "AWL Library versie"
 
@@ -129,6 +136,9 @@ msgstr "Toegangstickets"
 msgid "Access ticket deleted."
 msgstr "Toegangsticket verwijderd."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Actie"
 
@@ -161,8 +171,7 @@ msgstr "Alle gegevens van de collectie worden onherroepelijk verwijderd."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Alle afspraken van de gebruiker \"%s\" zijn verwijderd en vervangen door die uit het bestand %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Alle agenda's en afspraken van de Principaal worden onherroepelijk verwijderd."
 
 msgid "All privileges"
@@ -171,8 +180,7 @@ msgstr "Alle bevoegdheden"
 msgid "All requested changes were made."
 msgstr "De gevraagde wijzigingen zijn doorgevoerd."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Laat Vrij/Bezet-queries gericht aan de eigenaar van deze planning-inbox toe"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -208,6 +216,9 @@ msgstr "Authenticatieserver niet bereikbaar"
 msgid "Binding deleted."
 msgstr "Associatie verwijderd."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Associaties met andere collecties"
 
@@ -249,10 +260,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -282,9 +292,10 @@ msgstr "ID van de Collectie"
 msgid "Collection deleted."
 msgstr "Collectie verwijderd."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Collecties kunnen niet terzelfdertijd CalDAV agenda's en CardDAV adresboeken zijn"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -357,16 +368,18 @@ msgid "Current DAViCal version "
 msgstr "Huidige DAViCal versie"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
-msgstr "Deze pagina doet niets. De auteurs zouden graag suggesties of patches ontvangen om deze pagina iets nuttigs te laten doen."
+msgstr ""
+"Deze pagina doet niets. De auteurs zouden graag suggesties of patches ontvangen om deze pagina iets "
+"nuttigs te laten doen."
 
 msgid "DAV Path"
 msgstr "DAV Pad"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
-msgstr "DAV::resourcetype mag alleen worden ingesteld op een nieuwe waarde en kan het niet worden verwijderd."
+"DAV::resourcetype mag alleen worden ingesteld op een nieuwe waarde en kan het niet worden verwijderd."
 
 msgid "DAViCal CalDAV Server"
 msgstr "DAViCal CalDAV Server"
@@ -377,7 +390,8 @@ msgstr "DAViCal CalDAV Server - Hulp bij instellingen"
 msgid "DAViCal DB Schema version "
 msgstr "DAViCal DB schema versie"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -470,8 +484,7 @@ msgstr "Verwijderen Principaal:"
 msgid "Deleting Ticket:"
 msgstr "Verwijderen Ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Bezorg uitnodigingen van een organisator aan deze planning-inbox"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -534,10 +547,10 @@ msgstr "Wijzig deze gebruiker"
 msgid "Email Address"
 msgstr "E-mailadres"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Voer een gebruikersnaam in als je die weet en klik hier om een tijdelijk wachtwoord te krijgen via e-"
-msgstr "Voer een gebruikersnaam in als je die weet en klik hier om een tijdelijk wachtwoord te krijgen via e-mail"
+"mail"
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Voer je gebruikersnaam en wachtwoord in en klik hier om U aan te melden"
@@ -546,6 +559,10 @@ msgstr "Voer je gebruikersnaam en wachtwoord in en klik hier om U aan te melden"
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Fout NoGroupFound met filter &gt; %s &lt;, attributen &gt; %s &lt;, dn &gt; %s &lt;"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Fout NoUserFound met filter &gt; %s &lt;, attributen &gt; %s &lt;, dn &gt; %s &lt;"
@@ -565,9 +582,6 @@ msgstr "Europees"
 msgid "European (d/m/y)"
 msgstr "Europees (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Bestaande bron stemt niet overeen met \"If-Match\" header - niet geaccepteerd."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Bestaande bron stemt overeen met \"If-None-Match\" header - niet geaccepteerd."
 
@@ -641,20 +655,20 @@ msgstr "Groep-Principalen"
 msgid "Groups &amp; Grants"
 msgstr "Groepen en toekenningen"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+"Met een groep kunnen die rechten in één keer aan meerdere principalen tegelijkertijd worden toegekend."
-msgstr "Met een groep kunnen die rechten in één keer aan meerdere principalen tegelijkertijd worden toegekend."
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
+msgstr ""
+"Een groep kan ook lid zijn van andere groepen. Meerlaagse groepsverbanden vertragen wel het systeem."
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr "Een groep kan ook lid zijn van andere groepen. Meerlaagse groepsverbanden vertragen wel het systeem."
+msgstr ""
-
+"Groepen maken het mogelijk om tussenverbanden te leggen ter vergemakkelijking van het beheer. Zij "
-msgid ""
+"hoeven geen agenda's te hebben, en melden zich meestal niet aan."
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
-msgstr "Groepen maken het mogelijk om tussenverbanden te leggen ter vergemakkelijking van het beheer. Zij hoeven geen agenda's te hebben, en melden zich meestal niet aan."
 
 msgid "Has Members"
 msgstr "Heeft leden"
@@ -709,10 +723,11 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importeer agenda's en synchroniseer LDAP"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
+msgstr ""
-msgstr "Uiteindelijk zal de functionaliteit van dat programmaatje in DAViCal zelf worden opgenomen, maar voorlopig moet u het zelf even uitvoeren."
+"Uiteindelijk zal de functionaliteit van dat programmaatje in DAViCal zelf worden opgenomen, maar "
+"voorlopig moet u het zelf even uitvoeren."
 
 msgid "Inactive Principals"
 msgstr "Niet-actieve Principalen"
@@ -762,6 +777,9 @@ msgstr "Toon groepen"
 msgid "List Resources"
 msgstr "Toon bronnen"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Toon gebruikers"
 
@@ -786,10 +804,9 @@ msgstr "Afmelden"
 msgid "Member deleted from this Group Principal"
 msgstr "Lid verwijderd van deze groep-Principaal"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "Het grootste deel van DAViCal zal werken, maar upgraden naar PHP 5.2 of hoger wordt sterk aanbevolen."
 
 msgid "Name"
 msgstr "Naam"
@@ -819,6 +836,9 @@ msgstr "Er bestaat geen bron op de opgegeven locatie"
 msgid "No summary"
 msgstr "Geen samenvatting"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Aantal"
@@ -850,9 +870,6 @@ msgstr "Negeer een Lock"
 msgid "PDO PostgreSQL drivers"
 msgstr "PDO PostgreSQL drivers"
 
-msgid "PHP DateTime class"
-msgstr "PHP DateTime class"
-
 msgid "PHP Information"
 msgstr "Informatie over PHP"
 
@@ -877,23 +894,25 @@ msgstr "PHP calendar extensie beschikbaar"
 msgid "PHP curl support"
 msgstr "PHP curl ondersteuning"
 
+msgid "PHP curl support is required for external binds"
+msgstr "PHP curl ondersteuning is noodzakelijk voor 'externe binds'"
+
 msgid "PHP iconv support"
 msgstr "PHP iconv ondersteuning"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP gebruikt geen 'Apache Filter'-modus"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "PHP curl ondersteuning is noodzakelijk voor 'externe binds'"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr "PUT in een collectie is enkel toegestaan voor het type text/calendar tegen een agenda collectie"
 
 msgid "Passed"
 msgstr "Geslaagd"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Geslaagd: %s"
 
@@ -903,9 +922,7 @@ msgstr "Wachtwoord"
 msgid "Path"
 msgstr "Pad"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -944,6 +961,9 @@ msgstr "Principaal Type"
 msgid "Principal deleted."
 msgstr "Principaal verwijderd."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Principalen: gebruikers, bronnen en groepen"
 
@@ -993,8 +1013,7 @@ msgstr "Bevraag de Vrij/Bezet-informatie"
 msgid "Read the content of a resource or collection"
 msgstr "Bevraag de inhoud van een bron of collectie"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Bevraag de toegangsmogelijkheden van de huidige gebruiker m.b.t. deze bron"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1027,8 +1046,7 @@ msgstr "Vraag een feature aan"
 msgid "Request body is not valid XML data!"
 msgstr "Request body is geen geldige XML data"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Bron"
 
@@ -1038,9 +1056,6 @@ msgstr "Bron Agenda Principalen"
 msgid "Resource Not Found."
 msgstr "Bron niet gevonden"
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Bron gewijzigd op de server - niet verwijderd"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Bronnen hebben ook agenda's, maar melden zich meestal niet aan."
 
@@ -1059,9 +1074,11 @@ msgstr "Het SRV-record voor \"%s\" verwijst naar een verkeerd domein: \"%s\" in
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
-msgstr "Een SRV-record ontbreekt voor \"%s\", of wellicht ging er iets fout met de DNS-query. Controleer dat het domein waarvan u afspraken stuurt een SRV-record heeft."
+msgstr ""
+"Een SRV-record ontbreekt voor \"%s\", of wellicht ging er iets fout met de DNS-query. Controleer dat "
+"het domein waarvan u afspraken stuurt een SRV-record heeft."
 
 msgid "Schedule Deliver"
 msgstr "Levering van de planning"
@@ -1099,14 +1116,10 @@ msgstr "Planning: Verzenden"
 msgid "Send free/busy enquiries"
 msgstr "Verzend Vrij/Bezet-rondvraag"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "Verzend planning-informatie als een organisator vanwege de eigenaar van deze planning-outbox"
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Verzend planning-antwoorden als een genodigde vanwege de eigenaar van deze planning-outbox"
 
 msgid "Set free/busy privileges"
@@ -1119,9 +1132,10 @@ msgid "Set read+write privileges"
 msgstr "'Lees+Schrijf'-bevoegdheden instellen"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Configureer het pad waar uw ics zal worden bewaard, bijvoorbeeld 'kalender' zal worden verwezen als /caldav.php/gebruikersnaam/kalender/"
+"Configureer het pad waar uw ics zal worden bewaard, bijvoorbeeld 'kalender' zal worden verwezen als /"
+"caldav.php/gebruikersnaam/kalender/"
 
 msgid "Setup"
 msgstr "Configureren"
@@ -1150,8 +1164,7 @@ msgstr "Sommige eigenschappen konden niet ingesteld worden."
 msgid "Source resource does not exist."
 msgstr "Oorspronkelijke bron bestaat niet"
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Bijzondere collecties kunnen geen Agenda of andere bijzondere collectie bevatten."
 
 msgid "Specific Privileges"
@@ -1185,13 +1198,14 @@ msgstr "Synchroniseer LDAP met DAViCal"
 
 #, php-format
 msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
-msgstr "Het TXT-record voor %s._domainkey.%s is beschadigd, of wellicht ging er iets fout met de DNS-query."
+msgstr ""
+"Het TXT-record voor %s._domainkey.%s is beschadigd, of wellicht ging er iets fout met de DNS-query."
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
+msgstr ""
-"is configured"
+"Een TXT-record ontbreekt voor \"%s._domainkey.%s\", of wellicht ging er iets fout met de DNS-query. Er "
-msgstr "Een TXT-record ontbreekt voor \"%s._domainkey.%s\", of wellicht ging er iets fout met de DNS-query. Er is een RSA-privésleutel ingesteld."
+"is een RSA-privésleutel ingesteld."
 
 msgid "Target"
 msgstr "Doel"
@@ -1203,31 +1217,42 @@ msgid "That resource is not present on this server."
 msgstr "Die bron is niet aanwezig op deze server"
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
+msgstr ""
-msgstr "Het programma <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> moet handmatig worden uitgevoerd na het bijwerken van de programmatuur naar een nieuwe versie van DAViCal."
+"Het programma <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</"
+"a> moet handmatig worden uitgevoerd na het bijwerken van de programmatuur naar een nieuwe versie van "
+"DAViCal."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
+msgstr ""
-msgstr "Voor het <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">instellen van iSchedule</a> is een aantal DNS-regels nodig. Voor alle domeinen waarvoor u verzoeken wilt accepteren moeten DNS SRV record(s) aangemaakt worden. Het gaat hier om het domein-deel van de e-mailadressen van principaalrecords in DAViCal. Hieronder ziet u voorbeelden voor de in uw database gevonden domeinen. Ook moet er tenminste één publieke sleutel worden gepubliceerd als u verzoeken vanaf deze server wilt zenden."
+"Voor het <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">instellen van iSchedule</a> is "
+"een aantal DNS-regels nodig. Voor alle domeinen waarvoor u verzoeken wilt accepteren moeten DNS SRV "
+"record(s) aangemaakt worden. Het gaat hier om het domein-deel van de e-mailadressen van "
+"principaalrecords in DAViCal. Hieronder ziet u voorbeelden voor de in uw database gevonden domeinen. "
+"Ook moet er tenminste één publieke sleutel worden gepubliceerd als u verzoeken vanaf deze server wilt "
+"zenden."
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
-msgstr "Op de <a href=\"https://www.davical.org/clients.php\">pagina over het installeren van clients op de website van DAViCal</a> vindt u informatie over het instellen van Evolution, Sunbird, Lightning en Mulberry voor het gebruik van op afstand gehoste agenda's."
+msgstr ""
+"Op de <a href=\"https://www.davical.org/clients.php\">pagina over het installeren van clients op de "
+"website van DAViCal</a> vindt u informatie over het instellen van Evolution, Sunbird, Lightning en "
+"Mulberry voor het gebruik van op afstand gehoste agenda's."
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
+msgstr ""
-msgstr "Op de <a href=\"https://www.davical.org/installation.php\">pagina over installatie op de website van DAViCal</a> vindt u meer informatie over het installeren en instellen van deze toepassing."
+"Op de <a href=\"https://www.davical.org/installation.php\">pagina over installatie op de website van "
+"DAViCal</a> vindt u meer informatie over het installeren en instellen van deze toepassing."
 
 msgid "The BIND Request MUST identify an existing resource."
 msgstr "De 'BIND request' MOET een bestaande bron identificeren"
@@ -1238,8 +1263,7 @@ msgstr "De 'BIND request-URI' MOET een collectie identificeren"
 msgid "The BIND method is not allowed at that location."
 msgstr "De 'BIND method' is niet toegestaan op die locatie"
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "De 'CalDAV:schedule-calendar-transp'-eigenschap kan enkel toegepast worden op een agenda."
 
 msgid "The DAViCal Home Page"
@@ -1248,18 +1272,13 @@ msgstr "De DAViCal website"
 msgid "The access ticket will be deleted."
 msgstr "Het toegangsticket zal verwijderd worden."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "Het 'addressbook-query' rapport moet uitgevoerd worden in een collectie/adresboek"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr "Het beheer van deze toepassing is redelijk eenvoudig. U kunt het volgende beheren:"
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "De beheerinterface heeft geen mogelijkheid voor het bekijken of wijzigen van agendagegevens."
 
 msgid "The application failed to understand that request."
@@ -1275,16 +1294,16 @@ msgid "The calendar path contains illegal characters."
 msgstr "Het agenda-pad bevat niet-toegestane tekens."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "De calendar-free-busy-set is overstegen door de schedule-calendar-transp eigenschap van een agendacollectie."
+msgstr ""
+"De calendar-free-busy-set is overstegen door de schedule-calendar-transp eigenschap van een "
+"agendacollectie."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "Met die URL mag de agenda-zoekrapportage niet uitgevoerd worden."
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "Het 'calendar-query' rapport moet uitgevoerd worden in een collectie/agenda"
 
 msgid "The collection name may not be blank."
@@ -1293,13 +1312,12 @@ msgstr "De naam van de collectie kan niet leeg gelaten worden"
 msgid "The destination collection does not exist"
 msgstr "De doel-collectie bestaat niet"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "De weergavenaam kan enkel bij collecties, principalen of associaties ingesteld worden"
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1309,8 +1327,7 @@ msgstr "Het emailadres kan echt niet leeg gelaten worden"
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Het bestand \"%s\" is niet UTF-8 ge-encodeerd. Ga de foutmelding na voor meer details"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Het bestand is niet UTF-8 ge-encodeerd, bekijk aub de foutmelding voor meer details."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1354,9 +1371,11 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "De gebruikersnaam kan niet leeg gelaten worden en kan geen slash bevatten"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
-msgstr "In deze beheerinterface bestaat geen mogelijkheid voor het bekijken en/of bijhouden van agenda's of afspraken."
+msgstr ""
+"In deze beheerinterface bestaat geen mogelijkheid voor het bekijken en/of bijhouden van agenda's of "
+"afspraken."
 
 msgid "There was an error reading from the database."
 msgstr "Er is een fout opgetreden bij het lezen uit de database."
@@ -1364,39 +1383,47 @@ msgstr "Er is een fout opgetreden bij het lezen uit de database."
 msgid "There was an error writing to the database."
 msgstr "Er is een fout opgetreden bij het schrijven naar de database"
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr "Deze kunnen collecties van agendabronnen (d.w.z. agenda's) bevatten."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Deze actie doet het volgende:<ul><li>controleer op geldige groepen in de LDAP-directory</"
-msgstr "Deze actie doet het volgende:<ul><li>controleer op geldige groepen in de LDAP-directory</li><li>controleer op groepen in DAViCal</li></ul>dan<ul><li>als er een groep aanwezig is in DAViCal maar niet in LDAP: als inactief markeren in DAViCal</li><li>als er een groep bestaat in LDAP, maar niet in DAViCal: de groep in DAViCal aanmaken</li><li>als een groep in LDAP en DAViCal bestaat: de informatie in DAViCal bijwerken</li></ul>"
+"li><li>controleer op groepen in DAViCal</li></ul>dan<ul><li>als er een groep aanwezig is in DAViCal "
+"maar niet in LDAP: als inactief markeren in DAViCal</li><li>als er een groep bestaat in LDAP, maar "
+"niet in DAViCal: de groep in DAViCal aanmaken</li><li>als een groep in LDAP en DAViCal bestaat: de "
+"informatie in DAViCal bijwerken</li></ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Deze actie doet het volgende:<ul><li>controleer op geldige gebruikers in de LDAP-directory</"
-msgstr "Deze actie doet het volgende:<ul><li>controleer op geldige gebruikers in de LDAP-directory</li><li>controleer op gebruikers in DAViCal</li></ul>dan<ul><li>als een gebruiker aanwezig is in DAViCal maar niet in LDAP: markeer hem als inactief in DAViCal</li><li>als een gebruiker aanwezig is in LDAP, maar niet in DAViCal: de gebruiker in DAViCal aanmaken</li><li>als een gebruiker aanwezig is in LDAP en DAViCal: de informatie in DAViCal bijwerken</li></ul>"
+"li><li>controleer op gebruikers in DAViCal</li></ul>dan<ul><li>als een gebruiker aanwezig is in "
+"DAViCal maar niet in LDAP: markeer hem als inactief in DAViCal</li><li>als een gebruiker aanwezig is "
+"in LDAP, maar niet in DAViCal: de gebruiker in DAViCal aanmaken</li><li>als een gebruiker aanwezig is "
+"in LDAP en DAViCal: de informatie in DAViCal bijwerken</li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Deze pagina controleert in de eerste plaats de omgeving die nodig is om DAViCal correct te laten werken. Suggesties of patches om het meer nuttige dingen te laten doen zullen dankbaar worden ontvangen."
+"Deze pagina controleert in de eerste plaats de omgeving die nodig is om DAViCal correct te laten "
+"werken. Suggesties of patches om het meer nuttige dingen te laten doen zullen dankbaar worden "
+"ontvangen."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Deze procedure zal elk bestand van het type \"gebruikersnaam.ics\" in een bepaalde map importeren en een gebruikersnaam en kalender voor elk te importeren bestand aanmaken."
+msgstr ""
+"Deze procedure zal elk bestand van het type \"gebruikersnaam.ics\" in een bepaalde map importeren en "
+"een gebruikersnaam en kalender voor elk te importeren bestand aanmaken."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Deze server ondersteunt alleen het 'text/calendar'-formaat voor Vrij/Bezet-URL's"
@@ -1414,10 +1441,11 @@ msgid "To ID"
 msgstr "Naar ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
+msgstr ""
-msgstr "Daarvoor heeft u een CalDAV-agendaprogramma nodig, zoals Evolution, Sunbird, Thunderbird (met de add-on Lightning) of Mulberry."
+"Daarvoor heeft u een CalDAV-agendaprogramma nodig, zoals Evolution, Sunbird, Thunderbird (met de add-"
+"on Lightning) of Mulberry."
 
 msgid "Toggle all privileges"
 msgstr "Vink alle bevoegdheden aan/af"
@@ -1500,9 +1528,7 @@ msgstr "Gebruikersnaam"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Gebruikers (of bronnen of groepen) en de verbanden ertussen"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr "Gebruikers hebben meestal agenda's en melden zich ook meestal aan bij het systeem."
 
 msgid "View My Details"
@@ -1525,9 +1551,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Wilt: %s, Nu: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Opgelet: er zijn geen actieve gebruikers met beheerrechten! U moet dit oplossen vóór u zich afmeldt. Overweeg het gebruik van de configuratie-instelling '$c->do_not_sync_from_ldap'."
+msgstr ""
+"Opgelet: er zijn geen actieve gebruikers met beheerrechten! U moet dit oplossen vóór u zich afmeldt. "
+"Overweeg het gebruik van de configuratie-instelling '$c->do_not_sync_from_ldap'."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Nadat het e-mailadres van de gebruiker bevestigd is."
@@ -1582,9 +1610,11 @@ msgid "You are viewing"
 msgstr "U bent aan het bekijken"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
-msgstr "Klik op een gebruiker om de volledige informatie te bekijken over die persoon (of groep of bron; vanaf nu noemen we deze drie allemaal \"gebruikers\")."
+msgstr ""
+"Klik op een gebruiker om de volledige informatie te bekijken over die persoon (of groep of bron; vanaf "
+"nu noemen we deze drie allemaal \"gebruikers\")."
 
 msgid "You do not have permission to modify this collection."
 msgstr ""
@@ -1612,54 +1642,42 @@ msgstr "De 'calendar-timezone'-eigenschap is enkel geldig voor een agenda."
 msgid "directory %s is not readable"
 msgstr "Map %s kan niet worden gelezen"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : 'imap_url'-parameter niet ingesteld in /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Kan TLS niet starten: ldap_start_tls() mislukt"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : Binden met host %1$s via poort %2$s met bindDN %3$s mislukt"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : LDAP instellen om protocol versie 3 te gebruiken mislukt, TLS niet ondersteund"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Kan niet binden met LDAP - kijk de configuratie (bindDN en passDN) na en zorg ervoor dat de LDAP server bereikbaar is"
+msgstr ""
+"drivers_ldap : Kan niet binden met LDAP - kijk de configuratie (bindDN en passDN) na en zorg ervoor "
+"dat de LDAP server bereikbaar is"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Kan geen verbinding maken met LDAP met poort %s op host %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : functie ldap_connect niet ingesteld, kijk Uw php_ldap module na"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : Kan bestand %s niet vinden"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap : 'imap_url'-parameter niet ingesteld in /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Kan bestand %s niet vinden"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Aangemeld blijven"
-
 msgid "from principal"
 msgstr "van Principaal"
 
@@ -1673,12 +1691,16 @@ msgid "iSchedule OK"
 msgstr "iSchedule OK"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
+msgstr ""
-msgstr "Met iSchedule kunnen caldav-servers, zonder daarvoor uitnodigingen via e-mail te hoeven sturen, direct met elkaar communiceren over geplande afspraken waarbij de genodigden van verschillende servers of providers gebruik maken. Ook maakt dit het mogelijk om op andere servers te kijken of genodigden vrij of bezet zijn. De via iSchedule ontvangen afspraken en taken worden getoond in de planning-inbox van de gebruiker."
+"Met iSchedule kunnen caldav-servers, zonder daarvoor uitnodigingen via e-mail te hoeven sturen, direct "
+"met elkaar communiceren over geplande afspraken waarbij de genodigden van verschillende servers of "
+"providers gebruik maken. Ook maakt dit het mogelijk om op andere servers te kijken of genodigden vrij "
+"of bezet zijn. De via iSchedule ontvangen afspraken en taken worden getoond in de planning-inbox van "
+"de gebruiker."
 
 msgid "invalid request"
 msgstr "ongeldige request"
@@ -1695,14 +1717,12 @@ msgstr "voeg de volgende sectie toe aan uw DAViCal-instellingenbestand"
 msgid "recipient must be organizer or attendee of event"
 msgstr "de ontvanger moet organisator of genodigde zijn van de afspraak"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
+msgstr ""
-" configuration file)"
+"scheduling_dkim_domain komt niet overeen met de naam van de server (controleer uw DAViCal-"
-msgstr "scheduling_dkim_domain komt niet overeen met de naam van de server (controleer uw DAViCal-instellingenbestand)"
+"instellingenbestand)"
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr "scheduling_dkim_domain is niet ingesteld (controleer uw DAViCal-instellingenbestand)"
 
 msgid "sender must be organizer or attendee of event"
@@ -1711,7 +1731,44 @@ msgstr "de verzender moet organisator of genodigde zijn van de afspraak"
 msgid "unauthenticated"
 msgstr "niet geverifieerd"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "U moet zich aanmelden met de gebruikersnaam en het wachtwoord die U zijn toegewezen."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam : 'imap_url'-parameter niet ingesteld in /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap : 'imap_url'-parameter niet ingesteld in /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "Het grootste deel van DAViCal zal werken, maar upgraden naar PHP 5.2 of hoger wordt sterk "
+#~ "aanbevolen."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "PHP DateTime class"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer het ics-bestand wordt "
+#~ "ingevoegd</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- toevoegen van gebruikers %s aan groep: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- groepen: %s uitschakelen"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Bestaande bron stemt niet overeen met \"If-Match\" header - niet geaccepteerd."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Bron gewijzigd op de server - niet verwijderd"
+
+#~ msgid "forget me not"
+#~ msgstr "Aangemeld blijven"

po/pl.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # ab <g1@borowicz.info>, 2015
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
@@ -13,23 +13,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:36+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Polish (http://www.transifex.com/lkraav/davical/language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -43,10 +41,6 @@ msgstr "*** Nieznane ***"
 msgid "- adding %s to group : %s"
 msgstr "Dodaj %s do grupy: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "Dodaj Użytkownika %s do grupy: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- tworzenie grup: %s"
@@ -56,8 +50,8 @@ msgid "- creating record for users :  %s"
 msgstr "- tworzenie rekordów użytkowników: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- wyłącz grupy: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -80,34 +74,35 @@ msgid "- updating user records : %s"
 msgstr "- aktualizacja rekordów użytkownika: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>OSTRZEŻENIE: wszystkie zdarzenia z tej ścieżki zostaną usunięte przed wstawieniem plików ICS</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Zaloguj się</h1><p>Aby uzyskać dostęp do %s powinieneś zalogować się swoją nazwą użytkownika i hasłem.</p><p>Jeśli chcesz uzyskać dostęp, wyślij e-mail do %s.</p>"
+"<h1>Zaloguj się</h1><p>Aby uzyskać dostęp do %s powinieneś zalogować się swoją nazwą użytkownika i "
+"hasłem.</p><p>Jeśli chcesz uzyskać dostęp, wyślij e-mail do %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -121,6 +116,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr "Zasób już istnieje w lokalizacji docelowej."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Wersja biblioteki AWL "
 
@@ -130,6 +128,9 @@ msgstr "Możliwość dostępu"
 msgid "Access ticket deleted."
 msgstr "Możliwość dostępu została usunięta."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Akcja"
 
@@ -162,8 +163,7 @@ msgstr "Wszystkie dane kolekcji zostaną nieodwracalnie usunięte."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -172,8 +172,7 @@ msgstr "Wszystkie uprawnienia"
 msgid "All requested changes were made."
 msgstr "Wszystkie zażądane zmiany zostały wprowadzone"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Zezwól na pytania free/busy skierowane do właściciela tej skrzynki harmonogramu"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -209,6 +208,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -250,10 +252,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -283,9 +284,10 @@ msgstr "ID kolekcji"
 msgid "Collection deleted."
 msgstr "Kolekcja została usunięta."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -358,15 +360,14 @@ msgid "Current DAViCal version "
 msgstr "Atkualna wersja DAViCal"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Ścieżka DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -378,7 +379,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "Wersja schematu DB DAViCal"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -471,8 +473,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -535,9 +536,7 @@ msgstr "Zmień dane tego użytkownika "
 msgid "Email Address"
 msgstr "Adres Email"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Wpisz nazwę użytkownika (jeśli ją znasz) i naciśnij tutaj aby otrzymać emailem tymczasowe hasło."
 
 msgid "Enter your username and password then click here to log in."
@@ -547,6 +546,10 @@ msgstr "Wpisz nazwę użytkownika oraz hasło i naciśnij tutaj aby się zalogow
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -566,9 +569,6 @@ msgstr "Europejski"
 msgid "European (d/m/y)"
 msgstr "Europejski (d/m/r)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -642,19 +642,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -710,9 +706,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -763,6 +758,9 @@ msgstr ""
 msgid "List Resources"
 msgstr ""
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr ""
 
@@ -787,9 +785,8 @@ msgstr "Wyloguj się"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -820,6 +817,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Nr"
@@ -851,9 +851,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -878,23 +875,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -904,9 +903,7 @@ msgstr "Hasło"
 msgid "Path"
 msgstr ""
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -945,6 +942,9 @@ msgstr ""
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -994,8 +994,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1028,8 +1027,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Zasób"
 
@@ -1039,9 +1037,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Zasób zmieniony na serwerze - nie usuwam."
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1060,8 +1055,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1100,14 +1095,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1120,8 +1111,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1151,8 +1141,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1189,9 +1178,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1204,30 +1191,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1239,8 +1223,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1249,18 +1232,13 @@ msgstr ""
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1276,16 +1254,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Ścieżka kalendarza zawiera nieakceptowalne znaki."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1294,13 +1270,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1310,8 +1285,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1355,8 +1329,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1365,38 +1339,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "Wystąpił błąd zapisu do bazy danych."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1415,9 +1382,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1501,9 +1467,7 @@ msgstr ""
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1526,8 +1490,8 @@ msgid "Want: %s, Currently: %s"
 msgstr "Potrzebuje: %s, Aktualnie: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1583,8 +1547,8 @@ msgid "You are viewing"
 msgstr "Przeglądasz"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1613,54 +1577,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr "Katalog %s nie jest do odczytu"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: Nie można uruchomić TLS: ldap_start_tls() spowodowało błąd"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam: Nie można odnaleźć pliku %s "
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Nie można odnaleźć pliku %s "
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "zapamiętaj mnie"
-
 msgid "from principal"
 msgstr ""
 
@@ -1674,11 +1624,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1696,14 +1645,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1712,7 +1657,26 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "powinieneś zalogować się swoją nazwą użytkownika i hasłem."
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>OSTRZEŻENIE: wszystkie zdarzenia z tej ścieżki zostaną usunięte przed wstawieniem plików ICS</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "Dodaj Użytkownika %s do grupy: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- wyłącz grupy: %s"
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Zasób zmieniony na serwerze - nie usuwam."
+
+#~ msgid "forget me not"
+#~ msgstr "zapamiętaj mnie"

po/pt_BR.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # aagaio <aagaio@linwork.com.br>, 2011-2012
 # aagaio <aagaio@linwork.com.br>, 2011, 2012
@@ -12,23 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 20:39+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/lkraav/davical/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -42,10 +40,6 @@ msgstr "*** *** Unknown"
 msgid "- adding %s to group : %s"
 msgstr "- Adicionar %s ao grupo: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- Adicionando %s para grupo de usuários: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- Criando os grupos: %s"
@@ -55,8 +49,8 @@ msgid "- creating record for users :  %s"
 msgstr "- Criação de registro para os usuários: %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- Desativando os grupos: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -79,34 +73,45 @@ msgid "- updating user records : %s"
 msgstr "- Atualizando o registro do usuário: %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir o arquivo allof ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1> Ajuda </h1><p>Para obter ajuda inicial você deve visitar a <a href=\"https://www.davical.org/\" target=\"_blank\">Página Inicial do projeto DAViCal</a> ou dar uma olhada no <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">Wiki do DAViCal</a> . </p><p> Se você não consegue encontrar as respostas lá, visite-nos no <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> canal <b>#davical</b> em <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> , ou envie uma pergunta para a <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">Lista de discussão dos usuários do DAViCal</a> . </p><p> Os arquivos da<a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">podem ser muito úteis.</a> </p>"
+msgstr ""
+"<h1> Ajuda </h1><p>Para obter ajuda inicial você deve visitar a <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">Página Inicial do projeto DAViCal</a> ou dar uma olhada no <a href=\"https://wiki."
+"davical.org/%s\" target=\"_blank\">Wiki do DAViCal</a> . </p><p> Se você não consegue encontrar as "
+"respostas lá, visite-nos no <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" "
+"target=\"_blank\">IRC</a> canal <b>#davical</b> em <a href=\"https://www.oftc.net/\" "
+"target=\"_blank\">irc.oftc.net</a> , ou envie uma pergunta para a <a href=\"https://lists.sourceforge."
+"net/mailman/listinfo/davical-general\" target=\"_blank\">Lista de discussão dos usuários do DAViCal</"
+"a> . </p><p> Os arquivos da<a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" "
+"title=\"DAViCal Users Mailing List\" target=\"_blank\">podem ser muito úteis.</a> </p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1> Por favor, Registre-se no sistema</h1><p> Para o acesso ao %s você deve registrar-se com o nome de usuário e senha que foram emitidos para você. </p><p> Se você gostaria de solicitar o acesso, envie um e-mail para %s. </p>"
+"<h1> Por favor, Registre-se no sistema</h1><p> Para o acesso ao %s você deve registrar-se com o nome "
+"de usuário e senha que foram emitidos para você. </p><p> Se você gostaria de solicitar o acesso, envie "
+"um e-mail para %s. </p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma coleção principal do DAViCal só pode conter coleções"
@@ -120,6 +125,9 @@ msgstr "Uma coleção não pode ser ao mesmo tempo um calendário e um livro de
 msgid "A resource already exists at the destination."
 msgstr "Um recurso já existe no destino."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versão da Biblioteca AWL"
 
@@ -129,6 +137,9 @@ msgstr "Os bilhetes de acesso"
 msgid "Access ticket deleted."
 msgstr "Ticket de acesso excluído."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Ação"
 
@@ -161,8 +172,7 @@ msgstr "Todo conjunto de dados serão apagados de forma irrecuperável."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Todos os eventos do usuário \"%s\" foram removidos e substituídos pelos do arquivo %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Todos os calendários do diretor e eventos serão apagados de forma irrecuperável."
 
 msgid "All privileges"
@@ -171,8 +181,7 @@ msgstr "Todos os privilégios"
 msgid "All requested changes were made."
 msgstr "Todas as alterações solicitadas foram realizadas."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permitir verificações livre / ocupado destinadas ao proprietário deste agendamento"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -208,6 +217,9 @@ msgstr "Servidor de autenticação indisponível."
 msgid "Binding deleted."
 msgstr "Vínculo excluído."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Ligações para outras coleções"
 
@@ -249,10 +261,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -282,9 +293,10 @@ msgstr "ID da coleção"
 msgid "Collection deleted."
 msgstr "Coleção excluída."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Coleções não podem ser ambos os calendários CalDAV e addressbooks CardDAV ao mesmo tempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -357,15 +369,14 @@ msgid "Current DAViCal version "
 msgstr "DAViCal versão atual"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Caminho DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV:: resourcetype só pode ser definido como um valor novo, não pode ser removido."
 
 msgid "DAViCal CalDAV Server"
@@ -377,7 +388,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "Versão de esquema DAViCal DB"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -470,8 +482,7 @@ msgstr "Excluindo Principal:"
 msgid "Deleting Ticket:"
 msgstr "Exclusão de Ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Entregar convites agendados de um organizador para esta caixa de entrada de agendamento"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -534,10 +545,10 @@ msgstr "Editar registro de usuário"
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Digite um nome de usuário, se você conhecer, e clique aqui, para ser enviada por e-mail uma senha "
-msgstr "Digite um nome de usuário, se você conhecer, e clique aqui, para ser enviada por e-mail uma senha temporária."
+"temporária."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Digite seu nome de usuário e senha, clique aqui para entrar"
@@ -546,6 +557,10 @@ msgstr "Digite seu nome de usuário e senha, clique aqui para entrar"
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erro NoGroupFound com filtro >%s<, atributos >%s<; dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erro NoUserFound com filtro >%s<, atributos >%s<, dn >%s<"
@@ -565,9 +580,6 @@ msgstr "Europeu"
 msgid "European (d/m/y)"
 msgstr "Europeu (d / m / y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Recurso existente não corresponde ao cabeçalho \"If-Match\"  - não aceito."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Recurso existente no cabeçalho \"If-None-Match\" - não aceito."
 
@@ -641,19 +653,15 @@ msgstr "Principais do grupo"
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -709,9 +717,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importar calendários e sincronizar LDAP."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -762,6 +769,9 @@ msgstr "Listar grupos"
 msgid "List Resources"
 msgstr "Listar recursos"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listar usuários"
 
@@ -786,10 +796,9 @@ msgstr "Sair"
 msgid "Member deleted from this Group Principal"
 msgstr "Membro excluídos deste Grupo principal"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "A maior parte do DAViCal funcionará, mas a atualização para PHP 5.2 ou posterior é fortemente recomendado."
 
 msgid "Name"
 msgstr "Nome"
@@ -819,6 +828,9 @@ msgstr "Recurso inexistente no destino."
 msgid "No summary"
 msgstr "Sem resumo"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Não."
@@ -850,9 +862,6 @@ msgstr "Substituir um bloqueio"
 msgid "PDO PostgreSQL drivers"
 msgstr "Drivers de PDO do PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Classe PHP DateTime"
-
 msgid "PHP Information"
 msgstr ""
 
@@ -877,23 +886,26 @@ msgstr "Extensão PHP calendar disponível"
 msgid "PHP curl support"
 msgstr "Suporte a PHP curl"
 
+msgid "PHP curl support is required for external binds"
+msgstr "Suporte do curl PHP é requerido para ligações externas"
+
 msgid "PHP iconv support"
 msgstr "Suporte a PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "O PHP não está usando o modo de filtragem do Apache"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "Suporte do curl PHP é requerido para ligações externas"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
+msgstr ""
-"calendar collection"
+"Colocar em uma coleção só é permitido para texto / conteúdo do calendário em uma coleção de calendário"
-msgstr "Colocar em uma coleção só é permitido para texto / conteúdo do calendário em uma coleção de calendário"
 
 msgid "Passed"
 msgstr "Passou"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Passou: %s"
 
@@ -903,9 +915,7 @@ msgstr "Senha"
 msgid "Path"
 msgstr "Caminho"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -944,6 +954,9 @@ msgstr "Tipo principais"
 msgid "Principal deleted."
 msgstr "Principais excluídos."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -993,8 +1006,7 @@ msgstr "Ler informação de Livre / Ocupado"
 msgid "Read the content of a resource or collection"
 msgstr "Ler o conteúdo de um recurso ou coleção"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Ler os detalhes de controle de acesso deste recurso para o usuário atual"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1027,8 +1039,7 @@ msgstr "Solicitar uma funcionalidade"
 msgid "Request body is not valid XML data!"
 msgstr "Corpo da requisição não é um dado XML válido!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1038,9 +1049,6 @@ msgstr "Recurso de Calendário Principal"
 msgid "Resource Not Found."
 msgstr "Recurso não encontrado."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "O recurso foi alterado no servidor - não excluída"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1059,8 +1067,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1099,15 +1107,14 @@ msgstr "Agendamento: Enviando"
 msgid "Send free/busy enquiries"
 msgstr "Enviar solicitação de livre/ocupado"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
+msgstr ""
-"scheduling outbox."
+"Enviar convites de agendamento como um organizador do proprietário desta caixa de saída de agendamento."
-msgstr "Enviar convites de agendamento como um organizador do proprietário desta caixa de saída de agendamento."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
+msgstr ""
-"outbox."
+"Enviar respostas de agendamento como um participante do proprietário desta caixa de saída de "
-msgstr "Enviar respostas de agendamento como um participante do proprietário desta caixa de saída de agendamento."
+"agendamento."
 
 msgid "Set free/busy privileges"
 msgstr "Definir privilégios de Livre/Ocupado"
@@ -1119,9 +1126,10 @@ msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+gravação"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Definir o caminho para armazenar seu ics, por exemplo 'calendar' será referenciado como caldav.php/username/calendar/"
+"Definir o caminho para armazenar seu ics, por exemplo 'calendar' será referenciado como caldav.php/"
+"username/calendar/"
 
 msgid "Setup"
 msgstr "Configuração"
@@ -1150,8 +1158,7 @@ msgstr "Algumas propriedades não puderam ser definidas."
 msgid "Source resource does not exist."
 msgstr "Recursos de origem não existem."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Coleções especiais não podem conter um calendário ou outra coleção especial."
 
 msgid "Specific Privileges"
@@ -1188,9 +1195,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1203,30 +1208,27 @@ msgid "That resource is not present on this server."
 msgstr "Esse recurso não está presente no servidor."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1238,8 +1240,7 @@ msgstr "A requisição BIND Request-URI deve identificar uma coleção."
 msgid "The BIND method is not allowed at that location."
 msgstr "O método BIND não é permitido naquele local."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "O CalDAV: a propriedade schedule-calendar-transp pode ser definida apenas em calendários."
 
 msgid "The DAViCal Home Page"
@@ -1248,22 +1249,19 @@ msgstr "A Home Page do DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "O bilhete de acesso será apagado."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "O relatório de endereços de consulta deve ser executado em uma coleção de endereços"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
-msgstr "O aplicativo não conseguiu entender esta requisição\n."
+msgstr ""
+"O aplicativo não conseguiu entender esta requisição\n"
+"."
 
 msgid "The application program does not understand that request."
 msgstr "O programa da aplicação não entende esta requisição."
@@ -1275,17 +1273,19 @@ msgid "The calendar path contains illegal characters."
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "O calendar-free-busy-set está substituindo pela propriedade schedule-calendar-transp da coleção do calendário."
+msgstr ""
+"O calendar-free-busy-set está substituindo pela propriedade schedule-calendar-transp da coleção do "
+"calendário."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
+msgstr ""
-"collection"
+"O relatório do calendário de consulta deve ser executado em um calendário ou em uma coleção de "
-msgstr "O relatório do calendário de consulta deve ser executado em um calendário ou em uma coleção de calendário"
+"calendário"
 
 msgid "The collection name may not be blank."
 msgstr "O nome da coleção não pode ficar em branco."
@@ -1293,13 +1293,12 @@ msgstr "O nome da coleção não pode ficar em branco."
 msgid "The destination collection does not exist"
 msgstr "A coleção de destino não existe"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "O displayname só pode ser definido em coleções, diretores ou ligações."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1307,10 +1306,10 @@ msgstr "O endereço de e-mail realmente não deve ficar em branco."
 
 #, php-format
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
-msgstr "O arquivo \"%s\" não está codificado em UTF-8, por favor verifique o log de erros para mais detalhes"
+msgstr ""
+"O arquivo \"%s\" não está codificado em UTF-8, por favor verifique o log de erros para mais detalhes"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "O arquivo não é codificado UTF-8, por favor, verifique o erro para mais detalhes."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1354,8 +1353,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "O nome de usuário não deve ficar em branco, e não pode conter uma barra"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1364,39 +1363,46 @@ msgstr "Houve um erro de leitura do banco de dados."
 msgid "There was an error writing to the database."
 msgstr "Houve um erro ao gravar no banco de dados."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operação faz o seguinte:<ul><li>verifica grupos válidos no diretório LDAP</li><li>verifica os "
-msgstr "Esta operação faz o seguinte:<ul><li>verifica grupos válidos no diretório LDAP</li><li>verifica os grupos no DAViCal</li></ul>então<ul><li>se um grupo está presente no DAViCal, mas não está presente no LDAP, o mesmo será ajustado como inativo no DAViCal</li><li>se um grupo está presente no LDAP, mas não está no DAViCal, o mesmo será criado no DAViCal</li><li> se um grupo está presente no LDAP e no DAViCal, então, suas informações serão atualizadas no DAViCal</li></ul>"
+"grupos no DAViCal</li></ul>então<ul><li>se um grupo está presente no DAViCal, mas não está presente no "
+"LDAP, o mesmo será ajustado como inativo no DAViCal</li><li>se um grupo está presente no LDAP, mas não "
+"está no DAViCal, o mesmo será criado no DAViCal</li><li> se um grupo está presente no LDAP e no "
+"DAViCal, então, suas informações serão atualizadas no DAViCal</li></ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operação faz o seguinte:<ul><li> verifica os usuários válidos no diretório LDAP</li><li>verifica "
-msgstr "Esta operação faz o seguinte:<ul><li> verifica os usuários válidos no diretório LDAP</li><li>verifica usuários no DAViCal</li></ul>,então,<ul><li>se um usuário está presente no DAViCal, mas não está presente no LDAP, o mesmo será colocado como inativo no DAViCal</li><li>se um usuário está presente no LDAP, mas não está presente no DAViCal, o mesmo será criado no DAViCal</li><li> se um usuário estiver presente no LDAP e presente no DAViCal, então suas informações serão atualizadas no DAViCal</li></ul>"
+"usuários no DAViCal</li></ul>,então,<ul><li>se um usuário está presente no DAViCal, mas não está "
+"presente no LDAP, o mesmo será colocado como inativo no DAViCal</li><li>se um usuário está presente no "
+"LDAP, mas não está presente no DAViCal, o mesmo será criado no DAViCal</li><li> se um usuário estiver "
+"presente no LDAP e presente no DAViCal, então suas informações serão atualizadas no DAViCal</li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Esta página primeiramente verifica o ambiente necessário para o DAViCal funcionar corretamente. Sugestões ou correções para novas funcionalidades serão gratamente recebidas."
+"Esta página primeiramente verifica o ambiente necessário para o DAViCal funcionar corretamente. "
+"Sugestões ou correções para novas funcionalidades serão gratamente recebidas."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Este processo irá importar cada arquivo em um diretório chamado \"username.ics\" e criar um usuário e um calendário para cada arquivo a ser importado."
+msgstr ""
+"Este processo irá importar cada arquivo em um diretório chamado \"username.ics\" e criar um usuário e "
+"um calendário para cada arquivo a ser importado."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Este servidor só suporta o formato de texto/calendário para URLs livre/ocupado"
@@ -1414,9 +1420,8 @@ msgid "To ID"
 msgstr "Para o ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1500,9 +1505,7 @@ msgstr "Nome de Usuário"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1525,9 +1528,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Deve ser: %s, Atualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Atenção: não há usuários administradores ativos! Você deve corrigir isso antes de sair. Considere usar a configuração $c->do_not_sync_from_ldap."
+msgstr ""
+"Atenção: não há usuários administradores ativos! Você deve corrigir isso antes de sair. Considere usar "
+"a configuração $c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do usuário foi validada."
@@ -1582,8 +1587,8 @@ msgid "You are viewing"
 msgstr "Você está visualizando"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1612,54 +1617,43 @@ msgstr "a propriedade de fuso horário de calendário, só é válida para um ca
 msgid "directory %s is not readable"
 msgstr "diretório %s não é legível"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: parâmetro imap_url não configurado em /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: Não foi possível iniciar TLS: ldap_start_tls () falhou"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap: Falha ao conectar ao host %1$s na porta %2$s com binddn %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+msgstr ""
-"supported"
+"drivers_ldap: Falha ao tentar acessar a base LDAP utilizando a versão 3 do protocolo, TLS não suportado"
-msgstr "drivers_ldap: Falha ao tentar acessar a base LDAP utilizando a versão 3 do protocolo, TLS não suportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap: Não é possível conectar à base LDAP - verifique a configuração dos parâmetros bindDN e passDN, e se o seu servidor LDAP pode ser alcançado"
+msgstr ""
+"drivers_ldap: Não é possível conectar à base LDAP - verifique a configuração dos parâmetros bindDN e "
+"passDN, e se o seu servidor LDAP pode ser alcançado"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap: Não é possível conectar-se à base LDAP na porta %s no host %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap: função ldap_connect não definida, verifique o módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam: Não é possível encontrar o arquivo %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap: parâmetro imap_url não configurado em /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Não é possível encontrar o arquivo %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "não esquecer de mim"
-
 msgid "from principal"
 msgstr "do principal"
 
@@ -1673,11 +1667,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1695,14 +1688,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr "destinatário precisa ser organizador ou participante do evento"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1711,7 +1700,43 @@ msgstr "remetente precisa ser organizador ou participante do evento"
 msgid "unauthenticated"
 msgstr "não autenticado"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "você deve fazer logon com o nome de usuário e senha que foram emitidos para você."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam: parâmetro imap_url não configurado em /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap: parâmetro imap_url não configurado em /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "A maior parte do DAViCal funcionará, mas a atualização para PHP 5.2 ou posterior é fortemente "
+#~ "recomendado."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Classe PHP DateTime"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr ""
+#~ "<b>ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir o arquivo allof ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- Adicionando %s para grupo de usuários: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- Desativando os grupos: %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Recurso existente não corresponde ao cabeçalho \"If-Match\"  - não aceito."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "O recurso foi alterado no servidor - não excluída"
+
+#~ msgid "forget me not"
+#~ msgstr "não esquecer de mim"

po/pt_PT.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # m42 <p.m42.ribeiro@gmail.com>, 2011
@@ -11,23 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 11:32+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/lkraav/davical/language/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -41,10 +39,6 @@ msgstr "*** Desconhecido ***"
 msgid "- adding %s to group : %s"
 msgstr "- a acrescentar %s ao grupo : %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- a acrescentar utilizadores %s ao grupo : %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- a criar grupos : %s"
@@ -54,8 +48,8 @@ msgid "- creating record for users :  %s"
 msgstr "- a criar um registo para os utilizadores : %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- a desactivar grupos : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -78,34 +72,47 @@ msgid "- updating user records : %s"
 msgstr "- a actualizar registos de utilizador : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explicação no Wiki DAViCal</a>"
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>AVISO: todos os eventos neste caminho serão apagados antes de inserir o ficheiro ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Ajuda</h1>\n<p>Para ajuda inicial visite a <a href=\"https://www.davical.org/\" target=\"_blank\">Home Page do DAViCal</a> ou veja \no <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">Wiki DAViCal</a>.</p>\n<p>Se não encontrar aí as respostas, visite o canal <b>#davical</b> do <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> no\nservidor <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\nou envie uma questão para <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">Lista de correio dos Utilizadores DAViCal</a>.</p>\n<p>os arquivos da <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">lista de correio</a>\ntambém podem ser úteis.</p>"
+msgstr ""
+"<h1>Ajuda</h1>\n"
+"<p>Para ajuda inicial visite a <a href=\"https://www.davical.org/\" target=\"_blank\">Home Page do "
+"DAViCal</a> ou veja \n"
+"o <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">Wiki DAViCal</a>.</p>\n"
+"<p>Se não encontrar aí as respostas, visite o canal <b>#davical</b> do <a href=\"https://wikipedia.org/"
+"wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> no\n"
+"servidor <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"ou envie uma questão para <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
+"target=\"_blank\">Lista de correio dos Utilizadores DAViCal</a>.</p>\n"
+"<p>os arquivos da <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" "
+"title=\"DAViCal Users Mailing List\" target=\"_blank\">lista de correio</a>\n"
+"também podem ser úteis.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Entre por favor</h1><p>Para aceder ao %s deve entrar com o nome de utilizador e password que lhe foram atribuídos.</p><p>Se necessitar de pedir acesso, envie um e-mail para %s.</p>"
+"<h1>Entre por favor</h1><p>Para aceder ao %s deve entrar com o nome de utilizador e password que lhe "
+"foram atribuídos.</p><p>Se necessitar de pedir acesso, envie um e-mail para %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma colecção principal do DAViCal só pode conter colecções"
@@ -119,6 +126,9 @@ msgstr "Uma colecção não pode ser ao mesmo tempo um calendário e um livro de
 msgid "A resource already exists at the destination."
 msgstr "Já existe um recurso nesse destino."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Versão da biblioteca AWL "
 
@@ -128,6 +138,9 @@ msgstr "Tickets de acesso"
 msgid "Access ticket deleted."
 msgstr "Ticket de acesso apagado."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Acção"
 
@@ -160,8 +173,7 @@ msgstr "Todos os dados da colecção serão irremediavelmente apagados"
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Todos os eventos do utilizador \"%s\" foram apagados e substituídos pelos do ficheiro %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Todos os calendários e eventos do principal serão irremediavelmente apagados."
 
 msgid "All privileges"
@@ -170,8 +182,7 @@ msgstr "Todos os privilégios"
 msgid "All requested changes were made."
 msgstr "Todas as alterações pedidas foram efectuadas."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permitir verificação de disponibilidade do dono deste calendário"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -207,6 +218,9 @@ msgstr "Servidor de autenticação não disponível"
 msgid "Binding deleted."
 msgstr "Ligação apagada."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Ligações a outras colecções"
 
@@ -248,10 +262,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -281,9 +294,10 @@ msgstr "ID da colecção"
 msgid "Collection deleted."
 msgstr "Colecção apagada."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "As colecções não podem ser calendários CalDAV e livros de endereços CardDAV simultaneamente"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -356,15 +370,16 @@ msgid "Current DAViCal version "
 msgstr "Versão DAViCal actual "
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
-msgstr "Neste momento esta página não faz nada. Sugestões ou correcções para que passe a fazer alguma coisa de útil são bem-vindas."
+msgstr ""
+"Neste momento esta página não faz nada. Sugestões ou correcções para que passe a fazer alguma coisa de "
+"útil são bem-vindas."
 
 msgid "DAV Path"
 msgstr "Caminho DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype só pode ser definido para um novo valor, não pode ser removido."
 
 msgid "DAViCal CalDAV Server"
@@ -376,7 +391,8 @@ msgstr "Servidor CalDAV DAViCal - Ajuda de Configuração"
 msgid "DAViCal DB Schema version "
 msgstr "Versão do Schema da Base de Dados do DAViCal"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -469,8 +485,7 @@ msgstr "A eliminar principal:"
 msgid "Deleting Ticket:"
 msgstr "A eliminar ticket:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Entregar os convites de um organizador a esta caixa de entrada de reuniões"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -533,10 +548,10 @@ msgstr "Editar este registo de utilizador"
 msgid "Email Address"
 msgstr "Endereço de email"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+msgstr ""
-" password."
+"Indique um nome de utilizador, se o souber, e clique aqui, para que lhe seja enviada uma password "
-msgstr "Indique um nome de utilizador, se o souber, e clique aqui, para que lhe seja enviada uma password temporária."
+"temporária."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Indique o seu nome de utilizador e password e clique aqui para entrar."
@@ -545,6 +560,10 @@ msgstr "Indique o seu nome de utilizador e password e clique aqui para entrar."
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erro NoGroupFound com o filtro >%s<, atributos >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Erro NoUserFound com filtro >%s<, atributos >%s< , dn >%s<"
@@ -564,9 +583,6 @@ msgstr "Europeu"
 msgid "European (d/m/y)"
 msgstr "Europeu(d/m/a)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Recurso existente não corresponde com cabeçalho \"If-Match\" - não aceite."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Recurso existente corresponde com cabeçalho \"If-None-Match\" - não aceite."
 
@@ -640,20 +656,21 @@ msgstr "Principais do grupo"
 msgid "Groups &amp; Grants"
 msgstr "Grupos &amp; Permissões"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+"Os grupos permitem que as permissões possam ser atribuídas a um conjunto de principais com uma só acção"
-msgstr "Os grupos permitem que as permissões possam ser atribuídas a um conjunto de principais com uma só acção"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
+msgstr ""
+"Os grupos podem ser membros de outros grupos, mas estruturas complexas prejudicam o desempenho do "
+"sistema"
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr "Os grupos podem ser membros de outros grupos, mas estruturas complexas prejudicam o desempenho do sistema"
+msgstr ""
-
+"Os Grupos fornecem um meio de ligação que minimisa o trabalho de administração. Podem não ter "
-msgid ""
+"calendário e habitualmente não se ligam ao sistema."
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
-msgstr "Os Grupos fornecem um meio de ligação que minimisa o trabalho de administração. Podem não ter calendário e habitualmente não se ligam ao sistema."
 
 msgid "Has Members"
 msgstr "Tem membros"
@@ -708,10 +725,11 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Importar calendários e sincronizar LDAP"
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
+msgstr ""
-msgstr "A seu tempo este programa implementará a funcionallidade existente naquele script, mas até lá terá que ser executado manualmente."
+"A seu tempo este programa implementará a funcionallidade existente naquele script, mas até lá terá que "
+"ser executado manualmente."
 
 msgid "Inactive Principals"
 msgstr "Principais inactivos"
@@ -761,6 +779,9 @@ msgstr "Listar Grupos"
 msgid "List Resources"
 msgstr "Listar recursos"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Listar utilizadores"
 
@@ -785,10 +806,9 @@ msgstr "Sair"
 msgid "Member deleted from this Group Principal"
 msgstr "Membro eliminado deste Principal de Grupo"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "A maior parte do DAViCal irá funcionar mas é fortemente recomendado actualizar para o PHP 5.2 ou mais recente."
 
 msgid "Name"
 msgstr "Nome"
@@ -818,6 +838,9 @@ msgstr "Não existe um recurso nesse destino"
 msgid "No summary"
 msgstr "Sem sumário"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Núm."
@@ -849,9 +872,6 @@ msgstr "Ultrapassar um Lock"
 msgid "PDO PostgreSQL drivers"
 msgstr "Drivers PDO PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Classe de PHP DateTime"
-
 msgid "PHP Information"
 msgstr "Informação PHP"
 
@@ -876,23 +896,25 @@ msgstr "Extensão PHP para calendários disponível"
 msgid "PHP curl support"
 msgstr "Suporte curl do PHP"
 
+msgid "PHP curl support is required for external binds"
+msgstr "O suporte curl do PHP é necessário para ligações externas"
+
 msgid "PHP iconv support"
 msgstr "Suporte iconv do PHP"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "O PHP não está a usar o modo Apache Filter"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "O suporte curl do PHP é necessário para ligações externas"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr "PUT de conteúdo text/calendar apenas é permitido numa colecção do tipo calendário"
 
 msgid "Passed"
 msgstr "Passou"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Passou: %s"
 
@@ -902,9 +924,7 @@ msgstr "Password"
 msgid "Path"
 msgstr "Caminho"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -943,6 +963,9 @@ msgstr "Tipo de Principal"
 msgid "Principal deleted."
 msgstr "Principal eliminado."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Principais: Utilizadores, Recursos e Grupos"
 
@@ -992,8 +1015,7 @@ msgstr "Ler informação de livre/ocupado"
 msgid "Read the content of a resource or collection"
 msgstr "Ler o conteúdo de um recurso ou colecção"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Ler os detalhes do controlo de acesso do utilizador actual a este recurso"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1026,8 +1048,7 @@ msgstr "Pedir Funcionalidade"
 msgid "Request body is not valid XML data!"
 msgstr "Corpo do pedido não tem dados XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -1037,9 +1058,6 @@ msgstr "Principais do recurso de calendário"
 msgid "Resource Not Found."
 msgstr "Recurso não encontrado"
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Recurso foi alterado no servidor - não foi apagado"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Os Recursos terão calendários, mas habitualmente não se ligam ao sistema."
 
@@ -1058,9 +1076,11 @@ msgstr "O registo SRV para \"%s\" aponta para o domínio errado: \"%s\" em vez d
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
-msgstr "Falta um registo SRV para \"%s\" ou falha de DNS, o domínio a partir do qual deseja enviar pedidos deve ter um registo SRV"
+msgstr ""
+"Falta um registo SRV para \"%s\" ou falha de DNS, o domínio a partir do qual deseja enviar pedidos "
+"deve ter um registo SRV"
 
 msgid "Schedule Deliver"
 msgstr "Entrega de horário"
@@ -1098,14 +1118,10 @@ msgstr "Horários: A enviar"
 msgid "Send free/busy enquiries"
 msgstr "Enviar consultas de informação livre/ocupado"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "Enviar convites de horários como organizador, sendo dono desta caixa de saída."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Enviar respostas de horários como participante, sendo dono desta caixa de saída."
 
 msgid "Set free/busy privileges"
@@ -1118,9 +1134,10 @@ msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+escrita"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Definir o caminho para guardar o seu ficheiro ics - e.g. 'calendar' será referido como /caldav.php/nome_de_utilizador/calendar/"
+"Definir o caminho para guardar o seu ficheiro ics - e.g. 'calendar' será referido como /caldav.php/"
+"nome_de_utilizador/calendar/"
 
 msgid "Setup"
 msgstr "Configurar"
@@ -1149,8 +1166,7 @@ msgstr "Algumas propriedades não puderam ser definidas."
 msgid "Source resource does not exist."
 msgstr "Recurso de origem não existe."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Colecções especiais não podem conter um calendário ou outra colecção especial."
 
 msgid "Specific Privileges"
@@ -1187,9 +1203,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr "registo TXT para %s._domainkey.%s corrompido ou falha de DNS"
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr "Registo TXT para \"%s._domainkey.%s\" em falta ou falha de DNS. Chave privada RSA é configurada"
 
 msgid "Target"
@@ -1202,31 +1216,40 @@ msgid "That resource is not present on this server."
 msgstr "Esse recurso não está presente neste servidor."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
+msgstr ""
-msgstr "O <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> deverá ser executado manualmente após a actualização do software para uma nova versão do DAViCal."
+"O <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> deverá "
+"ser executado manualmente após a actualização do software para uma nova versão do DAViCal."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
+msgstr ""
-msgstr "A <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">configuração do iSchedule (em inglês)</a> requer algumas entradas DNS. Será necessário criar registo(s) DNS SRV em todos os domínios para os quais deseja aceitar pedidos. Estes são os domínios encontrados nos endereços de email dos principais do DAViCal encontrados na sua base de dados de exemplo. Pelo menos uma chave pública deverá ser publicada se deseja enviar pedidos a partir deste servidor."
+"A <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">configuração do iSchedule (em "
+"inglês)</a> requer algumas entradas DNS. Será necessário criar registo(s) DNS SRV em todos os domínios "
+"para os quais deseja aceitar pedidos. Estes são os domínios encontrados nos endereços de email dos "
+"principais do DAViCal encontrados na sua base de dados de exemplo. Pelo menos uma chave pública deverá "
+"ser publicada se deseja enviar pedidos a partir deste servidor."
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
-msgstr "A <a href=\"https://www.davical.org/clients.php\">página de configuração de clientes no site do DAViCal</a> tem informação sobre como configurar o Evolution, Sunbird, Lightning e Mulberry para usar calendário alojados remotamente."
+msgstr ""
+"A <a href=\"https://www.davical.org/clients.php\">página de configuração de clientes no site do "
+"DAViCal</a> tem informação sobre como configurar o Evolution, Sunbird, Lightning e Mulberry para usar "
+"calendário alojados remotamente."
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
+msgstr ""
-msgstr "A <a href=\"https://www.davical.org/installation.php\">página sobre a instalação do DAViCal</a> no website do DAViCal (em inglês) tem mais informações sobre a instalação e configuração desta aplicação."
+"A <a href=\"https://www.davical.org/installation.php\">página sobre a instalação do DAViCal</a> no "
+"website do DAViCal (em inglês) tem mais informações sobre a instalação e configuração desta aplicação."
 
 msgid "The BIND Request MUST identify an existing resource."
 msgstr "O pedido BIND, TEM QUE identificar um recurso existente."
@@ -1237,8 +1260,7 @@ msgstr "O URI do pedido BIND, TEM QUE identificar uma colecção."
 msgid "The BIND method is not allowed at that location."
 msgstr "O método BIND não é permitido nessa localização."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "A propriedade CalDAV:schedule-calendar-transp só pode ser definida em calendários."
 
 msgid "The DAViCal Home Page"
@@ -1247,18 +1269,13 @@ msgstr "A Home page do DAViCal"
 msgid "The access ticket will be deleted."
 msgstr "O ticket de acesso será apagado."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "O relatório addressbook-query tem que ser executado sobre uma colecção de livros de endereços"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr "A administração desta aplicação deve ser bastante simples. Pode administrar:"
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "A interface administrativa não tem possibilidades de ver ou modificar dados de calendário."
 
 msgid "The application failed to understand that request."
@@ -1274,16 +1291,16 @@ msgid "The calendar path contains illegal characters."
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "A propriedade calendar-free-busy-set é substituída pela propriedade schedule-transp duma colecção de calendário."
+msgstr ""
+"A propriedade calendar-free-busy-set é substituída pela propriedade schedule-transp duma colecção de "
+"calendário."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "O relatório calendar-query não pode ser executado nesse URL"
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "O relatório calendar-query tem que ser executado sobre uma colecção de calendário ou horários"
 
 msgid "The collection name may not be blank."
@@ -1292,13 +1309,12 @@ msgstr "O nome da colecção não pode ficar em branco."
 msgid "The destination collection does not exist"
 msgstr "A colecção de destino não existe"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "O nome a mostrar só pode ser definido em colecções, principais ou ligações."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1306,11 +1322,13 @@ msgstr "O endereço de email não devia, de facto, ficar em branco."
 
 #, php-format
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
-msgstr "O ficheiro \"%s\" não está codificado como UTF-8, por favor verifique a mensagem de erro para mais promenores"
+msgstr ""
+"O ficheiro \"%s\" não está codificado como UTF-8, por favor verifique a mensagem de erro para mais "
+"promenores"
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
-msgstr "O ficheiro não está codificado em UTF-8, por favor verifique a mensagem de erro para mais detalhes."
+"O ficheiro não está codificado em UTF-8, por favor verifique a mensagem de erro para mais detalhes."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "O nome completo desta pessoa, grupo ou outro tipo de principal."
@@ -1353,9 +1371,11 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "O nome de utilizador não pode ficar em branco e não pode conter uma barra \"/\""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
-msgstr "Não há possibilidade de ver e / ou manter calendários ou eventos a partir desta interface de administração"
+msgstr ""
+"Não há possibilidade de ver e / ou manter calendários ou eventos a partir desta interface de "
+"administração"
 
 msgid "There was an error reading from the database."
 msgstr "Ocorreu um erro ao ler da Base de Dados."
@@ -1363,39 +1383,45 @@ msgstr "Ocorreu um erro ao ler da Base de Dados."
 msgid "There was an error writing to the database."
 msgstr "Ocorreu um erro ao escrever na Base de Dados."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr "Isto é o que pode incluir colecções de recursos de calendário (i.e. calendários)."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operação faz o seguinte: <ul><li>verifica grupos válidos no directório LDAP</li> <li>verifica "
-msgstr "Esta operação faz o seguinte: <ul><li>verifica grupos válidos no directório LDAP</li> <li>verifica grupos no DAViCal</li></ul> então <ul><li>se um grupo existe no DAViCal mas não no LDAP, marca-o como inactivo no DAViCal</li> <li>se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no DAViCal</li> <li>se um grupo existir no LDAP e no DAViCal, actualiza a informação no DAViCal</li> </ul>"
+"grupos no DAViCal</li></ul> então <ul><li>se um grupo existe no DAViCal mas não no LDAP, marca-o como "
+"inactivo no DAViCal</li> <li>se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no "
+"DAViCal</li> <li>se um grupo existir no LDAP e no DAViCal, actualiza a informação no DAViCal</li> </ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Esta operação faz o seguinte: <ul><li>verifica utilizadores válidos no directório LDAP</li> "
-msgstr "Esta operação faz o seguinte: <ul><li>verifica utilizadores válidos no directório LDAP</li> <li>verifica utilizadores no DAViCal</li></ul> então <ul><li>se um utilizador existe no DAViCal mas não no LDAP, marca-o como inactivo no DAViCal</li> <li>se um utilizador está presente no LDAP mas não no DAViCal, cria o utilizador no DAViCal</li> <li>se um utilizador existir no LDAP e no DAViCal, actualiza a informação no DAViCal</li> </ul>"
+"<li>verifica utilizadores no DAViCal</li></ul> então <ul><li>se um utilizador existe no DAViCal mas "
+"não no LDAP, marca-o como inactivo no DAViCal</li> <li>se um utilizador está presente no LDAP mas não "
+"no DAViCal, cria o utilizador no DAViCal</li> <li>se um utilizador existir no LDAP e no DAViCal, "
+"actualiza a informação no DAViCal</li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Esta página verifica o ambiente de execução necessário para que o DAViCal trabalhe correctamente. Sugestões ou correcções para que faça coisas mais úteis serão recebidos com gratidão."
+"Esta página verifica o ambiente de execução necessário para que o DAViCal trabalhe correctamente. "
+"Sugestões ou correcções para que faça coisas mais úteis serão recebidos com gratidão."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Este processo irá importar cada ficheiro chamado \"nome_de_utilizador.ics\" ecriar um utilizador e calendário para cada ficheiro."
+msgstr ""
+"Este processo irá importar cada ficheiro chamado \"nome_de_utilizador.ics\" ecriar um utilizador e "
+"calendário para cada ficheiro."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Este servidor suporta apenas o formato text/calendar para URLs de livre/ocupado"
@@ -1413,10 +1439,11 @@ msgid "To ID"
 msgstr "Para o ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
+msgstr ""
-msgstr "Para fazer isso necessita de usar uma aplicação de calendário com capacidades CalDAV, tal como Evolution, Sunbir, Thunderbird (com a extensão Lightning) ou Mulberry."
+"Para fazer isso necessita de usar uma aplicação de calendário com capacidades CalDAV, tal como "
+"Evolution, Sunbir, Thunderbird (com a extensão Lightning) ou Mulberry."
 
 msgid "Toggle all privileges"
 msgstr "Mudar todos os privilégios"
@@ -1499,9 +1526,7 @@ msgstr "Nome de utilizador"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Utilizadores (ou Recursos, ou Grupos) e as relações entre eles"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr "Os utilizadores provavelmente calendários e irão certamente ligar-se ao sistema."
 
 msgid "View My Details"
@@ -1524,9 +1549,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Desejado: %s, Actualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Aviso: não há utilizadores administradores activos! Deve corrigir isto antes de sair. Considere usar a definição de configuração $c->do_not_sync_from_ldap."
+msgstr ""
+"Aviso: não há utilizadores administradores activos! Deve corrigir isto antes de sair. Considere usar a "
+"definição de configuração $c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do utilizador foi validada."
@@ -1581,9 +1608,11 @@ msgid "You are viewing"
 msgstr "Está a ver"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
-msgstr "Pode clicar em qualquer utilizador para ver os detalhes completos para essa pessoa (ou grupo ou recurso, mas por agora chamemos-lhe apenas utilizadores)."
+msgstr ""
+"Pode clicar em qualquer utilizador para ver os detalhes completos para essa pessoa (ou grupo ou "
+"recurso, mas por agora chamemos-lhe apenas utilizadores)."
 
 msgid "You do not have permission to modify this collection."
 msgstr ""
@@ -1611,54 +1640,42 @@ msgstr "a propriedade calendar-timezone só é válida para um calendário."
 msgid "directory %s is not readable"
 msgstr "o directório %s não é legível"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: o parâmetro imap_url não está configurado em /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Impossível inicial TLS: falhou ldap_start_tls()"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : Falhou a ligação ao servidor %1$s no porto %2$s com o bindDN de %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : Falhou a definição do protocolo versão 3 para o LDAP, TLS não suportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Não foi possível ligar ao LDAP - verifique a sua configuração de bindDN e passDN, e que o seu servidor LDAP está acessível"
+msgstr ""
+"drivers_ldap : Não foi possível ligar ao LDAP - verifique a sua configuração de bindDN e passDN, e que "
+"o seu servidor LDAP está acessível"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Impossível ligar ao LDAP com o porto %s no servidor %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : a função ldap_connect não está definida, verifique o seu módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam : Impossível encontrar o ficheiro %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap: o parâmetro imap_url não está configurado em /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Impossível encontrar o ficheiro %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "lembrar este login"
-
 msgid "from principal"
 msgstr "a partir do principal"
 
@@ -1672,12 +1689,16 @@ msgid "iSchedule OK"
 msgstr "iSchedule OK"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
+msgstr ""
-msgstr "O iSchedule permite que servidores caldav comuniquem directamente entre si, evitando o envio de convites por email, quando os participantes num evento estão a user diferentes servidores ou fornecedores de serviço. Permite também a consulta de tempos ocupados para participantes remotos. Eventos e \"A Fazer\" recebidos através do iSchedule serão apresentados na caixa de entrada do calendário do utilizador."
+"O iSchedule permite que servidores caldav comuniquem directamente entre si, evitando o envio de "
+"convites por email, quando os participantes num evento estão a user diferentes servidores ou "
+"fornecedores de serviço. Permite também a consulta de tempos ocupados para participantes remotos. "
+"Eventos e \"A Fazer\" recebidos através do iSchedule serão apresentados na caixa de entrada do "
+"calendário do utilizador."
 
 msgid "invalid request"
 msgstr "pedido inválido"
@@ -1694,15 +1715,14 @@ msgstr "acrescente, por favor, a seguinte secção ao seu ficheiro de configura
 msgid "recipient must be organizer or attendee of event"
 msgstr "O destinatário deve ser o organizador ou estar presente no evento"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
+msgstr ""
-" configuration file)"
+"scheduling_dkim_domain não corresponde ao nome do servidor (verifique, por favor, o ficheiro de "
-msgstr "scheduling_dkim_domain não corresponde ao nome do servidor (verifique, por favor, o ficheiro de configuração do seu DAViCal)"
+"configuração do seu DAViCal)"
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
+msgstr ""
-"file)"
+"scheduling_dkim_domain não definido (verifique, por favor, o ficheiros de confugração do seu DAViCal)"
-msgstr "scheduling_dkim_domain não definido (verifique, por favor, o ficheiros de confugração do seu DAViCal)"
 
 msgid "sender must be organizer or attendee of event"
 msgstr "O remetente deve ser o organizador ou estar presente no evento"
@@ -1710,7 +1730,42 @@ msgstr "O remetente deve ser o organizador ou estar presente no evento"
 msgid "unauthenticated"
 msgstr "não autenticado"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "deve entrar com o nome de utilizador e password que lhe foram atribuídas."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam: o parâmetro imap_url não está configurado em /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap: o parâmetro imap_url não está configurado em /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr ""
+#~ "A maior parte do DAViCal irá funcionar mas é fortemente recomendado actualizar para o PHP 5.2 ou "
+#~ "mais recente."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Classe de PHP DateTime"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b>AVISO: todos os eventos neste caminho serão apagados antes de inserir o ficheiro ics</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- a acrescentar utilizadores %s ao grupo : %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- a desactivar grupos : %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Recurso existente não corresponde com cabeçalho \"If-Match\" - não aceite."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Recurso foi alterado no servidor - não foi apagado"
+
+#~ msgid "forget me not"
+#~ msgstr "lembrar este login"

po/ru.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 # Yaroslav Petrov <lankme@gmail.com>, 2012
@@ -10,23 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Russian (http://www.transifex.com/lkraav/davical/language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || "
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -40,10 +39,6 @@ msgstr "*** Неизвестно ***"
 msgid "- adding %s to group : %s"
 msgstr "- добавляю %s в группу : %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- добавляю пользователя %s в группу : %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- создаю группу : %s"
@@ -53,8 +48,8 @@ msgid "- creating record for users :  %s"
 msgstr "- создаю запись для пользователя : %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- отключаю группу : %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -77,34 +72,35 @@ msgid "- updating user records : %s"
 msgstr "- обновляю запись пользователя : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>Внимание: все события по этому пути будут удалены перед загрузкой файла</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Авторизация</h1><p>Для доступа к %s вы должны войти со своими логином и паролем</p><p>Для получения доступа пишите по адресу %s.</p>"
+"<h1>Авторизация</h1><p>Для доступа к %s вы должны войти со своими логином и паролем</p><p>Для "
+"получения доступа пишите по адресу %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -118,6 +114,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr "Ресурс уже существует."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Версия AWL"
 
@@ -127,6 +126,9 @@ msgstr "Ключи доступа"
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Действие"
 
@@ -159,8 +161,7 @@ msgstr "Все данные будут удалены без возможнос
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Все календари и события будут безвозвратно удалены."
 
 msgid "All privileges"
@@ -169,8 +170,7 @@ msgstr "Все привилегии"
 msgid "All requested changes were made."
 msgstr "Изменения выполнены"
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -206,6 +206,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Связи с другими коллекциями"
 
@@ -247,10 +250,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -280,9 +282,10 @@ msgstr "ID коллекции"
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Коллекция не может быть календарем и адресной книгой одновременно"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -355,15 +358,14 @@ msgid "Current DAViCal version "
 msgstr "Версия DAViCal"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "Путь DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::resourcetype не может быть удален."
 
 msgid "DAViCal CalDAV Server"
@@ -375,7 +377,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr "Версия схемы базы данных DAViCal"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -468,8 +471,7 @@ msgstr "Удаление владельца:"
 msgid "Deleting Ticket:"
 msgstr "Удаление ключа:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -532,9 +534,7 @@ msgstr ""
 msgid "Email Address"
 msgstr "Адрес Email"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Введите имя пользователя и нажмите здесь, чтобы получить временный пароль."
 
 msgid "Enter your username and password then click here to log in."
@@ -544,6 +544,10 @@ msgstr "Введите имя пользователя и пароль для в
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
@@ -563,9 +567,6 @@ msgstr "Европа"
 msgid "European (d/m/y)"
 msgstr "Европа (d/m/y)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr ""
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
 
@@ -639,19 +640,15 @@ msgstr ""
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -707,9 +704,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Импорт календарей и LDAP-синхронизация."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -760,6 +756,9 @@ msgstr "Группы"
 msgid "List Resources"
 msgstr "Ресурсы"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Пользователи"
 
@@ -784,9 +783,8 @@ msgstr "Отключиться"
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -817,6 +815,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "№"
@@ -848,9 +849,6 @@ msgstr ""
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr "Класс DateTime в php"
-
 msgid "PHP Information"
 msgstr ""
 
@@ -875,23 +873,25 @@ msgstr "Доступно расширение calendar"
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr "Поддержка iconv в php"
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr "Успешно"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Успешно: %s"
 
@@ -901,9 +901,7 @@ msgstr "Пароль"
 msgid "Path"
 msgstr "Путь"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -942,6 +940,9 @@ msgstr "Тип владельца"
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -991,8 +992,7 @@ msgstr ""
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1025,8 +1025,7 @@ msgstr ""
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Ресурс"
 
@@ -1036,9 +1035,6 @@ msgstr ""
 msgid "Resource Not Found."
 msgstr "Ресурс не найден."
 
-msgid "Resource has changed on server - not deleted"
-msgstr ""
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1057,8 +1053,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1097,14 +1093,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1117,8 +1109,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1148,8 +1139,7 @@ msgstr ""
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -1186,9 +1176,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1201,30 +1189,27 @@ msgid "That resource is not present on this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1236,8 +1221,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1246,18 +1230,13 @@ msgstr "Домашняя страница проекта"
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1273,16 +1252,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Путь содержит недопустимые символы"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1291,13 +1268,12 @@ msgstr "Имя коллекции не может быть пустым."
 msgid "The destination collection does not exist"
 msgstr "Целевая коллекция не существует"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1307,8 +1283,7 @@ msgstr "Адрес Email не может быть пустым."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1352,8 +1327,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Имя пользователя не может быть пустым и содержать слеш"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1362,38 +1337,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "Произошла ошибка при записи в базу данных."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1412,9 +1380,8 @@ msgid "To ID"
 msgstr ""
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1498,9 +1465,7 @@ msgstr "Имя пользователя"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1523,8 +1488,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1580,8 +1545,8 @@ msgid "You are viewing"
 msgstr "Вы просматриваете"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1610,54 +1575,40 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"supported"
+"LDAP server is reachable"
 msgstr ""
 
-msgid ""
+#, php-format
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
-"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "запомнить меня"
-
 msgid "from principal"
 msgstr ""
 
@@ -1671,11 +1622,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1693,14 +1643,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1709,7 +1655,25 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "не авторизован"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "вы должны войти под тем именем польззователя и паролем, который был вам выслан."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Класс DateTime в php"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b>Внимание: все события по этому пути будут удалены перед загрузкой файла</b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- добавляю пользователя %s в группу : %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- отключаю группу : %s"
+
+#~ msgid "forget me not"
+#~ msgstr "запомнить меня"

po/sk_SK.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cyril Giraud <cgiraud@free.fr>, 2017
 # Marek Marekovic <vasko@bigfamily.sk>, 2016
@@ -12,23 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-15 11:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/lkraav/davical/language/sk_SK/)\n"
+"Language: sk_SK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -42,10 +40,6 @@ msgstr "*** Neznáma ***"
 msgid "- adding %s to group : %s"
 msgstr "- pridáva sa %s do skupiny: %s"
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr "- pridávajú sa užívatelia %s do skupiny: %s"
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr "- vytvárajú sa skupiny: %s"
@@ -55,8 +49,8 @@ msgid "- creating record for users :  %s"
 msgstr "- vytvárajú sa záznamy užívateľov:  %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
-msgstr "- deaktivovať skupiny: %s"
+msgstr ""
 
 #, php-format
 msgid "- deactivating users : %s"
@@ -79,34 +73,47 @@ msgid "- updating user records : %s"
 msgstr "- aktualizujú sa záznamy užívateľov:  %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Vysvetlenie je na DAViCal Wiki</a>"
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b> UPOZORNENIE: všetky udalosti tejto cesty sa pred vložením .ics súboru odstránia</ b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
-msgstr "<h1>Pomocník</h1>\n<p>ak potrebujete poradiť, tak v prvom rade by ste mali navštíviť <a href=\"https://www.davical.org/\" target=\"_blank\"> DAViCal Domovskú stránku</ a> alebo si\n pozrite <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</ a>.</p>\n<p>Ak sa vám nepodarí nájsť odpoveď tu, navštívte nás na <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> na\n<b>#davical</b> kanáli <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\nalebo pošlite otázku na<a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\"> DAViCal Users mailing list</a>.</p>\n<p><a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\"> Archív mailing listov \nmôže byť tiež užitočný.</p>"
+msgstr ""
+"<h1>Pomocník</h1>\n"
+"<p>ak potrebujete poradiť, tak v prvom rade by ste mali navštíviť <a href=\"https://www.davical.org/\" "
+"target=\"_blank\"> DAViCal Domovskú stránku</ a> alebo si\n"
+" pozrite <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</ a>.</p>\n"
+"<p>Ak sa vám nepodarí nájsť odpoveď tu, navštívte nás na <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> na\n"
+"<b>#davical</b> kanáli <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"alebo pošlite otázku na<a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
+"target=\"_blank\"> DAViCal Users mailing list</a>.</p>\n"
+"<p><a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\"> Archív mailing listov \n"
+"môže byť tiež užitočný.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Prihlásenie</h1><p>Na %s sa prihlásite pomocou vášho užívateľského mena a hesla.</p><p>Pre vyžiadanie prihlasovacích údajov použite e-mail %s.</p>"
+"<h1>Prihlásenie</h1><p>Na %s sa prihlásite pomocou vášho užívateľského mena a hesla.</p><p>Pre "
+"vyžiadanie prihlasovacích údajov použite e-mail %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Zostava DAViCalu môže obsahovať len zostavy"
@@ -120,6 +127,9 @@ msgstr "Zostava môže byť len buď kalendár alebo len adresár."
 msgid "A resource already exists at the destination."
 msgstr "Zdroj už na cieľovom umiestnení existuje."
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr "Verzia AWL knižnice"
 
@@ -129,6 +139,9 @@ msgstr "Prístupové tikety"
 msgid "Access ticket deleted."
 msgstr "Prístupový tiket sa odstránil."
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Akcia"
 
@@ -161,8 +174,7 @@ msgstr "Všetky dáta zostavy sa natrvalo odstránia."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr "Všetky činnosti užívateľa \"%s\"  sa odstránili a prepísali tými zo súboru %s"
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Všetko z kalendárov a udalostí položky sa natrvalo vymaže."
 
 msgid "All privileges"
@@ -171,8 +183,7 @@ msgstr "Všetky oprávnenia"
 msgid "All requested changes were made."
 msgstr "Všetky požadované zmeny sa vykonali."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Povoliť Free/Busy otázky smerované vlastníkovi tohoto priečinka doručenej pošty plánovania."
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -208,6 +219,9 @@ msgstr "Server na ktorom beží overovanie je nedostupný"
 msgid "Binding deleted."
 msgstr "Prepojenie sa odstránilo."
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr "Prepojenia na ďalšie zostavy"
 
@@ -249,10 +263,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -282,9 +295,10 @@ msgstr "ID zostavy"
 msgid "Collection deleted."
 msgstr "Zostava sa odstránila."
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr "Zostavy nemusia byť súčasne CalDAV kalendáre a CardDAV adresáre"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -357,15 +371,16 @@ msgid "Current DAViCal version "
 msgstr "Aktuálna verzia DAViCalu"
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
-msgstr "V súčasnej dobe táto stránka nerobí nič. Návrhy alebo opravy, aby robila niečo užitočné budú vďačne prijaté."
+msgstr ""
+"V súčasnej dobe táto stránka nerobí nič. Návrhy alebo opravy, aby robila niečo užitočné budú vďačne "
+"prijaté."
 
 msgid "DAV Path"
 msgstr "Cesta k DAV"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV: typ zdroja sa nemôže odstrániť. Môže sa len zmeniť jeho hodnota."
 
 msgid "DAViCal CalDAV Server"
@@ -377,7 +392,8 @@ msgstr "DAViCal CalDAV Server - Pomoc ku konfigurácii"
 msgid "DAViCal DB Schema version "
 msgstr "Verzia DAViCal DB schémy"
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -470,8 +486,7 @@ msgstr "Mazanie položky:"
 msgid "Deleting Ticket:"
 msgstr "Mazanie tiketu:"
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "Doručenie pozvánok plánovania od organizátora do tohto priečinka doručenej pošty plánovania"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -534,9 +549,7 @@ msgstr "Editovať záznam užívateľa"
 msgid "Email Address"
 msgstr "Emailová adresa"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Zadajte meno (ak ho viete) a kliknite sem na získanie dočacného hesla e-mailom."
 
 msgid "Enter your username and password then click here to log in."
@@ -546,6 +559,10 @@ msgstr "Zadajte vaše meno a heslo a potom sem kliknite na prihlásenie."
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Chyba NoGroupFound s filtrom >%s<, atribútmi >%s< , dn >%s<"
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Chyba NoUserFound s filtrom >%s<, atribútmi >%s< , dn >%s<"
@@ -565,9 +582,6 @@ msgstr "Európsky"
 msgid "European (d/m/y)"
 msgstr "Európsky (d/m/r)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Existujúci zdroj nezodpovedá \"If-Match\" hlavičke - neakceptovala sa."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Existujúci zdroj zodpovedá \"If-None-Match\" hlavičke - neakceptovala sa."
 
@@ -641,20 +655,18 @@ msgstr "Položky skupiny"
 msgid "Groups &amp; Grants"
 msgstr "Skupiny &amp; Povolenia"
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
-" in one action"
 msgstr "Skupiny umožňujú tieto zadané oprávnenia priradiť viacerým položkám naraz"
 
-msgid ""
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
-"Groups may be members of other groups, but complex nesting will hurt system "
-"performance"
 msgstr "Skupiny môžu byť členmi iných skupín, ale môže sa to dzrkadliť na výkone systému"
 
 msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"  They might not have calendars, and they will not usually log on."
+"calendars, and they will not usually log on."
-msgstr "Skupiny sa používajú na zjednodušenie prepojení pre uľahčenie administrácie. Nemusia mať kalendáre a normálne sa neprihlasujú."
+msgstr ""
+"Skupiny sa používajú na zjednodušenie prepojení pre uľahčenie administrácie. Nemusia mať kalendáre a "
+"normálne sa neprihlasujú."
 
 msgid "Has Members"
 msgstr "Členovia"
@@ -709,9 +721,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr "Import kalendára a LDAP synchronizácia."
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -762,6 +773,9 @@ msgstr "Zoznam skupín"
 msgid "List Resources"
 msgstr "Zoznam zdrojov"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Zoznam užívateľov"
 
@@ -786,10 +800,9 @@ msgstr "Logout"
 msgid "Member deleted from this Group Principal"
 msgstr "Odstránil sa člen z tejto skupiny"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
+msgstr ""
-msgstr "Pre beh DAViCalu sa odporúča upgradovať PHP va verziu 5.2 alebo novšiu."
 
 msgid "Name"
 msgstr "Meno"
@@ -819,6 +832,9 @@ msgstr "Na zadanej destinácii sa nenachádza žiadny zdroj"
 msgid "No summary"
 msgstr "Bez popisu"
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Počet"
@@ -850,9 +866,6 @@ msgstr "Prepísanie zámku"
 msgid "PDO PostgreSQL drivers"
 msgstr "Drivery PDO PostgreSQL"
 
-msgid "PHP DateTime class"
-msgstr "Trieda PHP DateTime"
-
 msgid "PHP Information"
 msgstr "PHP Informácia"
 
@@ -877,23 +890,25 @@ msgstr "Dostupné rozšírenie PHP calendar"
 msgid "PHP curl support"
 msgstr "Podpora PHP curl"
 
+msgid "PHP curl support is required for external binds"
+msgstr "Pre externé spojenia sa vyžaduje podpora PHP curl"
+
 msgid "PHP iconv support"
 msgstr "Podpora PHP iconv"
 
 msgid "PHP not using Apache Filter mode"
 msgstr "PHP nepoužíva mód Apache filtra"
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
-msgstr "Pre externé spojenia sa vyžaduje podpora PHP curl"
+msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr "PUT žiadosť na zostavu je možné len na text/calendar obsah zostavy kalendára"
 
 msgid "Passed"
 msgstr "Prešlo"
 
+#, php-format
 msgid "Passed: %s"
 msgstr "Prešlo: %s"
 
@@ -903,9 +918,7 @@ msgstr "Heslo"
 msgid "Path"
 msgstr "Cesta"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -944,6 +957,9 @@ msgstr "Typ položky "
 msgid "Principal deleted."
 msgstr "Položka sa odstránila."
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr "Položky: Užívatelia, Zdroje a Skupiny"
 
@@ -993,8 +1009,7 @@ msgstr "Čítať informácie voľný/zaneprázdnený"
 msgid "Read the content of a resource or collection"
 msgstr "Čítať obsah zdroja alebo zostavy"
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr "Čítať detaily prístupov aktuálneho užívateľa k tomuto zdroju."
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1027,8 +1042,7 @@ msgstr "Žiadosť o fičuru (novú funkciu)"
 msgid "Request body is not valid XML data!"
 msgstr "Žiadosť nemá správny XML formát!"
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Zdroj"
 
@@ -1038,9 +1052,6 @@ msgstr "Zdroj položiek kalendára"
 msgid "Resource Not Found."
 msgstr "Zdroj sa nenašiel."
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Zdroj bol na serveri zmenený - nie vymazaný"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr "Zdroje majú kalendáre, ale normálne sa do systému neprihlasujú."
 
@@ -1059,9 +1070,11 @@ msgstr "SRV záznam pre \"%s\" ukazuje na zlú doménu: \"%s\" namiesto \"%s\""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
-msgstr "Pre \"%s\" chýba SRV záznam alebo zlyhal DNS. Doména z ktorej odosielate udalosti z by mala mať SRV záznam"
+msgstr ""
+"Pre \"%s\" chýba SRV záznam alebo zlyhal DNS. Doména z ktorej odosielate udalosti z by mala mať SRV "
+"záznam"
 
 msgid "Schedule Deliver"
 msgstr "Doručiť plánovanie"
@@ -1099,14 +1112,10 @@ msgstr "Plánovanie: odosielanie"
 msgid "Send free/busy enquiries"
 msgstr "Odoslať voľný/zaneprázdnený dotazy"
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr "Poslať plánovacie pozvánky ako organizátor od majiteľa tohto plánovania."
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr "Poslať plánovacie odpovede ako účastník od majiteľa tohto plánovania."
 
 msgid "Set free/busy privileges"
@@ -1119,9 +1128,10 @@ msgid "Set read+write privileges"
 msgstr "Nastaviť oprávnenia na čítanie+zápis"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
+msgstr ""
-msgstr "Zadajte cestu pre uloženie vášho ics (napr. hodnota 'calendar' bude zodpovedať ceste /caldav.php/username/calendar/)"
+"Zadajte cestu pre uloženie vášho ics (napr. hodnota 'calendar' bude zodpovedať ceste /caldav.php/"
+"username/calendar/)"
 
 msgid "Setup"
 msgstr "Nastavenia"
@@ -1150,8 +1160,7 @@ msgstr "Niektoré vlastnosti sa nepodarilo nastaviť."
 msgid "Source resource does not exist."
 msgstr "Zdrojový prostriedok neexistuje."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Špeciálne zostavy nesmú obsahovať kalendár alebo iné špeciálne zostavy."
 
 msgid "Specific Privileges"
@@ -1188,9 +1197,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr "TXT záznam pre %s._domainkey.%s je poškodený alebo zlyhal DNS"
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr "Pre \"%s._domainkey.%s\" chýba TXT záznam alebo zlyhal DNS. Súkromný RSA kľúč je nakonfigurovaný"
 
 msgid "Target"
@@ -1203,31 +1210,38 @@ msgid "That resource is not present on this server."
 msgstr "Zdroj sa na serveri nenachádza."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
+msgstr ""
-msgstr "<a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule konfigurácia</a> vyžaduje nejaké DNS záznamy. Pre všetky domény, pre ktoré chcete prijímať žiadosti, bude potrebné vytvoriť DNS SRV záznamy. Sú to doménové časti e-mailovej adresy hlavných položiek. V DAViCal príkladoch sú uvedené nižšie, pre domény sa nachádzajú v databáze. Pokiaľ si prajete zasielať žiadosti z tohto servera tak musí byť zverejnený aspoň 1 verejný kľúč."
+"<a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule konfigurácia</a> vyžaduje "
+"nejaké DNS záznamy. Pre všetky domény, pre ktoré chcete prijímať žiadosti, bude potrebné vytvoriť DNS "
+"SRV záznamy. Sú to doménové časti e-mailovej adresy hlavných položiek. V DAViCal príkladoch sú uvedené "
+"nižšie, pre domény sa nachádzajú v databáze. Pokiaľ si prajete zasielať žiadosti z tohto servera tak "
+"musí byť zverejnený aspoň 1 verejný kľúč."
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
-msgstr "Na <a href=\"https://www.davical.org/clients.php\">klientskej DAViCal webovej stránke</a> sú informácie ako nakonfigurovať Evolution, Sunbird, Lightning a Mulberry na pužitie vzdialených kalendárov."
+msgstr ""
+"Na <a href=\"https://www.davical.org/clients.php\">klientskej DAViCal webovej stránke</a> sú "
+"informácie ako nakonfigurovať Evolution, Sunbird, Lightning a Mulberry na pužitie vzdialených "
+"kalendárov."
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
+msgstr ""
-msgstr "Na <a href=\"https://www.davical.org/installation.php\">stránke popisu DAViCal inštalácie</a> je viac informácií ako nainštalovať a konfigurovať túto applikáciu."
+"Na <a href=\"https://www.davical.org/installation.php\">stránke popisu DAViCal inštalácie</a> je viac "
+"informácií ako nainštalovať a konfigurovať túto applikáciu."
 
 msgid "The BIND Request MUST identify an existing resource."
 msgstr "Žiadosť prepojenia musí smerovať na existujúce zdroje."
@@ -1238,8 +1252,7 @@ msgstr "Žiadosť prepojenia URI musí smerovať na zostavu."
 msgid "The BIND method is not allowed at that location."
 msgstr "Na toto umiestnenie nie je povolená metóda prepojenia."
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "CalDAV: vlastnosť schedule-calendar-transp môže byť nastavená len na kalendároch."
 
 msgid "The DAViCal Home Page"
@@ -1248,18 +1261,13 @@ msgstr "Domovská stránka DAViCal"
 msgid "The access ticket will be deleted."
 msgstr " Prístupový tiket sa odstránil."
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr "Adresárová-query správa musí bežať len na zostave adresára"
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr "Administrácia aplikácie by mala byť jednoduchá. Môžeš upravovať:"
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr "V administračnom rozhraní sa nedajú zobraziť a editovať dáta kalendára."
 
 msgid "The application failed to understand that request."
@@ -1275,16 +1283,15 @@ msgid "The calendar path contains illegal characters."
 msgstr "Cesta kalendáa obsahuje nepovolené znaky."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
-msgstr "\"calendar-free-busy-set\" sa nahradila za \"schedule-calendar-transp\" položku zostavy kalendára."
+msgstr ""
+"\"calendar-free-busy-set\" sa nahradila za \"schedule-calendar-transp\" položku zostavy kalendára."
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr "calendar-query hlásenie nemôže bežať na tejto URL"
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr "Kalendár-query správa môže byť spustená len na kalendári alebo zostave plánovania"
 
 msgid "The collection name may not be blank."
@@ -1293,13 +1300,12 @@ msgstr "Meno zostavy musí byť vyplnené."
 msgid "The destination collection does not exist"
 msgstr "Cieľová zostava neexistuje"
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr "Zobrazované meno môže byť nastavené len na zostavách, položkách alebo prepojeniach."
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1309,8 +1315,7 @@ msgstr "E-mailová adresa by nemala byť prázdna."
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr "Súbor \"%s\" nie je v UTF-8. Pre viac detailov si skontrolujte chybu."
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Súbor nie je v UTF-8. Pre viac detailov si skontrolujte chybu."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1354,8 +1359,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr "Meno užívateľa nesmie byť prázdne a nesmie obsahovať lomítko"
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr "V administračnom rozhraní sa nedajú pozerať ani spravovať kalendáre a udalosti."
 
 msgid "There was an error reading from the database."
@@ -1364,39 +1369,45 @@ msgstr "Pri čítaní z databázy došlo k chybe."
 msgid "There was an error writing to the database."
 msgstr "Pri zápise do databázy došlo k chybe."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr "To sú veci, ktoré môžu obsahovať zostavy zdrojov kalendára (kalendáre)."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Touto operáciou sa vykoná nasledovné: <ul> <li>načítajú sa skupiny z LDAP</ li> <li>načítajú sa "
-msgstr "Touto operáciou sa vykoná nasledovné: <ul> <li>načítajú sa skupiny z LDAP</ li> <li>načítajú sa skupiny z DAViCal</ li> </ ul>a potom...<ul> <li>ak je skupina v DAViCal ale nie je v LDAP - nastaví sa ako neaktívna v DAViCal</ li> <li>ak je skupina v LDAP ale nie je v DAViCal - vytvorí sa v DAViCal</ li> <li>ak je skupina aj v LDAP a aj v DAViCal - aktualizujú sa údaje v DAViCal</ li> </ ul>"
+"skupiny z DAViCal</ li> </ ul>a potom...<ul> <li>ak je skupina v DAViCal ale nie je v LDAP - nastaví "
+"sa ako neaktívna v DAViCal</ li> <li>ak je skupina v LDAP ale nie je v DAViCal - vytvorí sa v "
+"DAViCal</ li> <li>ak je skupina aj v LDAP a aj v DAViCal - aktualizujú sa údaje v DAViCal</ li> </ ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+msgstr ""
-"information in DAViCal</li> </ul>"
+"Touto operáciou sa vykoná nasledovné: <ul><li>overia sa platní užívatelia v LDAP</li><li>overia sa "
-msgstr "Touto operáciou sa vykoná nasledovné: <ul><li>overia sa platní užívatelia v LDAP</li><li>overia sa užívatelia v DAViCal</li></ul>potom<ul><li>Ak sa užívateľ nachádza v DAViCal ale v LDAP nie, nastaví sa v DAViCal ako neaktívny</li><li>Ak sa užívateľ nachádza v LDAP ale nie v DAViCal, v DAViCal sa vytvorí</li><li>Ak sa užívateľ nachádza aj v LDAP a aj v DAViCal, aktualizujú sa jeho údaje v DAViCal</li></ul>"
+"užívatelia v DAViCal</li></ul>potom<ul><li>Ak sa užívateľ nachádza v DAViCal ale v LDAP nie, nastaví "
+"sa v DAViCal ako neaktívny</li><li>Ak sa užívateľ nachádza v LDAP ale nie v DAViCal, v DAViCal sa "
+"vytvorí</li><li>Ak sa užívateľ nachádza aj v LDAP a aj v DAViCal, aktualizujú sa jeho údaje v DAViCal</"
+"li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
+msgstr ""
-msgstr "Na tejto stránke sa hlavne skontroluje prostredie potrebné pre správny chod DAViCalu. Návrhy alebo záplaty pre lepšie fungovanie budú prijaté s potešením."
+"Na tejto stránke sa hlavne skontroluje prostredie potrebné pre správny chod DAViCalu. Návrhy alebo "
+"záplaty pre lepšie fungovanie budú prijaté s potešením."
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
-msgstr "Tento proces naimportuje každý súbor v adresári s názvom \"username.ics\" a vytvorí užívateľa a kalendár pre každý súbor, ktorý naimportujete."
+msgstr ""
+"Tento proces naimportuje každý súbor v adresári s názvom \"username.ics\" a vytvorí užívateľa a "
+"kalendár pre každý súbor, ktorý naimportujete."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Tento server podporuje len text/calendar formát pre free/busy URLs"
@@ -1414,10 +1425,11 @@ msgid "To ID"
 msgstr "ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
+msgstr ""
-msgstr "Pamätaj,že budeš potrebovať aplikácie ktoré vedia spolupracovať s CalDAV. Napr. Evolution, Sunbird, Thunderbird (s Lightning modulom) alebo Mulberry."
+"Pamätaj,že budeš potrebovať aplikácie ktoré vedia spolupracovať s CalDAV. Napr. Evolution, Sunbird, "
+"Thunderbird (s Lightning modulom) alebo Mulberry."
 
 msgid "Toggle all privileges"
 msgstr "Invertuje všetky oprávnenia"
@@ -1500,9 +1512,7 @@ msgstr "Meno užívateľa"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr "Užívateľov (alebo zdroje, skupiny) a vzťahy medzi nimi"
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr "Užívatelia budú mať pravdepodobne kalendáre a tiež sa budú môcť prihlásiť do systému."
 
 msgid "View My Details"
@@ -1525,9 +1535,11 @@ msgid "Want: %s, Currently: %s"
 msgstr "Potrebné: %s, Aktuálne: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
-msgstr "Varovanie: nie sú aktívny žiadny admin užívatelia! Opravte to skôr ako sa odhlásite. Do budúcna skúste použiť v konfigurácii premennú $c->do_not_sync_from_ldap."
+msgstr ""
+"Varovanie: nie sú aktívny žiadny admin užívatelia! Opravte to skôr ako sa odhlásite. Do budúcna skúste "
+"použiť v konfigurácii premennú $c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Keď sa potvrdil užívateľov e-mailový účet."
@@ -1582,9 +1594,11 @@ msgid "You are viewing"
 msgstr "Čítanie"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
-msgstr "Po kliknutí na užívateľa si môžte pozrieť podrobnosti osoby (príp. skupiny alebo zdroja - od teraz to budú už len užívatelia)."
+msgstr ""
+"Po kliknutí na užívateľa si môžte pozrieť podrobnosti osoby (príp. skupiny alebo zdroja - od teraz to "
+"budú už len užívatelia)."
 
 msgid "You do not have permission to modify this collection."
 msgstr ""
@@ -1612,54 +1626,44 @@ msgstr "Vlastnosť calendar-timezone je povolená len pre kalendár."
 msgid "directory %s is not readable"
 msgstr "Z adresára %s sa nedá čítať"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: imap_url parameter nie je nakonfigurovaný v /etc/davical/*-conf.php"
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: Nepodarilo sa naštartovať TLS: ldap_start_tls() zlyhalo"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap: Zlyhalo pripojenie k hostiteľovi %1$s cez port %2$s s bindDN %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap: Zlyhalo nastavenie použitia protokolu 3 pre LDAP. TLS nie je podporované"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap: Nedá sa pripojiť k LDAP - skontrolujte si v konfigurácii položky bindDN a passDN a to či je server LDAP dostupný"
+msgstr ""
+"drivers_ldap: Nedá sa pripojiť k LDAP - skontrolujte si v konfigurácii položky bindDN a passDN a to či "
+"je server LDAP dostupný"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap: Nedá sa pripojiťk LDAP na port %s a hostiteľa %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
-msgstr "drivers_ldap: funkcia ldap_connect nie je definovaná. Skontrolujte, či máte nainštalovaný modul php_ldap"
+"drivers_ldap: funkcia ldap_connect nie je definovaná. Skontrolujte, či máte nainštalovaný modul "
+"php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr "drivers_pwauth_pam: Nedá sa nájsť súbor %s"
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_rimap: imap_url parameter nie je nakonfigurovaný v /etc/davical/*-conf.php"
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Nedá sa nájsť súbor %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "zapamätať prihlásenie"
-
 msgid "from principal"
 msgstr "z položky"
 
@@ -1673,12 +1677,15 @@ msgid "iSchedule OK"
 msgstr "iSchedule OK"
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
+msgstr ""
-msgstr "iSchedule umožňuje CalDAV serverom komunikovať o plánovaných akciách, kde účastníci používajú rôzne servery alebo poskytovateľov, priamo medzi sebou bez potreby posielania pozvánok e-mailom. Navyše umožňuje FreeBusy vyhľadávania pre vzdialených účastníkov. Udalosti  a ToDo prijaté cez iSchedule sa ukážu v rozvrhoch užívateľov."
+"iSchedule umožňuje CalDAV serverom komunikovať o plánovaných akciách, kde účastníci používajú rôzne "
+"servery alebo poskytovateľov, priamo medzi sebou bez potreby posielania pozvánok e-mailom. Navyše "
+"umožňuje FreeBusy vyhľadávania pre vzdialených účastníkov. Udalosti  a ToDo prijaté cez iSchedule sa "
+"ukážu v rozvrhoch užívateľov."
 
 msgid "invalid request"
 msgstr "nesprávna požiadavka"
@@ -1695,14 +1702,10 @@ msgstr "Pridaj nasledujúcu časť do DAViCal konfiguračného súboru"
 msgid "recipient must be organizer or attendee of event"
 msgstr "príjemca musí byť organizátorom alebo účastník akcie"
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr "scheduling_dkim_domain neobsahuje názov servera (skontroluj DAViCal konfiguračný súbor)"
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr "Nie je zadaná scheduling_dkim_domain položka (skontroluj DAViCal konfiguračný súbor)"
 
 msgid "sender must be organizer or attendee of event"
@@ -1711,7 +1714,40 @@ msgstr "odosielateľ musí byť organizátorom alebo účastník akcie"
 msgid "unauthenticated"
 msgstr "neoverený"
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "mali by ste sa prihlásiť pomocou vášho mena a hesla."
+
+#~ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_imap_pam: imap_url parameter nie je nakonfigurovaný v /etc/davical/*-conf.php"
+
+#~ msgid "drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
+#~ msgstr "drivers_rimap: imap_url parameter nie je nakonfigurovaný v /etc/davical/*-conf.php"
+
+#~ msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+#~ msgstr "Pre beh DAViCalu sa odporúča upgradovať PHP va verziu 5.2 alebo novšiu."
+
+#~ msgid "PHP DateTime class"
+#~ msgstr "Trieda PHP DateTime"
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b> UPOZORNENIE: všetky udalosti tejto cesty sa pred vložením .ics súboru odstránia</ b>"
+
+#, php-format
+#~ msgid "- adding users %s to group : %s"
+#~ msgstr "- pridávajú sa užívatelia %s do skupiny: %s"
+
+#, php-format
+#~ msgid "- deactivate groups : %s"
+#~ msgstr "- deaktivovať skupiny: %s"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Existujúci zdroj nezodpovedá \"If-Match\" hlavičke - neakceptovala sa."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Zdroj bol na serveri zmenený - nie vymazaný"
+
+#~ msgid "forget me not"
+#~ msgstr "zapamätať prihlásenie"

po/sv.po

@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 23:06+0100\n"
+"POT-Creation-Date: 2024-04-02 21:37+1300\n"
 "PO-Revision-Date: 2017-01-14 22:37+0000\n"
 "Last-Translator: Cyril Giraud <cgiraud@free.fr>\n"
 "Language-Team: Swedish (http://www.transifex.com/lkraav/davical/language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Translators: this is the formatting of a date with time. See
+#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See
+#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
-#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -38,10 +36,6 @@ msgstr ""
 msgid "- adding %s to group : %s"
 msgstr ""
 
-#, php-format
-msgid "- adding users %s to group : %s"
-msgstr ""
-
 #, php-format
 msgid "- creating groups : %s"
 msgstr ""
@@ -51,7 +45,7 @@ msgid "- creating record for users :  %s"
 msgstr "- skapar poster för användare : %s"
 
 #, php-format
-msgid "- deactivate groups : %s"
+msgid "- deactivated groups : %s"
 msgstr ""
 
 #, php-format
@@ -75,34 +69,35 @@ msgid "- updating user records : %s"
 msgstr "- uppdaterar användarposter : %s"
 
 #, php-format
-msgid ""
+msgid "<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on DAViCal Wiki</a>"
-"<a href=\"https://wiki.davical.org/w/Setup_Failure_Codes/%s\">Explanation on"
-" DAViCal Wiki</a>"
 msgstr ""
 
-msgid ""
+msgid "<b>WARNING: all events in this path will be deleted before inserting all of the ics file</b>"
-"<b>WARNING: all events in this path will be deleted before inserting allof "
+msgstr ""
-"the ics file</b>"
-msgstr "<b>Varning: alla händelser i denna sökväg kommer att raderas innan ics-filen läggs till</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"https://www.davical.org/\" "
+"target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"https://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"https://wikipedia.org/wiki/"
+"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"https://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"or send a question to the <a href=\"https://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"https://sourceforge.net/p/davical/mailman/davical-general/\" title=\"DAViCal Users "
+"Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"username and password that have been issued to you.</p><p>If you would like "
+"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-"to request access, please e-mail %s.</p>"
+msgstr ""
-msgstr "<h1>Var god logga in</h1><p>För att få tillgång till %s behöver du logga in med det användarnamn och lösenord som tilldelats dig.</p><p>För att begära ett konto, skicka e-post till %s.</p>"
+"<h1>Var god logga in</h1><p>För att få tillgång till %s behöver du logga in med det användarnamn och "
+"lösenord som tilldelats dig.</p><p>För att begära ett konto, skicka e-post till %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -116,6 +111,9 @@ msgstr ""
 msgid "A resource already exists at the destination."
 msgstr ""
 
+msgid "A valid CSRF token must be provided"
+msgstr ""
+
 msgid "AWL Library version "
 msgstr ""
 
@@ -125,6 +123,9 @@ msgstr ""
 msgid "Access ticket deleted."
 msgstr ""
 
+msgid "Access ticket deletion failed."
+msgstr ""
+
 msgid "Action"
 msgstr "Aktivitet"
 
@@ -157,8 +158,7 @@ msgstr "All data för samlingen kommer att raderas oåterkallerligen."
 msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid ""
+msgid "All of the principal's calendars and events will be unrecoverably deleted."
-"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -167,8 +167,7 @@ msgstr ""
 msgid "All requested changes were made."
 msgstr "Alla begärda ändringar har utförts."
 
-msgid ""
+msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -204,6 +203,9 @@ msgstr ""
 msgid "Binding deleted."
 msgstr ""
 
+msgid "Binding deletion failed."
+msgstr ""
+
 msgid "Bindings to other collections"
 msgstr ""
 
@@ -245,10 +247,9 @@ msgid "Can only bind collections into the current principal's namespace"
 msgstr ""
 
 msgid ""
-"Cannot determine upstream version, because PHP has set “<a "
+"Cannot determine upstream version, because PHP has set “<a href=\"https://secure.php.net/manual/en/"
-"href=\"https://secure.php.net/manual/en/filesystem.configuration.php#ini"
+"filesystem.configuration.php#ini.allow-url-fopen\"><code>allow_url_fopen</code></a>” to “<code>FALSE</"
-".allow-url-fopen\"><code>allow_url_fopen</code></a>” to "
+"code>”."
-"“<code>FALSE</code>”."
 msgstr ""
 
 msgid "Categories"
@@ -278,9 +279,10 @@ msgstr "Samlingens ID"
 msgid "Collection deleted."
 msgstr ""
 
-msgid ""
+msgid "Collection deletion failed."
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+msgstr ""
-" same time"
+
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -353,15 +355,14 @@ msgid "Current DAViCal version "
 msgstr ""
 
 msgid ""
-"Currently this page does nothing. Suggestions or patches to make it do "
+"Currently this page does nothing. Suggestions or patches to make it do something useful will be "
-"something useful will be gratefully received."
+"gratefully received."
 msgstr ""
 
 msgid "DAV Path"
 msgstr "DAV-sökväg"
 
-msgid ""
+msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -373,7 +374,8 @@ msgstr ""
 msgid "DAViCal DB Schema version "
 msgstr ""
 
-msgid "DAViCal Fatal Error"
+#, php-format
+msgid "DAViCal Fatal Error, request ID: %s"
 msgstr ""
 
 msgid "DAViCal Homepage"
@@ -466,8 +468,7 @@ msgstr ""
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid ""
+msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -530,9 +531,7 @@ msgstr "Ändra denna användarpost"
 msgid "Email Address"
 msgstr "E-postadress"
 
-msgid ""
+msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-"Enter a username, if you know it, and click here, to be e-mailed a temporary"
-" password."
 msgstr "Mata in ett användarnamn, om du känner till det, för att erhålla e-post med ett engångslösenord"
 
 msgid "Enter your username and password then click here to log in."
@@ -542,6 +541,10 @@ msgstr "Mata in ditt användarnamn och lösenord och klicka sedan här för att
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
 
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , baseDN >%s<"
+msgstr ""
+
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr "Feltyp NoUserFound med filter >%s<, attribut >%s< och dn >%s<"
@@ -561,9 +564,6 @@ msgstr ""
 msgid "European (d/m/y)"
 msgstr "Europeisk (dd/mm/åååå)"
 
-msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Befintlig resurs matchar inte \"If-Match\"-header - ej accepterad."
-
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Befintlig resurs matchar \"If-None-Match\"-header - ej accepterad."
 
@@ -637,19 +637,15 @@ msgstr "Gruppkonton"
 msgid "Groups &amp; Grants"
 msgstr ""
 
-msgid ""
+msgid "Groups allow those granted rights to be assigned to a set of many principals in one action"
-"Groups allow those granted rights to be assigned to a set of many principals"
+msgstr ""
-" in one action"
+
+msgid "Groups may be members of other groups, but complex nesting will hurt system performance"
 msgstr ""
 
 msgid ""
-"Groups may be members of other groups, but complex nesting will hurt system "
+"Groups provide an intermediate linking to minimise administration overhead.  They might not have "
-"performance"
+"calendars, and they will not usually log on."
-msgstr ""
-
-msgid ""
-"Groups provide an intermediate linking to minimise administration overhead."
-"  They might not have calendars, and they will not usually log on."
 msgstr ""
 
 msgid "Has Members"
@@ -705,9 +701,8 @@ msgid "Import calendars and Synchronise LDAP."
 msgstr ""
 
 msgid ""
-"In due course this program will implement the functionality which is "
+"In due course this program will implement the functionality which is currently contained in that "
-"currently contained in that script, but until then I'm afraid you do need to"
+"script, but until then I'm afraid you do need to run it."
-" run it."
 msgstr ""
 
 msgid "Inactive Principals"
@@ -758,6 +753,9 @@ msgstr "Lista grupper"
 msgid "List Resources"
 msgstr "Lista resurser"
 
+msgid "List Rooms"
+msgstr ""
+
 msgid "List Users"
 msgstr "Lista användare"
 
@@ -782,9 +780,8 @@ msgstr "Logga ur"
 msgid "Member deleted from this Group Principal"
 msgstr "Medlem borttagen från detta gruppkonto"
 
-msgid ""
+#, php-format
-"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+msgid "Minimum: %s, Currently: %s"
-"recommended."
 msgstr ""
 
 msgid "Name"
@@ -815,6 +812,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
+msgid "No user found matching"
+msgstr ""
+
 #. Translators: short for 'Number'
 msgid "No."
 msgstr "Nr."
@@ -846,9 +846,6 @@ msgstr "Bryt upp ett lås"
 msgid "PDO PostgreSQL drivers"
 msgstr ""
 
-msgid "PHP DateTime class"
-msgstr ""
-
 msgid "PHP Information"
 msgstr ""
 
@@ -873,23 +870,25 @@ msgstr ""
 msgid "PHP curl support"
 msgstr ""
 
+msgid "PHP curl support is required for external binds"
+msgstr ""
+
 msgid "PHP iconv support"
 msgstr ""
 
 msgid "PHP not using Apache Filter mode"
 msgstr ""
 
-msgid "PHP curl support is required for external binds"
+msgid "PHP version "
 msgstr ""
 
-msgid ""
+msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-"PUT on a collection is only allowed for text/calendar content against a "
-"calendar collection"
 msgstr ""
 
 msgid "Passed"
 msgstr ""
 
+#, php-format
 msgid "Passed: %s"
 msgstr ""
 
@@ -899,9 +898,7 @@ msgstr "Lösenord"
 msgid "Path"
 msgstr "Sökväg"
 
-msgid ""
+msgid "Path to collection you wish to bind, like /user1/calendar/ or https://cal.example.com/user2/cal/"
-"Path to collection you wish to bind, like /user1/calendar/ or "
-"https://cal.example.com/user2/cal/"
 msgstr ""
 
 msgid "Person"
@@ -940,6 +937,9 @@ msgstr "Kontotyp"
 msgid "Principal deleted."
 msgstr ""
 
+msgid "Principal not found"
+msgstr ""
+
 msgid "Principals: Users, Resources and Groups"
 msgstr ""
 
@@ -989,8 +989,7 @@ msgstr "Läs in tillgänglighetsinformation"
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid ""
+msgid "Read the details of the current user's access control to this resource."
-"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -1023,8 +1022,7 @@ msgstr "Begär funktionsförbättring"
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a
+#. Translators a thing which might be booked: a room, a carpark, a projector...
-#. projector...
 msgid "Resource"
 msgstr "Resurs"
 
@@ -1034,9 +1032,6 @@ msgstr "Resurskalender-konto"
 msgid "Resource Not Found."
 msgstr ""
 
-msgid "Resource has changed on server - not deleted"
-msgstr "Resurs har ändrats på servern - ej raderad"
-
 msgid "Resources do have calendars, but they will not usually log on."
 msgstr ""
 
@@ -1055,8 +1050,8 @@ msgstr ""
 
 #, php-format
 msgid ""
-"SRV record missing for \"%s\" or DNS failure, the domain you are going to "
+"SRV record missing for \"%s\" or DNS failure, the domain you are going to send events from should have "
-"send events from should have an SRV record"
+"an SRV record"
 msgstr ""
 
 msgid "Schedule Deliver"
@@ -1095,14 +1090,10 @@ msgstr ""
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid ""
+msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-"Send scheduling invitations as an organiser from the owner of this "
-"scheduling outbox."
 msgstr ""
 
-msgid ""
+msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-"Send scheduling replies as an attendee from the owner of this scheduling "
-"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -1115,8 +1106,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
-"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1146,8 +1136,7 @@ msgstr "Vissa egenskaper kunde inte ställas in."
 msgid "Source resource does not exist."
 msgstr "Källresursen existerar inte."
 
-msgid ""
+msgid "Special collections may not contain a calendar or other special collection."
-"Special collections may not contain a calendar or other special collection."
 msgstr "Speciella samlingar får inte innehålla en kalender eller en annan speciell samling."
 
 msgid "Specific Privileges"
@@ -1184,9 +1173,7 @@ msgid "TXT record corrupt for %s._domainkey.%s or DNS failure"
 msgstr ""
 
 #, php-format
-msgid ""
+msgid "TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key is configured"
-"TXT record missing for \"%s._domainkey.%s\" or DNS failure, Private RSA key "
-"is configured"
 msgstr ""
 
 msgid "Target"
@@ -1199,30 +1186,27 @@ msgid "That resource is not present on this server."
 msgstr "Denna resulrs finns inte på denna server."
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-"
+"The <a href=\"https://wiki.davical.org/w/Update-davical-database\">update-davical-database</a> should "
-"davical-database</a> should be run manually after upgrading the software to "
+"be run manually after upgrading the software to a new version of DAViCal."
-"a new version of DAViCal."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule"
+"The <a href=\"https://wiki.davical.org/w/iSchedule_configuration\">iSchedule configuration</a> "
-" configuration</a> requires a few DNS entries. DNS SRV record(s) will need "
+"requires a few DNS entries. DNS SRV record(s) will need to be created for all domains you wish to "
-"to be created for all domains you wish to accept requests for, these are the"
+"accept requests for, these are the domain portion of email address on Principal records in DAViCal "
-" domain portion of email address on Principal records in DAViCal examples "
+"examples are listed below for domains found in your database. At least 1 public key must also be "
-"are listed below for domains found in your database. At least 1 public key "
+"published if you wish to send requests from this server."
-"must also be published if you wish to send requests from this server."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/clients.php\">client setup page on the"
+"The <a href=\"https://www.davical.org/clients.php\">client setup page on the DAViCal website</a> has "
-" DAViCal website</a> has information on how to configure Evolution, Sunbird,"
+"information on how to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted "
-" Lightning and Mulberry to use remotely hosted calendars."
+"calendars."
 msgstr ""
 
 msgid ""
-"The <a href=\"https://www.davical.org/installation.php\">DAViCal "
+"The <a href=\"https://www.davical.org/installation.php\">DAViCal installation page</a> on the DAViCal "
-"installation page</a> on the DAViCal website has some further information on"
+"website has some further information on how to install and configure this application."
-" how to install and configure this application."
 msgstr ""
 
 msgid "The BIND Request MUST identify an existing resource."
@@ -1234,8 +1218,7 @@ msgstr ""
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid ""
+msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1244,18 +1227,13 @@ msgstr "DAViCals hemsida"
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid ""
+msgid "The addressbook-query report must be run against an addressbook collection"
-"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
-msgid ""
+msgid "The administration of this application should be fairly simple. You can administer:"
-"The administration of this application should be fairly simple. You can "
-"administer:"
 msgstr ""
 
-msgid ""
+msgid "The administrative interface has no facility for viewing or modifying calendar data."
-"The administrative interface has no facility for viewing or modifying "
-"calendar data."
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1271,16 +1249,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Kalendersökvägen inehåller otillåtna tecken."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
-"property of a calendar collection."
+"collection."
 msgstr ""
 
 msgid "The calendar-query report may not be run against that URL."
 msgstr ""
 
-msgid ""
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-"The calendar-query report must be run against a calendar or a scheduling "
-"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1289,13 +1265,12 @@ msgstr ""
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid ""
+msgid "The displayname may only be set on collections, principals or bindings."
-"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid ""
-"The email address identifies principals when processing invitations and "
+"The email address identifies principals when processing invitations and freebusy lookups. It should be "
-"freebusy lookups. It should be set to a unique value."
+"set to a unique value."
 msgstr ""
 
 msgid "The email address really should not be blank."
@@ -1305,8 +1280,7 @@ msgstr ""
 msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
 
-msgid ""
+msgid "The file is not UTF-8 encoded, please check the error for more details."
-"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Filen är inte teckenkodad i UTF-8, var god kontrollera felet för fler detaljer."
 
 msgid "The full name for this person, group or other type of principal."
@@ -1350,8 +1324,8 @@ msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
 
 msgid ""
-"There is no ability to view and / or maintain calendars or events from "
+"There is no ability to view and / or maintain calendars or events from within this administrative "
-"within this administrative interface."
+"interface."
 msgstr ""
 
 msgid "There was an error reading from the database."
@@ -1360,38 +1334,31 @@ msgstr ""
 msgid "There was an error writing to the database."
 msgstr "Det uppstöd ett fel vid skrivning till databasen."
 
-msgid ""
+msgid "These are the things which may have collections of calendar resources (i.e. calendars)."
-"These are the things which may have collections of calendar resources (i.e. "
-"calendars)."
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP "
+"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP "
+"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
-"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work "
+"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"patches to make it do more useful stuff will be gratefully received."
-"gratefully received."
 msgstr ""
 
 msgid ""
-"This process will import each file in a directory named \"username.ics\" and"
+"This process will import each file in a directory named \"username.ics\" and create a user and "
-" create a user and calendar for each file to import."
+"calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1410,9 +1377,8 @@ msgid "To ID"
 msgstr "Till ID"
 
 msgid ""
-"To do that you will need to use a CalDAV capable calendaring application "
+"To do that you will need to use a CalDAV capable calendaring application such as Evolution, Sunbird, "
-"such as Evolution, Sunbird, Thunderbird (with the Lightning extension) or "
+"Thunderbird (with the Lightning extension) or Mulberry."
-"Mulberry."
 msgstr ""
 
 msgid "Toggle all privileges"
@@ -1496,9 +1462,7 @@ msgstr "Användarnamn"
 msgid "Users (or Resources or Groups) and the relationships between them"
 msgstr ""
 
-msgid ""
+msgid "Users will probably have calendars, and are likely to also log on to the system."
-"Users will probably have calendars, and are likely to also log on to the "
-"system."
 msgstr ""
 
 msgid "View My Details"
@@ -1521,8 +1485,8 @@ msgid "Want: %s, Currently: %s"
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging"
+"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+"$c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1578,8 +1542,8 @@ msgid "You are viewing"
 msgstr "Du inspekterar"
 
 msgid ""
-"You can click on any user to see the full detail for that person (or group "
+"You can click on any user to see the full detail for that person (or group or resource - but from now "
-"or resource - but from now we'll just call them users)."
+"we'll just call them users)."
 msgstr ""
 
 msgid "You do not have permission to modify this collection."
@@ -1608,54 +1572,42 @@ msgstr ""
 msgid "directory %s is not readable"
 msgstr "mappen %s är inte åtkomlig"
 
-msgid ""
-"drivers_imap_pam : imap_url parameter not configured in "
-"/etc/davical/*-conf.php"
-msgstr ""
-
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 
 #, php-format
-msgid ""
+msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 
-msgid ""
+msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
-"supported"
 msgstr "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"and passDN, and that your LDAP server is reachable"
+"LDAP server is reachable"
-msgstr "drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your LDAP server is reachable"
+msgstr ""
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
+"LDAP server is reachable"
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with URI: %s"
+msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 
-msgid ""
+msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
 msgstr ""
 
-msgid ""
-"drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr ""
-
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Unable to find %s file"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower)
-#. and is an option allowing people to log in automatically in future
-msgid "forget me not"
-msgstr "Kom ihåg mig"
-
 msgid "from principal"
 msgstr ""
 
@@ -1669,11 +1621,10 @@ msgid "iSchedule OK"
 msgstr ""
 
 msgid ""
-"iSchedule allows caldav servers to communicate directly with each other, "
+"iSchedule allows caldav servers to communicate directly with each other, bypassing the need to send "
-"bypassing the need to send invitations via email, for scheduled events where"
+"invitations via email, for scheduled events where attendees are using different servers or providers. "
-" attendees are using different servers or providers. Additionally it enables"
+"Additionally it enables freebusy lookups for remote attendees. Events and ToDos received via iSchedule "
-" freebusy lookups for remote attendees. Events and ToDos received via "
+"will show up in the users scheduling inbox."
-"iSchedule will show up in the users scheduling inbox."
 msgstr ""
 
 msgid "invalid request"
@@ -1691,14 +1642,10 @@ msgstr ""
 msgid "recipient must be organizer or attendee of event"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain does not match server name (please check your DAViCal configuration file)"
-"scheduling_dkim_domain does not match server name (please check your DAViCal"
-" configuration file)"
 msgstr ""
 
-msgid ""
+msgid "scheduling_dkim_domain not set (please check your DAViCal configuration file)"
-"scheduling_dkim_domain not set (please check your DAViCal configuration "
-"file)"
 msgstr ""
 
 msgid "sender must be organizer or attendee of event"
@@ -1707,7 +1654,20 @@ msgstr ""
 msgid "unauthenticated"
 msgstr ""
 
-msgid ""
+msgid "unimplemented"
-"you should log on with the username and password that have been issued to "
+msgstr ""
-"you."
+
+msgid "you should log on with the username and password that have been issued to you."
 msgstr "du behöver logga in med det användarnamn och lösenord du erhållit."
+
+#~ msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+#~ msgstr "<b>Varning: alla händelser i denna sökväg kommer att raderas innan ics-filen läggs till</b>"
+
+#~ msgid "Existing resource does not match \"If-Match\" header - not accepted."
+#~ msgstr "Befintlig resurs matchar inte \"If-Match\"-header - ej accepterad."
+
+#~ msgid "Resource has changed on server - not deleted"
+#~ msgstr "Resurs har ändrats på servern - ej raderad"
+
+#~ msgid "forget me not"
+#~ msgstr "Kom ihåg mig"

scripts/build-always.sh

@@ -4,12 +4,10 @@
 #
 
 DAVICAL_VERSION="`head -n1 VERSION`"
-DB_VERSION="`grep 'SELECT new_db_revision' dba/davical.sql | cut -f2 -d'(' | cut -f1-3 -d,`"
 AWL_VERSION="`head -n1 ../awl/VERSION`"
 if [ -z "${AWL_VERSION}" ] ; then
   AWL_VERSION="`grep 'want_awl_version' inc/always.php.in | cut -f2 -d= | cut -f1 -d';' | sed 's: ::g'`"
 fi
 
 sed -e "/^ *.c->version_string *= *'[^']*' *;/ s/^ *.c->version_string *= *'[^']*' *;/\$c->version_string = '${DAVICAL_VERSION}';/" \
-    -e "/^ *.c->want_dbversion *=.*$/ s/^ *.c->want_dbversion *=.*$/\$c->want_dbversion = array(${DB_VERSION});/" \
     -e "/^ *.c->want_awl_version *=.*$/ s/^ *.c->want_awl_version *=.*$/\$c->want_awl_version = '${AWL_VERSION}';/"

scripts/cron-sync-ldap.php

@@ -13,11 +13,12 @@ Usage:
 
 Where 'davical.example.com' is the hostname of your DAViCal server.
 
-This script can be used to synchronise DAViCal from your LDAP server on a regular
+This script can be used to synchronise DAViCal from your LDAP server on a
-basis to ensure group information is up-to-date.  It's not strictly necessary as
+regular basis to ensure group information is up-to-date.  It's not strictly
-DAViCal's user data will be updated as soon as a new or updated user logs into
+necessary as DAViCal's user data will be updated as soon as a new or updated
-DAViCal, but it can be useful to synchronise data for people who have not logged
+user logs into DAViCal, but it can be useful to synchronise data for people
-into DAViCal so that they are visible as potential calendars, for example. 
+who have not logged into DAViCal so that they are visible as potential
+calendars, for example. 
 
 USAGE;
   exit(1);
@@ -25,9 +26,9 @@ USAGE;
 
 $_SERVER['SERVER_NAME'] = $argv[1];
 
-chdir(str_replace('/scripts/cron-sync-ldap.php','/htdocs',$script_file));
+chdir(str_replace('scripts/cron-sync-ldap.php', 'htdocs', $script_file));
 
 require_once("./always.php");
 
 sync_LDAP();
-sync_LDAP_groups();
+sync_LDAP_groups();

testing/.gitignore

@@ -0,0 +1 @@
+regression-conf.php.dynamic.per-test

testing/apache-site.conf.example

@@ -1,7 +1,7 @@
 Listen 127.0.1.1:80
 <VirtualHost 127.0.1.1:80>
   ServerName regression
-  ServerAlias myempty mycaldav
+  ServerAlias myempty mycaldav mycaldav_ldap
   DocumentRoot /path/to/davical/htdocs
   CustomLog ${APACHE_LOG_DIR}/regression-access.log combined
   ErrorLog  ${APACHE_LOG_DIR}/regression-error.log
@@ -11,6 +11,11 @@ Listen 127.0.1.1:80
     Require all granted
     DirectoryIndex index.php index.html
     php_value include_path /path/to/awl/inc:/path/to/davical/testing
+
+    # All content for our UI should be served locally.
+    <FilesMatch "(admin|help|iSchedule|index|metrics|public|setup|tools|upgrade).php">
+      Header set Content-Security-Policy "default-src 'none'; img-src 'self' data:; media-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' data:; font-src 'self' data:; object-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'self'"
+    </FilesMatch>
   </Directory>
 
   RewriteEngine On
@@ -24,10 +29,6 @@ Listen 127.0.1.1:80
   # let caldav.php handle "anything else"
   RewriteCond %{REQUEST_URI} !^/$
   RewriteCond %{REQUEST_URI} !\.(php|css|png|gif|js|jpg|ico)
+  RewriteCond %{REQUEST_URI} !/testfiles/.*$
   RewriteRule ^(.*)$ /caldav.php$1  [NC,L]
-
-  # All content for our UI should be served locally.
-  <FilesMatch "(admin|help|iSchedule|index|metrics|public|setup|tools|upgrade).php">
-    Header set Content-Security-Policy "default-src 'none'; img-src 'self' data:; media-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' data:; font-src 'self' data:; object-src 'self'; base-uri 'self'; connect-src 'self'; form-action 'self' sis.redsys.es; frame-ancestors 'self'"
-  </FilesMatch>
 </VirtualHost>

testing/dav_test

@@ -6,22 +6,35 @@
 use strict;
 use warnings;
 use open qw( :encoding(UTF-8) :std );
-
+use File::Copy;
 use DBI;
 use Getopt::Long qw(:config permute);  # allow mixed args.
+use File::pushd;
+use File::Touch;
+use Digest::SHA;
 
 # Options variables
 my $debug  = 0;
 my $dsn    = "davical";
 my $dbuser = "";
 my $dbpass = "";
-my $webhost = 'mycaldav';
+my $webhost  = 'mycaldav';
-my $althost = 'myempty';
+my $althost  = 'myempty';
+my $ldaphost = 'mycaldav_ldap';
 my $testdef;
 my $suite;
 my $case;
 my $helpmeplease = 0;
 
+
+my $testmode = 'DAVICAL';
+my $save_location = "/var/log/davical";
+my $request_id;
+my %conf_file_hashes;
+
+# Hash for eval'd Perl code to store long lived variables in
+my %evaled;
+
 my $dbadir = $0;
 $dbadir =~ s{/[^/]*$}{};
 my $patchdir = $dbadir . "/patches";
@@ -42,21 +55,60 @@ usage() if ( $helpmeplease || ((!defined($suite) || !defined($case)) && !defined
 
 my $dbh;
 
+# Allow enabling debugging via an environment variable. Useful for debugging CI.
+$debug = 1 if ($ENV{DEBUG} || 0) == 1;
 
 my @arguments = ( "--basic", "--proxy", "", "--insecure" );
 push @arguments, "--silent"  unless ( $debug );
 push @arguments, "--verbose" if ( $debug );
 
 my $url;
-my $script;
+my $script;     # Not neede as global, used as flag.
-my @scripts = ( );
+my $script_dir;
 my $is_head_request = 0;
+my $sql_count = 1;
 my @auth = ( "--user", "user1:user1" );
 
-if ( !defined($testdef) ) {
+# Allow easier pasting of tests on the command line.
+$case =~ s/\.test$//;
+
+if ( ! defined($testdef) ) {
   $testdef = "tests/$suite/$case.test";
 }
 
+die "You need to run this from the testing directory!\n"
+  unless -d "tests";
+
+# Heuristics to work out if we should make $save_location elsewhere. We want
+# /var/log/davical for the CI rig, but within the test directories for local
+# runs. Do we?
+if ($ENV{USER} ne 'testrunner') {
+    $save_location = "tests/$suite/results/";
+} elsif (! -w $save_location) {
+    warn "$save_location isn't writable, using local location";
+    $save_location = "tests/$suite/results/";
+}
+
+# Record the request_ids from the web server.
+my $request_id_file = "$save_location/$case.request_id";
+open(my $REQUEST_ID_FILE, "> $request_id_file")
+    || die "Failed to open $request_id_file for writing";
+
+# Allow for application configuration per test file. Ensure the file we
+# manage is empty in case the previous test was aborted.
+my $dynamic_app_conf_file = 'regression-conf.php.dynamic.per-test';
+if (-f $dynamic_app_conf_file) {
+    $conf_file_hashes{$dynamic_app_conf_file}{'old'}
+        = Digest::SHA->new->addfile($dynamic_app_conf_file)->hexdigest();
+
+    unlink $dynamic_app_conf_file
+        || die "Failed to remove $dynamic_app_conf_file: $!\n";
+} else {
+    $conf_file_hashes{$dynamic_app_conf_file}{'old'} = '';
+}
+
+touch $dynamic_app_conf_file;
+
 my $datafile = $testdef;
 $datafile =~ s{\.test$}{};
 push @arguments, "--header", 'X-DAViCal-Testcase: '.$datafile;
@@ -65,24 +117,33 @@ $datafile .= '.data';
 my $state = "";
 my $data_binary;
 
-my $sql_variable = "";
+my $sql_variable  = "";
 my $sql_statement = "";
-my $sql_values = {};
+my $sql_values    = {};
-my $queries = ();
+my $perl_code = "";
+my $app_conf  = "";
+my $queries   = ();
 my $replacements = ();
+my $line_number  = 0;
 
 
 open( TEST, '<', $testdef ) or die "Can't open '$testdef'";
 while( <TEST> ) {
   my $line = $_;
+  $line_number++;
 
-  # Do any variable replcements we have so far
+  # Do any variable replacements we have so far
   foreach my $variable ( keys %{$sql_values} ) {
     my $value = $sql_values->{$variable};
     $line =~ s/##$variable##/$value/g;
   }
 
   if ( $state ne "" ) {
+    $line =~ /^BEGIN(?!:)/ && do {
+      print "Found a new BEGIN line, while still processing a previous one. Line number: $line_number\n";
+      exit 0;
+    };
+
     if ( /^END$state$/ ) {
       if ( $state eq "SQL" ) {
         get_sql_value( $sql_variable, $sql_values, $sql_statement );
@@ -91,16 +152,32 @@ while( <TEST> ) {
         do_sql( $sql_statement );
       }
       elsif ( $state eq "QUERY" ) {
-        push @$queries, $sql_statement;
+        run_sql($sql_statement);
+      }
+      elsif ( $state eq "PERL" ) {
+        eval($perl_code);
+        if ($@) {
+          print "Failed to run Perl code: $@\n";
+          exit 0;
+        }
+      }
+      elsif ( $state eq "APPCONF" ) {
+        write_app_conf($app_conf);
       }
       $state = "";
     }
     elsif ( $state eq "DATA" ) {
       $data_binary .= $line;
     }
-    elsif ( $state eq "SQL" || $state eq "QUERY" || $state eq "DOSQL" ) {
+    elsif ( $state =~ /^SQL|QUERY|DOSQL$/ ) {
       $sql_statement .= $line;
     }
+    elsif ( $state eq "PERL" ) {
+      $perl_code .= $line;
+    }
+    elsif ( $state eq "APPCONF" ) {
+      $app_conf .= $line;
+    }
     next;
   }
 
@@ -110,6 +187,22 @@ while( <TEST> ) {
     push @arguments, "--include";
   };
 
+  $line =~ /^\s*MODE\s*=\s*(\S*)(?:,(\d+))/ && do {
+    my $mode = $1;
+    my $args = $2;
+
+    if (uc($mode) =~ /^TAP$/) {
+      $testmode = 'TAP';
+      use Test::More;
+
+      if ($args =~ /^\d+$/) {
+        plan tests => $args;
+      }
+    } else {
+      die "Unknown test mode: $1";
+    }
+  };
+
   $line =~ /^\s*VERBOSE\s*(#|$|=)/ && do {
     push @arguments, "--verbose";
   };
@@ -154,17 +247,47 @@ while( <TEST> ) {
     $state = "DATA";
   };
 
-  $line =~ /^GETSQL\s*=\s*(\S.*)$/ && do {
+  $line =~ /^BEGINPERL\s*$/ && do {
+    $perl_code = "";
+    $state = "PERL";
+  };
+
+  $line =~ /^BEGINAPPCONF\s*$/ && do {
+    $app_conf = "";
+    $state = "APPCONF";
+  };
+
+  $line =~ /^(?:BEGIN)?GETSQL\s*=\s*(\S.*)$/ && do {
     $sql_variable = $1;
     $sql_statement = "";
     $state = "SQL";
   };
 
-  $line =~ /^DOSQL\s*$/ && do {
+  $line =~ /^(?:BEGIN)?DOSQL\s*$/ && do {
     $sql_statement = "";
     $state = "DOSQL";
   };
 
+  $line =~ /^\s*APPCONF\s*=\s*(\S.*)$/ && do {
+      my $basename = $1;
+      my $test_app_conf_file;
+
+      if ( -e "tests/$suite/$basename.appconf" ) {
+          $test_app_conf_file="tests/$suite/$basename.appconf";
+      }
+      elsif ( -e "tests/$suite/$basename" ) {
+          $test_app_conf_file="tests/$suite/$basename";
+      }
+
+      if (! defined $test_app_conf_file) {
+          die "Can't find app conf file $basename or $basename.appconf";
+      }
+
+      copy $test_app_conf_file, $dynamic_app_conf_file
+          || die "Failed to copy $test_app_conf_file to $dynamic_app_conf_file: $!\n";
+  };
+
+
   $line =~ /^REPLACE\s*=\s*(\S)(.*)$/ && do {
     my $separator = $1;
     $2 =~ /^([^$separator]*)$separator([^$separator]*)$separator$/ && do {
@@ -172,81 +295,55 @@ while( <TEST> ) {
     };
   };
 
-  $line =~ /^QUERY\s*$/ && do {
+  $line =~ /^(?:BEGIN)?QUERY\s*$/ && do {
     $sql_statement = "";
     $state = "QUERY";
   };
 
   $line =~ /^\s*TYPE\s*=\s*(\S.*)$/ && do {
     if ( $1 eq "HEAD" ) {
-      $is_head_request = 1;
+      push @arguments, "--head";
     }
     else {
       push @arguments, "--request", $1;
     }
   };
 
+  # HTTP headers to send with curl
   $line =~ /^\s*HEADER\s*=\s*(\S.*)$/ && do {
     my $arg = $1;
     $arg =~ s{regression.host}{$webhost};
+    $arg =~ s{regression_ldap.host}{$ldaphost};
     $arg =~ s{alternate.host}{$althost};
     push @arguments, "--header", $arg;
   };
 
+  # URL to use with curl
   $line =~ /^\s*URL\s*=\s*(\S.*)$/ && do {
-    $url=$1;
+    $url = $1;
     $url =~ s{regression.host}{$webhost};
+    $url =~ s{regression_ldap.host}{$ldaphost};
     $url =~ s{alternate.host}{$althost};
+
+    run_curl($url);
   };
 
+
+  # The directory to run the next SCRIPT in.
+  $line =~ /^\s*SCRIPT_DIR\s*=\s*(\S.*)$/ && do {
+    $script_dir = $1;
+  };
+
+  # Run this SCRIPT, collect the output.
   $line =~ /^\s*SCRIPT\s*=\s*(\S.*)$/ && do {
     $script=$1;
     $script =~ s{regression.host}{$webhost};
+    $script =~ s{regression_ldap.host}{$ldaphost};
     $script =~ s{alternate.host}{$althost};
-    push @scripts, $script;
-  };
 
-}
+    my $dir = pushd($script_dir)
+      if defined $script_dir;
 
-if ( !defined($url) && !defined($script) ) {
-  print <<EOERROR ;
-The .test file must contain either a URL or a SCRIPT.
-EOERROR
-  exit (2);
-}
-
-push @arguments, "--head" if ( $is_head_request );
-
-push @arguments, @auth;
-
-if ( -f $datafile ) {
-  push @arguments, "--data-binary", "\@$datafile";
-}
-elsif ( defined($data_binary) ) {
-  push @arguments, "--data-binary", $data_binary;
-}
-else {
-  undef($datafile);
-}
-
-
-if ( defined($url) ) {
-  push @arguments, $url;
-
-  print STDERR join " ", "curl", @arguments, "\n" if ( $debug );
-
-  open RESULTS, "-|", "curl", @arguments;
-  while( <RESULTS> ) {
-    my $line = $_;
-    foreach my $replacement ( @$replacements ) {
-      $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/;
-    }
-    print $line;
-  }
-}
-
-if ( defined($script) ) {
-  foreach $script ( @scripts ) {
     open RESULTS, "-|", $script;
     while( <RESULTS> ) {
       my $line = $_;
@@ -255,60 +352,148 @@ if ( defined($script) ) {
       }
       print $line;
     }
+
+    $script_dir = undef;
+  };
+
+  $line =~ /^\s*STATIC\s*=\s*(.*?)\s*$/ && do {
+    my $source = "tests/$suite/static/$1";
+    my $dest = "../htdocs/testfiles";
+
+    die "Can't find $source to copy into $dest\n"
+      unless -f $source;
+
+    mkdir $dest
+      unless -d $dest;
+
+    copy($source, $dest)
+      || die "Failed to copy $source: $1";
   }
 }
 
-if ( defined($queries) && @{$queries} ) {
+if ( ! defined $url && ! defined $script && ! defined $sql_statement
-  opendb() unless defined($dbh);
+     && ! defined $perl_code ) {
-  print "\n";
+  print <<EOERROR ;
-  print STDERR "Processing special queries\n" if ( $debug );
+The .test file must contain either at least one URL, SCRIPT, PERL, or QUERY.
-  foreach $sql_statement ( @$queries ) {
+EOERROR
-    # run SQL statement and dump results, into array of hashes
+  exit (2);
-    my $results = $dbh->selectall_arrayref($sql_statement, { Slice => {} } );
+}
-    if ( $dbh->err ) {
+
-      print $dbh->errstr, "\n";
+if ($testmode eq 'TAP') {
-      next;
+  done_testing();
-    }
-    foreach my $row ( @$results ) {
-      print "Query result ================================================\n" if ( $debug );
-      my $sep = "";
-      foreach my $name ( sort keys %$row ) {
-        my $value = $row->{$name};
-        $value = 'NULL' unless ( defined($value) );
-        printf("%17.17s: >%s<\n", $name, $value );
-      }
-      print "\n";
-    }
-  }
 }
 
 exit(0);
 
+sub run_curl {
+  my $url = shift;
+
+  maybe_restart_apache();
+
+  my @args = @arguments;
+  push @args, @auth;
+
+  if ( -f $datafile ) {
+    push @args, "--data-binary", "\@$datafile";
+  }
+  elsif ( defined($data_binary) ) {
+    push @args, "--data-binary", $data_binary;
+  }
+  else {
+    undef($datafile);
+  }
+
+  push @args, $url;
+
+  warn join " ", "curl", @args, "\n"
+    if $debug;
+
+  open RESULTS, "-|", "curl", @args;
+  while ( <RESULTS> ) {
+    my $line = $_;
+
+    # Grab the web server request_id for later reference
+    if ($line =~ /^Request-ID: (.*?)\s*$/) {
+      $ENV{REQUEST_ID} = $1;
+      $request_id      = $1;
+      print $REQUEST_ID_FILE "$1\n";
+    }
+
+    foreach my $replacement ( @$replacements ) {
+      $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/;
+    }
+
+    print $line;
+  }
+
+  print "\n";
+}
+
+sub run_sql {
+  my $query = shift;
+
+  print "SQL Query " . $sql_count++ . " Result:\n";
+
+  opendb() unless defined($dbh);
+
+  # run SQL statement and dump results, into array of hashes
+  my $results = $dbh->selectall_arrayref($sql_statement, { Slice => {} } );
+
+  if ( $dbh->err ) {
+    print $dbh->errstr, "\n";
+    return;
+  } elsif (! defined $results) {
+    print "No results from SQL query\n";
+    return;
+  }
+
+  foreach my $row ( @$results ) {
+    warn "Query result ================================================\n"
+        if $debug;
+    my $sep = "";
+    foreach my $name ( sort keys %$row ) {
+      my $value = $row->{$name};
+      $value = 'NULL' unless ( defined($value) );
+      printf("%17.17s: >%s<\n", $name, $value );
+    }
+    print "\n";
+  }
+}
+
+
 
 =item do_sql( $sql_statement )
+
 Queries the database using the specified statement and
 ignores the result.
+
 =cut
+
 sub do_sql {
   my $sql = shift;
 
   opendb() unless defined($dbh);
   $dbh->do($sql);
+
   if ( $dbh->err ) {
     print $dbh->errstr, "\n";
     return;
   }
+
   print "SQL executed successfully.\n";
   print $sql, "\n";
 }
 
 
 =item get_sql_value( $sql_variable, $sql_values, $sql_statement )
+
 Queries the database using the specified statement and puts
 the first column of the first row returned into the
 hash referenced $sql_values->{$sql_variable} for replacement
 later in the parsing process.
+
 =cut
+
 sub get_sql_value {
   my $varname = shift;
   my $values  = shift;
@@ -316,25 +501,107 @@ sub get_sql_value {
 
   opendb() unless defined($dbh);
   my $results = $dbh->selectall_arrayref($sql);
+
   if ( $dbh->err ) {
     print $dbh->errstr, "\n";
     return;
   }
-  print STDERR "RESULT for $varname is ", $results->[0][0], "\n" if ( $debug );
+
+  warn "RESULT for $varname is ", $results->[0][0], "\n"
+    if $debug;
+
   $values->{$varname} = (defined($results->[0][0]) ? $results->[0][0] : "");
 }
 
 =item opendb()
+
 Opens the database connection to the global $dbh handle.
 Note that the standard PostgreSQL environment variables will also work
 with DBD::Pg.
+
 =cut
+
 sub opendb {
   $dsn = "dbi:Pg:dbname=$dsn";
   $dbh = DBI->connect($dsn, $dbuser, $dbpass, { AutoCommit => 1 } ) or die "Can't connect to database $dsn";
   $dbh->do("SET TIMEZONE TO 'Pacific/Auckland'");
 }
 
+sub webui_login {
+    my %args = (
+        username => undef,
+        password => undef,
+        url      => undef,
+        failauth => 0,
+        @_,
+    );
+
+    use Test::WWW::Mechanize;
+    my $mech = Test::WWW::Mechanize->new;
+
+    $mech->get_ok($args{url}, "Fetch first page");
+    $mech->text_contains('Log On Please', "Not logged in");
+    $mech->submit_form_ok(
+        {
+            fields => {
+                username => $args{username},
+                password => $args{password},
+            },
+        }, "Login to site"
+    );
+
+    if ($args{failauth}) {
+        # We expected failure.
+        $mech->text_contains("You must log in to use this system", "Failed to login");
+    } else {
+        $mech->text_contains("You are logged on as " . $args{username}, "Logged in");
+    }
+
+    return $mech;
+}
+
+=item write_app_conf()
+
+Write per test configuration entries to the DAViCal regression test server
+configuration.
+
+=cut
+
+sub write_app_conf {
+    my $content = shift;
+
+    # We may want to append extra content to a common file.
+    open(my $FILE, ">> $dynamic_app_conf_file")
+        || die "Failed to open $dynamic_app_conf_file for writing";
+    print $FILE $content;
+}
+
+=item maybe_restart_apache
+
+Check to see if the DAViCal config file snippet has changed, if it has,
+restart Apache to make sure the new config is picked up.
+
+=cut
+
+sub maybe_restart_apache {
+    my $restarted = 0;
+
+    for my $file (keys %conf_file_hashes) {
+        my $curr = (-f $file ? Digest::SHA->new->addfile($file)->hexdigest() : '');
+
+        if (! $restarted && $curr ne $conf_file_hashes{$file}{old}) {
+            system("sudo /usr/sbin/apache2ctl restart\n");
+            $restarted = 1;
+        }
+
+        # We've restarted Apache, treat the current hashes as old now, in
+        # case we make multiple queries to the server, or modify the config
+        # files again within this test file.
+        $conf_file_hashes{$file}{old} = $curr
+            if $restarted;
+    }
+}
+
 
 sub usage {
   print <<EOERROR ;
@@ -355,35 +622,60 @@ those test cases which might require it:
 The test instructions will include lines defining the test like:
 =================================================
 # This is an example
-URL=http://mycaldav/caldav.php/andrew/
 HEADER=Depth: 0
 HEADER=Content-type: text/xml
 TYPE=PROPFIND
+
 HEAD
+
 DATA=OTHERTEST
+
+URL=http://mycaldav/caldav.php/andrew/
+
 # This will let you use ##somename## for this value after this
 GETSQL=somename
 SELECT column FROM table WHERE criteria
 ENDSQL
+
 # The data can be included in line
 BEGINDATA
 ... data content ...
 ENDDATA
+
 # The result could be some SQL output
 QUERY
 SELECT something, or, other FROM table ...
 ENDQUERY
 
+# Run some Perl code
+BEGINPERL
+my \$variable = 'foo';
+ENDPERL
+
+# Dynamically add content to the DAViCal configuration file for this test.
+# Allows ad-hoc config changes for tests. See also APPCONF. If APPCONF isn't
+# used, then you must start this with "<?php" as below. If APPCONF is used,
+# then it must start with "<?php".
+BEGINAPPCONF
+<?php
+
+\$valid_php = "in here";
+ENDAPPCONF
+
 REPLACE=/pattern/replacement/
 =================================================
 
-URL      The URL to request from.
+URL      The URL to request from (request is sent when seen).
 HEADER   An additional header for the request
 TYPE     The type of request (e.g. GET/PUT/POST/REPORT/...)
 HEAD     Whether to include the headers in the recorded response
 VERBOSE  Whether to provide the full request / response headers.
 DATA     The name of a different test in this suite to use data from.
 REPLACE  A perl regex replacement to post-process the result through.
+APPCONF  A file that will be insert into the DAViCal config file. This is
+         inserted first, before any content in BEGINAPPCONF/ENDAPPCONF to
+         allow a common config file for a set of tests, but also to allow
+         for individual test overrides.
 
 Additionally, if a file 'tests/<testsuite>/<testname>.data' exists
 the contents of that file will be sent in the body of the request.

testing/etc/sudoers

@@ -0,0 +1,5 @@
+Cmnd_Alias RESTART_APACHE = /usr/sbin/apache2ctl restart
+
+# If you run the tests with a different user, repeat below line swapping
+# "testrunner" for your user account(s). 
+testrunner ALL = NOPASSWD: RESTART_APACHE

testing/gitlab_ci_after_script.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Order: commandline, $CI_JOB_NAME, unknown
+test="${1:-$CI_JOB_NAME}"
+test="${test:-unknown}"
+
+if [ -d /var/log/apache2 ]; then
+    mkdir apache2_log
+    cp -r /var/log/apache2 "apache2_log/$test"
+    xz apache2_log/"$test"/*
+fi
+
+if [ -d /var/log/davical ]; then
+    mkdir -p davical_log
+    cp -r /var/log/davical "davical_log/$test"
+fi
+
+mkdir -p davical_conf/$test
+cp /etc/davical/* davical_conf/$test

testing/gitlab_ci_script.sh

@@ -0,0 +1,304 @@
+#!/bin/bash
+
+# Configure the virtual environment that Gitlab provides for our CI jobs.
+#
+# This supports being used for either AWL or DAViCal. To test AWL we run
+# the DAViCal regression tests as that is the best thing we have to exercise
+# AWL currently.
+
+set -e
+set -x
+
+davical_repo_path=$CI_PROJECT_DIR
+
+mode=${1:-$CI_JOB_NAME}
+
+ldap=0
+memcache=0
+interop=0
+
+if [[ $mode =~ "ldap_memcache_auth" ]]; then
+    ldap=1
+    memcache=1
+    memcache_auth=1
+elif [[ $mode =~ "ldap" ]]; then
+    ldap=1
+    memcache=1
+elif [[ $mode =~ "memcache_auth" ]]; then
+    memcache=1
+    memcache_auth=1
+elif [[ $mode =~ "memcache" ]]; then
+    memcache=1
+elif [[ $mode =~ "interop" ]]; then
+    interop=1
+fi
+
+# The images don't have man page directories?
+mkdir -p /usr/share/man/man{0..10}
+
+# When we install the davical deb, ignore libawl-php version dependency, as
+# we also install the libawl-php .deb built by the AWL CI.
+dpkg_ignore_depends="libawl-php"
+
+# Images have no package info, load it.
+apt-get -y update
+
+###
+### Pre-configure the locale so it is ready before other packages are
+### installed.
+###
+
+apt-get -y install locales
+echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen
+locale-gen
+echo "LANG=en_NZ.UTF-8" > /etc/default/locale
+
+###
+### Install packages required for testing
+###
+
+packages="libdbd-pg-perl libyaml-perl postgresql-client postgresql
+    curl xmlstarlet netcat-openbsd libtest-www-mechanize-perl
+    libfile-pushd-perl libtemplate-perl libinline-files-perl
+    libdigest-sha-perl sudo libfile-touch-perl"
+
+if [[ $mode =~ "latestphp" ]]; then
+    # PHP pgsql package is built from source, needs libpq-dev.
+    packages="$packages libpq-dev"
+else
+    # The latestphp images already have some of these available, and others
+    # need to installed in another method.
+    packages="$packages libapache2-mod-php php php-cli php-pgsql php-xml
+        php-curl"
+fi
+
+if [ $memcache == 1 ]; then
+    packages="$packages php-memcached memcached"
+fi
+
+if [ $ldap == 1 ]; then
+    packages="$packages php-ldap libnet-ldap-server-test-perl"
+fi
+
+if [ $interop == 1 ]; then
+    packages="$packages composer phpunit"
+fi
+
+apt-get -y install $packages
+
+###
+### Setup PHP if we're using latestphp...
+###
+
+if [[ $mode =~ "latestphp" ]]; then
+    # The image doesn't install PHP from debs, so ignore the dependencies.
+    dpkg_ignore_depends="$dpkg_ignore_depends,php,php-pgsql,php-xml,php-cli"
+
+    docker-php-ext-install -j$(nproc) pgsql
+    docker-php-ext-install -j$(nproc) pdo_pgsql
+    docker-php-ext-install -j$(nproc) calendar
+
+    # The PHP 8.2 container has deflate enabled in Apache2, disable it.
+    # This causes a test to fail because we're being sent a gzip compressed
+    # result. My reading of the curl manpage says that it should be
+    # decompressed by curl, but it isn't. Let's just disable the deflate
+    # module.
+    a2dismod -f deflate
+fi
+
+###
+### Setup memcache if we're using it.
+###
+
+if [ $memcache == 1 ]; then
+    phpenmod memcached
+    /etc/init.d/memcached start
+
+    conf_filter_memcache="| sed 's.//memcache ..g'"
+fi
+
+if [ $memcache_auth == 1 ]; then
+    conf_filter_memcache="$conf_filter_memcache| sed 's.//memcache_auth ..g'"
+fi
+
+###
+### Prepare PHP for LDAP if we're using it.
+###
+
+if [ $ldap == 1 ]; then
+    phpenmod ldap
+
+    conf_filter_ldap="| sed 's.//ldap ..g'"
+fi
+
+###
+### If testing DAViCal, grab the git repo of AWL so we're using the latest
+### code.
+###
+
+if [ -f davical.spec.in ]; then
+    curl https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz \
+        | tar zxf -
+    mv awl-master /usr/share/awl/
+    chown -R www-data /usr/share/awl/
+fi
+
+###
+### If testing AWL, grab the git repo of DAViCal for the tests we'll use.
+###
+
+if [ -f php-awl.spec.in ]; then
+    curl https://gitlab.com/davical-project/davical/-/archive/master/davical-master.tar.gz \
+        | tar zxf -
+    ln -s . awl
+
+    davical_repo_path="$CI_PROJECT_DIR/davical-master"
+
+    ln -s /usr/share/davical $davical_repo_path
+fi
+
+
+###
+### If testing DAViCal install the davical and libawl-php packages to test
+###
+
+if [ -f davical.spec.in ]; then
+    dpkg --ignore-depends=$dpkg_ignore_depends -i *.deb
+fi
+
+mkdir -p /var/log/davical
+chown www-data /var/log/davical
+
+# Allow the testrunner user to write and read /var/log/davical .
+# - Write for saving the output of some tests if they fail
+chgrp adm /var/log/davical
+chmod 775 /var/log/davical
+
+###
+### Setup DAViCal config files
+###
+
+# When testing DAViCal, the file already exists, when testing AWL the
+# directory is missing.
+rm -f /etc/davical/config.php
+mkdir -p /etc/davical
+eval cat $davical_repo_path/testing/regression-conf.php.example \
+    \| sed 's.//\$c-\>dbg.\$c-\>dbg.' \
+    $conf_filter_memcache \
+    $conf_filter_ldap \
+    > /etc/davical/regression-conf.php
+
+for site in mycaldav mycaldav_ldap myempty; do
+    ln -s /etc/davical/regression-conf.php /etc/davical/$site-conf.php
+done
+
+# We need to be able to restart apache as the regression user.
+cp $davical_repo_path/testing/etc/sudoers /etc/sudoers.d/davical-tests
+
+###
+### Setup PostgreSQL
+###
+
+pg_ver=$(ls /etc/postgresql)
+sed -i '/peer/d' /etc/postgresql/$pg_ver/main/pg_hba.conf
+echo 'local  all  all  trust' >> /etc/postgresql/$pg_ver/main/pg_hba.conf
+pg_ctlcluster $pg_ver main start
+su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
+su postgres -c 'createuser davical_app --superuser'
+su postgres -c 'createuser testrunner --superuser'
+# Why? You don't need to restart PG after creating users.
+#pg_ctlcluster $pg_ver main restart
+
+###
+### Setup testrunner user
+###
+
+useradd testrunner
+# testrunner needs to be able to read /var/log/apache2/regression-error.log
+# for the memcache tests.
+adduser testrunner adm
+
+# dav_test may need to write out temporary config files here.
+chown -R testrunner $davical_repo_path/testing
+
+###
+### Configure Apache2
+###
+
+echo '127.0.1.1  regression mycaldav mycaldav_ldap myempty' >> /etc/hosts
+
+rm /etc/apache2/ports.conf /etc/apache2/sites-enabled/000-default.conf \
+    && touch /etc/apache2/ports.conf
+
+cp $davical_repo_path/testing/apache-site.conf.example \
+    /etc/apache2/sites-enabled/davical-regression.conf
+
+if [ -f php-awl.spec.in ]; then
+    sed -i "s,/path/to/awl,$CI_PROJECT_DIR,;
+            s,/path/to/davical,$davical_repo_path," \
+        /etc/apache2/sites-enabled/davical-regression.conf
+else
+    sed -i 's/\/path\/to/\/usr\/share/g' \
+        /etc/apache2/sites-enabled/davical-regression.conf
+fi
+
+# We need to have some PHP files in a known place.
+if [ ! -f php-awl.spec.in ]; then
+    ln -s $davical_repo_path/testing /usr/share/davical/testing
+fi
+
+
+a2enmod rewrite
+a2enmod headers
+apache2ctl start
+
+# Ensure that the jobs that need to drop in static files for Apache to serve
+# up can do so.
+mkdir -p /usr/share/davical/htdocs/testfiles
+chown testrunner /usr/share/davical/htdocs/testfiles
+ln -s /usr/share/davical/htdocs/testfiles $davical_repo_path/htdocs
+
+###
+### Set up for carddavclientinterop
+###
+
+if [ $interop == 1 ]; then
+    cd $davical_repo_path
+    curl https://codeload.github.com/mstilkerich/carddavclient/tar.gz/master | tar zxf -
+
+    cd carddavclient-master
+    composer install
+
+    cat <<EOF > tests/Interop/AccountData.php
+<?php
+
+declare(strict_types=1);
+namespace MStilkerich\Tests\CardDavClient\Interop;
+use MStilkerich\CardDavClient\Account;
+use MStilkerich\CardDavClient\AddressbookCollection;
+use MStilkerich\CardDavClient\Config;
+
+final class AccountData {
+    public const ACCOUNTS = [
+        "Davical" => [
+            "username"     => "user3",
+            "password"     => "user3",
+            "discoveryUri" => "http://regression",
+            "featureSet"   => TestInfrastructureSrv::SRVFEATS_DAVICAL,
+            "syncAllowExtraChanges" => false,
+        ],
+    ];
+
+    public const ADDRESSBOOKS = [
+        "Davical_0" => [
+            "account"     => "Davical",
+            "url"         => "http://regression/caldav.php/user3/addresses/",
+            "displayname" => "user3 addresses",
+            "description" => null,
+        ],
+    ];
+}
+EOF
+
+    mkdir -p testreports/interop
+fi

testing/normalise_result

@@ -62,5 +62,9 @@ while( <STDIN> ) {
     next;
   };
 
+  /^Request-ID: / && do {
+    $_ = "";
+  };
+
   print;
 }

testing/phpunit/ExpansionTest.php

@@ -5,6 +5,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '/usr/share/awl/inc' . PA
 require_once('RRule.php');
 require_once('vCalendar.php');
 
+use PHPUnit\Framework\Attributes\PreserveGlobalState;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 
 $c = (object) array();
@@ -143,6 +145,8 @@ final class ExpansionTest extends TestCase
     '20190124T000000Z/20190124T010000Z',
   ];
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testUnmodifiedCal() {
     global $base_cal;
 
@@ -152,6 +156,8 @@ final class ExpansionTest extends TestCase
     );
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testTueRenamed() {
     global $tuesday_renamed_cal;
 
@@ -161,6 +167,8 @@ final class ExpansionTest extends TestCase
     );
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testTueRenamedSwapped() {
     global $tuesday_renamed_cal_order_swapped;
 
@@ -170,6 +178,8 @@ final class ExpansionTest extends TestCase
     );
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testCalWithCount() {
     global $count_cal;
 

testing/phpunit/RangeTest.php

@@ -5,6 +5,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '/usr/share/awl/inc' . PA
 require_once('RRule.php');
 require_once('vCalendar.php');
 
+use PHPUnit\Framework\Attributes\PreserveGlobalState;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 
 $c = (object) array();
@@ -12,6 +14,8 @@ $c->rrule_loop_limit = 100;
 
 final class RangeTest extends TestCase
 {
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testGetVCalendarRange() {
     $cal = new vCalendar("BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -48,6 +52,8 @@ END:VCALENDAR");
     self::assertEquals("20190102T072000Z", (string) $range->until->UTC());
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testGetVCalendarRangeTwoDayAllDay() {
     $cal = new vCalendar("BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -70,6 +76,8 @@ END:VCALENDAR");
     self::assertEquals("20190109T200000Z", (string) $range->until->UTC());
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testGetVCalendarRangeFloating() {
     // When interpreted as being in Greece, this event crosses the daylight savings boundary!
     // TODO deal with how that affects all-day events...
@@ -94,6 +102,8 @@ END:VCALENDAR");
     self::assertEquals("20181210T130000Z", (string) $range->until->UTC());
   }
 
+  #[PreserveGlobalState('enabled')]
+  #[RunInSeparateProcess]
   public function testGetVCalendarRangeAllDayAcrossDST() {
     // When interpreted as being in Greece, this event crosses the daylight savings boundary!
 

testing/regression-conf.php.example

@@ -13,6 +13,8 @@
   $c->get_includes_subcollections = true;
   // helps with 1036-REPORT-sync-initial-bound
   $c->hide_TODO = false;
+  // enable test mode
+  $c->test_mode = true;
 
   // for ischedule suite; also needs DKIM set up?
   $c->enable_scheduling = true;
@@ -22,5 +24,50 @@
 
   // if testing memcache
   //memcache $c->memcache_servers[] = '127.0.0.1,11211';
-  //memcache $c->auth_cache = true;
+
+  // if testing LDAP
+  //ldap $c->authenticate_hook['call'] = 'LDAP_check';
+  //ldap $c->authenticate_hook['config'] = array(
+  //ldap   'host' => 'localhost',
+  //ldap   'port' => '21394',
+  //ldap   'protocolVersion' => 3,
+  //ldap   'baseDNUsers'     => 'ou=users,dc=example,dc=com',
+  //ldap   'baseDNGroups'    => 'ou=groups,dc=example,dc=com',
+  // Test with the old name, new name is "user_mapping_field".
+  //ldap   'mapping_field'   => array(
+  //ldap       "username" => "uid",
+  //ldap       "modified" => "modifyTimestamp",
+  //ldap       "fullname" => "cn",
+  //ldap       "email"    => "mail"
+  //ldap   ),
+  //ldap   'group_mapping_field' => array(
+  // Test with the old name, new name is "name""
+  //ldap       "username" => "cn",
+  //ldap       "modified" => "modifyTimestamp",
+  //ldap       "fullname" => "description",
+  //ldap       "members"  => "memberUid",
+  //ldap   ),
+  //ldap   'format_updated' => array(
+  //ldap       'Y' => array(0,4),
+  //ldap       'm' => array(4,2),
+  //ldap       'd' => array(6,2),
+  //ldap       'H' => array(8,2),
+  //ldap       'M' => array(10,2),
+  //ldap       'S' => array(12,2)
+  //ldap   )
+  //ldap );
+  //ldap
+  //ldap $c->do_not_sync_from_ldap = array ('pg_ldap_ignore1' => true);
+  //ldap $c->do_not_sync_group_from_ldap = array ('pg_ldap_group_ignore' => true);
+
+  //ldap include('drivers_ldap.php');
+
+  // The value of p is generated using:
+  //   openssl rsa -in tests/ischedule/key/private -pubout -outform der | | openssl base64 -A
+  $icfg = array(
+    'cal._domainkey.caldav' => 'v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArTRqr/W5wSlxDKthes0Bz2fIkukLOu0tNIbxO9GpsjgaE3juPnl9XlkMxvkGQ5k7NTy2yRIYDFqDzT150MiMLsIbOnXlOZVizlM8MXe65do6BNCnjNZRNj30pEHirhJsQf0eEc9+AY1qDbC2axqd1Nf8MNl0bJ58O0ZCPnzdDNxsWp16midWoj0uceonpg1qxp7kYD2CC5/WcrsBHc8Lt3y2N9X4pamAvd0fAfVXYrzLSVvmc1b09yEq3weT4R4Jiizjb7UPPZCyarDDOUKfjcBsPCJtBDv7al6easoCUvHviJKy48bmcFcgnyL1FfKVdIaKlyb3nLj9dFTFm/tdTQIDAQAB',
+  );
+
+  // Allow dynamic configuration of application by tests.
+  include 'regression-conf.php.dynamic.per-test';
 ?>

testing/run_regressions.sh

@@ -18,7 +18,7 @@ REPORTFILE=report.xml
 export PGTZ=Pacific/Auckland
 #export TZ=Pacific/Auckland
 
-ALLSUITES=${ALLSUITES:-"regression-suite binding carddav scheduling timezone"}
+ALLSUITES=${ALLSUITES:-"regression-suite binding carddav scheduling timezone webui"}
 
 # who wants meld if they can have xxdiff? Go on, override it in regression.conf
 MELD=meld
@@ -45,7 +45,6 @@ fi
 
 SUITE=${1:-"regression-suite"}
 ACCEPT_ALL=${2:-""}
-[ -z "${UNTIL}" ] && UNTIL=99999
 [ -z "${SUITE}" ] && SUITE="regression-suite"
 
 # psql ${PSQLOPTS} -l
@@ -69,8 +68,13 @@ check_result() {
        cat "${REGRESSION}/diffs/${TEST}"
        echo "======================================="
     fi
-    valid_answer=0
 
+    if [ -s "${REGRESSION}/results/${TEST}.request_id" ]; then
+      echo -e "\nLogging for the request(s) in this test will be in the Apache error log for\nthese request ID(s):\n"
+      cat "${REGRESSION}/results/${TEST}.request_id"
+    fi
+
+    valid_answer=0
     while [ $valid_answer -eq 0 ]; do
       if [ "${ACCEPT_ALL}" = "" ] ; then
         read -p "[${TEST}] Accept new result [e/s/r/v/f/m/x/y/w/N/q/?]? " ACCEPT
@@ -207,12 +211,15 @@ initialise_regression() {
   drop_database ${DBNAME}
 
   TEST="Create-Database"
-  ../dba/create-database.sh ${DBNAME} 'nimda' >"${RESULTS}/${TEST}" 2>&1
+  ../dba/create-database.sh ${DBNAME} 'nimda'  \
+    | sed -r 's/is version [.0-9]+/is version XX/' 2>&1 \
+    > "${RESULTS}/${TEST}"
   check_result "${TEST}"
 
   TEST="Upgrade-Database"
-  ../dba/update-davical-database ${DBAOPTS} --dbname=${DBNAME} --nopatch --appuser davical_app --owner davical_dba >"${RESULTS}/${TEST}" \
+  ../dba/update-davical-database ${DBAOPTS} --dbname=${DBNAME} --nopatch --appuser davical_app --owner davical_dba \
-    | sed -r 's/is version [.0-9]+/is version XX/'2>&1
+    | sed -r 's/is version [.0-9]+/is version XX/' 2>&1 \
+    > "${RESULTS}/${TEST}"
   check_result "${TEST}"
 
   if [ -f "${REGRESSION}/sample-data.sql" ]; then
@@ -247,15 +254,17 @@ run_regression_suite() {
     TEST="`basename ${T} .test`"
     TESTNUM="`echo ${TEST} | cut -f1 -d'-'`"
     TESTNUM="${TEST/-*}"
-    if [ "${TESTNUM}" -gt "${UNTIL}" ] ; then
-      break;
-    fi
 
     RESULT=999
     while [ "${RESULT}" -gt 0 ]; do
       ./dav_test --dsn "${DSN}" ${WEBHOST} ${ALTHOST} --suite "${SUITE}" --case "${TEST}" | ./normalise_result > "${RESULTS}/${TEST}"
       # Fix Vim syntax highlighting by putting an esac here.  Silly, huh?
 
+      if [ $? -ne 0 ]; then
+        echo "Test ${TEST} failed execute, aborting"
+        exit 0
+      fi
+
       RESULT=999
       SKIPDIFF=""
       while [ "${RESULT}" -gt 1 ]; do

testing/tests/binding/0999-MKTICKET.result

@@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8"
  </T:ticketdiscovery>
 </prop>
 
+SQL Query 1 Result:
      dav_owner_id: >1003<
        privileges: >000000000001001011100111<
 target_collection: >161<

testing/tests/binding/0999-MKTICKET.test

@@ -2,7 +2,6 @@
 # MKTICKET request for a ticket on a collection
 #
 TYPE=MKTICKET
-URL=http://regression.host/caldav.php/user2/home/
 HEADER=User-Agent: Ticket Spec Tests
 HEADER=Content-Type: text/xml; charset="UTF-8"
 AUTH=user2:user2
@@ -21,6 +20,12 @@ BEGINDATA
 </D:ticketinfo>
 ENDDATA
 
+REPLACE=!ETag: "\S+"!ETag: "Some good etag"!
+REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
+REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID!
+
+URL=http://regression.host/caldav.php/user2/home/
+
 QUERY
 SELECT dav_owner_id,
        (expires - current_timestamp)::interval(0) AS timeout,
@@ -29,7 +34,3 @@ SELECT dav_owner_id,
        target_resource_id
   FROM access_ticket
 ENDQUERY
-
-REPLACE=!ETag: "\S+"!ETag: "Some good etag"!
-REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
-REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID!

testing/tests/binding/1000-BIND.result

@@ -7,6 +7,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
+SQL Query 1 Result:
           bind_id: >1020<
   bound_source_id: >161<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<

testing/tests/binding/1000-BIND.test

@@ -3,7 +3,6 @@
 #     also applying a ticket during the bind
 #
 TYPE=BIND
-URL=http://regression.host/caldav.php/user4/
 AUTH=user4:user4
 
 # Get the ticket we created earlier in 999...
@@ -27,6 +26,8 @@ BEGINDATA
 </bind>
 ENDDATA
 
+URL=http://regression.host/caldav.php/user4/
+
 QUERY
 SELECT bind_id,
        bound_source_id,

testing/tests/binding/1001-BIND.result

@@ -2,13 +2,15 @@ HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 133
+Content-Length: 134
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <error xmlns="DAV:">
   <can-overwrite/>A resource already exists at the destination.
 </error>
+
+SQL Query 1 Result:
           bind_id: >1020<
   bound_source_id: >161<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<

testing/tests/binding/1001-BIND.test

@@ -3,7 +3,6 @@
 #     also applying a ticket during the bind
 #
 TYPE=BIND
-URL=http://regression.host/caldav.php/user4/
 AUTH=user4:user4
 
 # Get the ticket we created earlier in 999...
@@ -26,6 +25,8 @@ BEGINDATA
 </bind>
 ENDDATA
 
+URL=http://regression.host/caldav.php/user4/
+
 QUERY
 SELECT bind_id,
        bound_source_id,

testing/tests/binding/1004-PROPFIND-bound.result

@@ -119,3 +119,4 @@
   </propstat>
  </response>
 </multistatus>
+

testing/tests/binding/1004-PROPFIND-bound.test

@@ -2,7 +2,6 @@
 # PROPFIND on a collection which we have bound into user4's home
 #
 TYPE=PROPFIND
-URL=http://regression.host/caldav.php/user4/
 AUTH=user4:user4
 
 HEADER=User-Agent: BIND Spec Tests
@@ -24,3 +23,5 @@ ENDDATA
 #  <current-user-privilege-set/>
 
 REPLACE=_resources/\d+_resources/XX_
+
+URL=http://regression.host/caldav.php/user4/

testing/tests/binding/1005-PROPFIND-bound.result

@@ -261,3 +261,4 @@
   </propstat>
  </response>
 </multistatus>
+

testing/tests/binding/1005-PROPFIND-bound.test

@@ -2,7 +2,6 @@
 # PROPFIND on a collection which we have bound into user4's home
 #
 TYPE=PROPFIND
-URL=http://regression.host/caldav.php/user4/user2/
 AUTH=user4:user4
 
 HEADER=User-Agent: BIND Spec Tests
@@ -22,3 +21,4 @@ BEGINDATA
 </propfind>
 ENDDATA
 
+URL=http://regression.host/caldav.php/user4/user2/

testing/tests/binding/1006-REPORT-bound.result

@@ -141,3 +141,4 @@ END:VCALENDAR
   </propstat>
  </response>
 </multistatus>
+

testing/tests/binding/1006-REPORT-bound.test

@@ -2,7 +2,6 @@
 # Test multiget REPORT access to a bound calendar
 #
 TYPE=REPORT
-URL=http://regression.host/caldav.php/user4/user2/
 AUTH=user4:user4
 
 
@@ -24,3 +23,4 @@ BEGINDATA
 </calendar-multiget>
 ENDDATA
 
+URL=http://regression.host/caldav.php/user4/user2/