Merge branch 'master' of git+ssh://repo.or.cz/srv/git/davical

This commit is contained in:
Andrew McMillan 2011-03-02 16:02:33 +01:00
commit f1c8da702b
4 changed files with 33 additions and 30 deletions

View File

@ -1,5 +1,5 @@
<h1>iCal</h1>
<p><a href="http://www.apple.com/macosx/features/300.html#ical">iCal</a>, from version 3.0 (released with OS 10.5) is generally well-behaved
<p><a href="http://www.apple.com/macosx/what-is-macosx/mail-ical-address-book.html">iCal</a>, from version 3.0 (released with OS 10.5) is generally well-behaved
and will discover your own calendars when configured. It will not allow you to manipulate other calendars on
the same server, however, unless you use different credentials to access them.</p>

View File

@ -43,7 +43,7 @@ a page on the wiki which will sometimes have newer information.</p>
<h2>Getting Help</h2>
<p>Specifically: help on DAViCal!</p>
<p>The <em>best</em> place to go for help on DAViCal is the <a href="http://wiki.davical.org/">DAViCal Wiki</a>.</p>
<p>The <em>best</em> place to go for help on DAViCal is the <a href="http://wiki.davical.org/w/Main_Page">DAViCal Wiki</a>.</p>
<p>If you can't find your answer there, then the IRC channel #davical on <a href="irc://irc.oftc.net/#davical">irc.oftc.net</a> is
a great next port of call. Many problems can be solved quickly with a short on-line chat.</p>
<p>Almost as good as the IRC channel is the <a href="https://lists.sourceforge.net/mailman/listinfo/davical-general">DAViCal General Mailing List</a>.</p>
@ -60,7 +60,7 @@ through the author's company <a href="http://www.morphoss.com/products/davical/s
sending patches for things here and there. Some more notable contributors include:</p><ul>
<li>Maxime Delorme (CSS, LDAP, French translations)</li>
<li>Andrew Ruthven (Various enhancements)</li>
<li>Rob Ostenson (LDAP & Scheduling contributions)</li>
<li>Rob Ostenson (LDAP &amp; Scheduling contributions)</li>
<li>Leho Kraav (RSS feeds)</li>
</ul>
@ -78,13 +78,13 @@ Here are some things you could do that will help us to concentrate on making DAV
<li>designing future functionality</li>
<li>thinking of more interesting ways to contribute to DAViCal!</li>
<li>you could also <form style="display:inline;padding-top:1em;vertical-align:middle;" action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="cmd" value="_s-xclick" />
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
">
<input type="image" src="images/paypal_donate_button.png" border="0" name="submit" alt="Donate to DAViCal via PayPal">
" />
<input type="image" src="images/paypal_donate_button.png" name="submit" alt="Donate to DAViCal via PayPal" />
</form> something or
<a href="http://flattr.com/thing/118849/DAViCal" target="_blank">
<img src="images/flattr-badge-large.png" style="padding-bottom:0.2em;vertical-align:middle;" alt="Flattr this" title="Flattr this" border="0" /></a>
<img src="images/flattr-badge-large.png" style="padding-bottom:0.2em;vertical-align:middle;" alt="Flattr this" title="Flattr this" /></a>
since paid work is my biggest distraction from free software.</li>
</ul>

View File

@ -56,7 +56,7 @@ echo "source /usr/portage/local/layman/make.conf" &gt;&gt; /etc/make.conf
<h3>Slackware, BSD and the rest</h3>
<p>You will need to download the latest versions of the <code>DAViCal</code> and <code>awl</code> packages
from the <a href="http://sourceforge.net/project/showfiles.php?group_id=179845">sourceforge download page for DAViCal</a>.</p>
from the <a href="http://sourceforge.net/projects/davical/files/">sourceforge download page for DAViCal</a>.</p>
<p>You will need to untar these. Preferably you will untar them from within the "<code>/usr/share</code>" directory and everything
will be in it's expected location (well, except the docs, but it will at least be tidy and everything will be in one place).</p>

View File

@ -83,7 +83,7 @@ msgstr "- erstelle Eintrag für Benutzer: %s"
#, php-format
msgid "- deactivate groups : %s"
msgstr "- deaktiviere Guppen: %s"
msgstr "- deaktiviere Gruppen: %s"
#, php-format
msgid "- deactivating users : %s"
@ -91,7 +91,7 @@ msgstr "- deaktiviere Benutzer: %s"
#, php-format
msgid "- nothing done on : %s"
msgstr "- nichts verändert an : %s"
msgstr "- nichts verändert an: %s"
#, php-format
msgid "- removing %s from group : %s"
@ -134,7 +134,7 @@ msgstr ""
"und Passwort anmelden.</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 Rechtesammlung darf nur "
msgstr "Eine DAViCal-Prinzipalen-Sammlung dar nur andere Sammlungen enthalten"
msgid "A collection already exists at that location."
msgstr "Die Sammlung ist bereits vorhanden."
@ -158,7 +158,7 @@ msgid "Active"
msgstr "Aktiv"
msgid "Adding new member to this Group Principal"
msgstr "Füge neues Mitglied zu diesem Gruppenprinzipal hinzu"
msgstr "Füge neues Mitglied zu diesem Gruppenprinzipalen hinzu"
#. Translators: in the sense of 'systems admin'
msgid "Admin"
@ -228,7 +228,7 @@ msgid "Browse all users"
msgstr "Zeige alle Benutzer"
msgid "Busy"
msgstr "belegt"
msgstr "beschäftigt"
#, php-format
msgid "Calendar \"%s\" was loaded from file."
@ -379,7 +379,7 @@ msgid "Database Error"
msgstr "Datenbankfehler"
msgid "Database Host"
msgstr "Datenbankhost"
msgstr "Datenbankserver"
msgid "Database Name"
msgstr "Datenbankname"
@ -770,11 +770,14 @@ msgstr "PDO-PostgreSQL-Treiber"
msgid "PHP DateTime class"
msgstr ""
msgid "PHP LDAP module available"
msgstr ""
msgid "PHP Magic Quotes GPC off"
msgstr "PHP Magic Quotes GPC off"
msgstr "PHP Magic Quotes GPC deaktiviert"
msgid "PHP Magic Quotes runtime off"
msgstr "PHP Magic Quotes runtime off"
msgstr "PHP Magic Quotes runtime deaktiviert"
msgid "PHP PDO module available"
msgstr "PHP-PDO-Modul vorhanden"
@ -844,7 +847,7 @@ msgstr "Eigenschaft ist schreibgeschützt"
#. Translators: in the sense of being available to all users
msgid "Public"
msgstr "Public"
msgstr "Öffentlich"
msgid "Publicly Readable"
msgstr "Für alle lesbar"
@ -1230,10 +1233,10 @@ msgid "Updating grants by this Principal"
msgstr "Berechtigungen dieses Prinzipalen aktualisiert"
msgid "Upgrade DAViCal database schema"
msgstr "DAViCal-Datenbankschema erweitert"
msgstr "DAViCal-Datenbankschema aktualisieren"
msgid "Upgrade Database"
msgstr "Datenbank erweitert"
msgstr "Datenbank aktualisieren"
msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
msgstr ""
@ -1348,28 +1351,28 @@ msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-co
msgstr ""
msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
msgstr "drivers_ldap : TLS konnte nicht gestartet werden: ldap_start_tls() ist fehlgeschlagen"
msgstr "drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist fehlgeschlagen"
#, php-format
msgid "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"
msgstr "drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s ist fehlgeschlagen"
msgid "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"
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 and passDN, and that your "
"LDAP server is reachable"
msgstr ""
"drivers_ldap : Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, ob bindDN und passDN "
"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 port %s on host %s"
msgstr "drivers_ldap : LDAP-Verbindung zu Port %s auf Host %s fehlgeschlagen"
msgstr "drivers_ldap: LDAP-Verbindung zu Port %s auf Host %s fehlgeschlagen"
msgid "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"
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"
@ -1412,13 +1415,13 @@ msgstr "Melden Sie sich mit dem Ihnen zugesendeten Benutzernamen und Passwort an
#~ msgstr "Fehlgeschlagen"
#~ msgid "Group <!-- in the sense of a group of people -->"
#~ msgstr "Gruppe <!-- im Sinne einer Gruppe Menschen -->"
#~ msgstr "Gruppe"
#~ msgid "Id <!-- short for 'Identifier' -->"
#~ msgstr "Id <!-- Abkürzung für 'Identifier' -->"
#~ msgstr "Id"
#~ msgid "No <!-- not 'Yes' -->"
#~ msgstr "Nein <!-- nicht \"Ja\" -->"
#~ msgstr "Nein"
#~ msgid "No. <!-- short for 'Number' -->"
#~ msgstr "Nr."
@ -1444,13 +1447,13 @@ msgstr "Melden Sie sich mit dem Ihnen zugesendeten Benutzernamen und Passwort an
#~ msgstr "J-m-t H:i"
#~ msgid "You are currently running DAViCal version %s. The database schema is at version %d.%d.%d."
#~ msgstr "Die aktuell laufende DAViCal Version ist %s. Das Datenbankschema hat die Version %d.%d.%d"
#~ msgstr "Die aktuell laufende DAViCal-Version ist %s. Das Datenbankschema hat die Version %d.%d.%d"
#~ msgid ""
#~ "You are currently running DAViCal version %s. The database schema should be at version %s and it is "
#~ "at version %d.%d.%d."
#~ msgstr ""
#~ "Die aktuell laufende DAViCal Version ist %s. Das Datenbankschema sollte die Version %s haben, "
#~ "Die aktuell laufende DAViCal-Version ist %s. Das Datenbankschema sollte die Version %s haben, "
#~ "aktuelle Version: %d.%d.%d"
#~ msgid ""