retitle 389442 diffs for 0.0.20060309-5.{1,2} NMU
Hi,
Attached is the diff for my dokuwiki 0.0.20060309-5.2 NMU.
--
adn
Mohammed Adnène Trojette
diff -u dokuwiki-0.0.20060309/debian/po/templates.pot
dokuwiki-0.0.20060309/debian/po/templates.pot
--- dokuwiki-0.0.20060309/debian/po/templates.pot
+++ dokuwiki-0.0.20060309/debian/po/templates.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -25,29 +25,16 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:1001
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Allow access from:"
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
msgstr ""
#. Type: select
#. Description
#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
+msgid "Authorized network:"
msgstr ""
#. Type: select
@@ -108,9 +95,8 @@
#. Description
#: ../templates:3001
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
#. Type: string
diff -u dokuwiki-0.0.20060309/debian/po/de.po
dokuwiki-0.0.20060309/debian/po/de.po
--- dokuwiki-0.0.20060309/debian/po/de.po
+++ dokuwiki-0.0.20060309/debian/po/de.po
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: dokuwiki_0.0.20050922-4_de\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
"PO-Revision-Date: 2006-01-08 22:25+0100\n"
"Last-Translator: Erik Schanze <[EMAIL PROTECTED]>\n"
"Language-Team: German <[EMAIL PROTECTED]>\n"
@@ -33,17 +33,11 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "Wo soll der Web-Zugang für DokuWiki angelegt werden?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
+#, fuzzy
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
msgstr ""
"Dieses Verzeichnis Ihrer Web-Seite wird als Zugang zu DokuWiki benutzt. "
"Standardmäßig ist das http://IhrServer/dokuwiki, aber Sie können das für "
@@ -52,14 +46,9 @@
#. Type: select
#. Description
#: ../templates:2001
-msgid "Allow access from:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Wer soll Zugang zu DokuWiki haben?"
+#, fuzzy
+msgid "Authorized network:"
+msgstr "Lokales Netzwerk"
#. Type: select
#. Description
@@ -134,10 +123,10 @@
#. Type: string
#. Description
#: ../templates:3001
+#, fuzzy
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
"Wie wird Ihr lokales Netzwerk beschrieben? Die Angabe sollte eine IP-"
"Netzwerkadresse im CIDR-Format (x.x.x.x/y) oder ein Domänen-Name (wie "
@@ -222,6 +211,12 @@
msgid "apache-perl"
msgstr ""
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "Wo soll der Web-Zugang für DokuWiki angelegt werden?"
+
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Wer soll Zugang zu DokuWiki haben?"
+
#~ msgid "localhost only, local network, global"
#~ msgstr "nur lokaler Rechner, lokales Netzwerk, global"
diff -u dokuwiki-0.0.20060309/debian/po/cs.po
dokuwiki-0.0.20060309/debian/po/cs.po
--- dokuwiki-0.0.20060309/debian/po/cs.po
+++ dokuwiki-0.0.20060309/debian/po/cs.po
@@ -15,8 +15,8 @@
msgstr ""
"Project-Id-Version: dokuwiki\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
-"PO-Revision-Date: 2006-09-24 17:03+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
+"PO-Revision-Date: 2006-10-02 19:21+0200\n"
"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
"Language-Team: Czech <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
@@ -32,34 +32,20 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "Kde se bude nacházet web DokuWiki?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
-msgstr ""
-"Jedná se o adresář na vašem webu, který budou uživatelé používat pro přístup "
-"k DokuWiki. Implicitně to je http://vas-server/dokuwiki, ale můžete si "
-"zvolit vlastní umístění. Zadejte pouze část s adresářovou cestou (bez jména "
-"serveru)."
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Allow access from:"
-msgstr "Povolit přístup z:"
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
+msgstr ""
+"DokuWiki bude přístupná skrze adresář na vašem webu. Implicitně to je "
+"http://vas-server/dokuwiki, ale můžete si zvolit vlastní umístění. "
+"Zadejte pouze část s adresářovou cestou (bez jména serveru)."
#. Type: select
#. Description
#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Kdo má mít přístup k DokuWiki?"
+msgid "Authorized network:"
+msgstr "Autorizovaná síť:"
#. Type: select
#. Description
@@ -106,36 +92,34 @@
#. Choices
#: ../templates:2002
msgid "localhost only"
-msgstr ""
+msgstr "pouze tento počítač"
#. Type: select
#. Choices
#: ../templates:2002
-#, fuzzy
msgid "local network"
-msgstr "Lokální síť:"
+msgstr "místní síť"
#. Type: select
#. Choices
#: ../templates:2002
msgid "global"
-msgstr ""
+msgstr "kdokoliv"
#. Type: string
#. Description
#: ../templates:3001
msgid "Local network:"
-msgstr "Lokální síť:"
+msgstr "Místní síť:"
#. Type: string
#. Description
#: ../templates:3001
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
-"Jak je definována vaše lokální síť? Můžete ji zadat jako rozsah IP adres v "
+"Jak je definována vaše místní síť? Můžete ji zadat jako rozsah IP adres v "
"CIDR tvaru (x.x.x.x/y) nebo jako doménu (třeba *.mojedomena.cz)."
#. Type: string
@@ -195,37 +179,34 @@
#. Choices
#: ../templates:5002
msgid "apache"
-msgstr ""
+msgstr "apache"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache2"
-msgstr ""
+msgstr "apache2"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-ssl"
-msgstr ""
+msgstr "apache-ssl"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-perl"
-msgstr ""
-
-#~ msgid "localhost only, local network, global"
-#~ msgstr "pouze tento počítač, místní síť, kdokoliv"
+msgstr "apache-perl"
-#~ msgid "/dokuwiki"
-#~ msgstr "/dokuwiki"
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "Kde se bude nacházet web DokuWiki?"
-#~ msgid "10.0.0.0/24"
-#~ msgstr "10.0.0.0/24"
+#~ msgid "Allow access from:"
+#~ msgstr "Povolit přístup z:"
-#~ msgid "apache, apache2, apache-ssl, apache-perl"
-#~ msgstr "apache, apache2, apache-ssl, apache-perl"
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Kdo má mít přístup k DokuWiki?"
#~ msgid "Which web servers do you want to install into?"
#~ msgstr "Na které servery chcete DokuWiki nainstalovat?"
diff -u dokuwiki-0.0.20060309/debian/po/es.po
dokuwiki-0.0.20060309/debian/po/es.po
--- dokuwiki-0.0.20060309/debian/po/es.po
+++ dokuwiki-0.0.20060309/debian/po/es.po
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: dokuwiki\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
"PO-Revision-Date: 2005-10-17 16:15+0100\n"
"Last-Translator: César Gómez Martín <[EMAIL PROTECTED]>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -47,17 +47,11 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "¿Donde debería estar instalado DokuWiki para ser accesible vía web?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
+#, fuzzy
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
msgstr ""
"Este es el directorio de su sitio web que la gente debe usar para acceder a "
"Dokuwiki. Por omisión la dirección es http://yourserver/dokuwiki, pero puede "
@@ -67,14 +61,9 @@
#. Type: select
#. Description
#: ../templates:2001
-msgid "Allow access from:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "¿Quién debe ser capaz de acceder a su Dokuwiki?"
+#, fuzzy
+msgid "Authorized network:"
+msgstr "Red local"
#. Type: select
#. Description
@@ -149,10 +138,10 @@
#. Type: string
#. Description
#: ../templates:3001
+#, fuzzy
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
"¿Qué define la red local?. La especificación debe ser, o una red IP en "
"formato CIDR (x.x.x.x/y) o una especificación de dominio (como .mydomain."
@@ -237,6 +226,12 @@
msgid "apache-perl"
msgstr ""
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "¿Donde debería estar instalado DokuWiki para ser accesible vía web?"
+
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "¿Quién debe ser capaz de acceder a su Dokuwiki?"
+
#~ msgid "localhost only, local network, global"
#~ msgstr "sólo en local, red local, global"
diff -u dokuwiki-0.0.20060309/debian/po/fi.po
dokuwiki-0.0.20060309/debian/po/fi.po
--- dokuwiki-0.0.20060309/debian/po/fi.po
+++ dokuwiki-0.0.20060309/debian/po/fi.po
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: dokuwiki-20050218\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
"PO-Revision-Date: 2005-06-14 01:28+0300\n"
"Last-Translator: Matti Pöllä <[EMAIL PROTECTED]>\n"
"Language-Team: Finnish <[EMAIL PROTECTED]>\n"
@@ -32,17 +32,11 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "Mikä tulisi olla DokuWikin osoite?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
+#, fuzzy
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
msgstr ""
"Tämä on hakemisto, jota käytetään DokuWiki:in pääsemiseen webistä käsin. "
"Oletuksena käytetään osoitetta http://palvelimesi/dokuwiki, mutta voit "
@@ -52,14 +46,9 @@
#. Type: select
#. Description
#: ../templates:2001
-msgid "Allow access from:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Kenellä tulee olla pääsy DokuWiki:in?"
+#, fuzzy
+msgid "Authorized network:"
+msgstr "Paikallisverkko"
#. Type: select
#. Description
@@ -130,10 +119,10 @@
#. Type: string
#. Description
#: ../templates:3001
+#, fuzzy
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
"Mikä on paikallisverkkosi? Verkko tulee määritellä joko IP-osoitteena\n"
"CIRD-muodossa (x.x.x.x/y) tai domain-nimen avulla\n"
@@ -218,6 +207,12 @@
msgid "apache-perl"
msgstr ""
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "Mikä tulisi olla DokuWikin osoite?"
+
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Kenellä tulee olla pääsy DokuWiki:in?"
+
#~ msgid "localhost only, local network, global"
#~ msgstr "vain tämä kone, paikallisverkko, ei rajoituksia"
diff -u dokuwiki-0.0.20060309/debian/po/fr.po
dokuwiki-0.0.20060309/debian/po/fr.po
--- dokuwiki-0.0.20060309/debian/po/fr.po
+++ dokuwiki-0.0.20060309/debian/po/fr.po
@@ -18,8 +18,8 @@
msgstr ""
"Project-Id-Version: dokuwiki_0.0.20060309-5\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
-"PO-Revision-Date: 2006-06-17 13:12+0100\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
+"PO-Revision-Date: 2006-10-02 21:05+0100\n"
"Last-Translator: Steve Petruzzello <[EMAIL PROTECTED]>\n"
"Language-Team: french <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -39,33 +39,20 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "Veuillez indiquer ��le r�pertoire web�� o� installer dokuwiki."
-
-#. Type: string
-#. Description
-#: ../templates:1001
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
-msgstr ""
-"Il s'agit du r�pertoire du site web o� DokuWiki sera accessible. La valeur "
-"par d�faut est http://votreserveur/dokuwiki, mais elle est modifiable � "
-"volont�. Veuillez n'indiquer que la partie r�pertoire."
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
+msgstr ""
+"DokuWiki sera accessible via un r�pertoire de votre site web. La valeur par "
+"d�faut est ��http://votreserveur/dokuwiki��, mais elle est modifiable �
volont�. "
+"Veuillez n'indiquer que la partie r�pertoire."
#. Type: select
#. Description
#: ../templates:2001
-msgid "Allow access from:"
-msgstr "Autorisations d'acc�s�:"
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Veuillez indiquer qui pourra acc�der � DokuWiki."
+msgid "Authorized network:"
+msgstr "R�seau autoris��:"
#. Type: select
#. Description
@@ -92,8 +79,9 @@
"Wiki."
msgstr ""
"Le choix ��H�te local seul�� restreint la connexion aux utilisateurs locaux. "
-"��R�seau local�� permet la connexion aux personnes du r�seau local et ��Sans "
-"restriction�� permet � tout le monde de se connecter."
+"��R�seau local�� permet la connexion aux personnes du r�seau local (qu'il "
+"vous incombe de sp�cifier) et ��Sans restriction�� permet � tout le monde de "
+"se connecter."
#. Type: select
#. Description
@@ -111,20 +99,19 @@
#. Choices
#: ../templates:2002
msgid "localhost only"
-msgstr ""
+msgstr "H�te local seulement"
#. Type: select
#. Choices
#: ../templates:2002
-#, fuzzy
msgid "local network"
-msgstr "R�seau local�:"
+msgstr "R�seau local"
#. Type: select
#. Choices
#: ../templates:2002
msgid "global"
-msgstr ""
+msgstr "Global"
#. Type: string
#. Description
@@ -136,12 +123,11 @@
#. Description
#: ../templates:3001
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
"Veuillez indiquer quel est votre r�seau local. Vous pouvez l'indiquer soit "
-"avec le format CIDR (x.x.x.x/y), ou soit sous forme de domaine (tel que "
+"avec le format CIDR (x.x.x.x/y), soit sous forme de domaine (tel que "
"��mondomaine.com��)."
#. Type: string
@@ -161,7 +147,6 @@
#. Type: boolean
#. Description
#: ../templates:4001
-#, fuzzy
msgid ""
"By default, DokuWiki stores all its pages in a file database in /var/lib/"
"dokuwiki."
@@ -201,25 +186,34 @@
#. Choices
#: ../templates:5002
msgid "apache"
-msgstr ""
+msgstr "Apache"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache2"
-msgstr ""
+msgstr "Apache2"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-ssl"
-msgstr ""
+msgstr "Apache-ssl"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-perl"
-msgstr ""
+msgstr "Apache-perl"
+
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "Veuillez indiquer ��le r�pertoire web�� o� installer dokuwiki."
+
+#~ msgid "Allow access from:"
+#~ msgstr "Autorisations d'acc�s�:"
+
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Veuillez indiquer qui pourra acc�der � DokuWiki."
#~ msgid "localhost only, local network, global"
#~ msgstr "H�te local seul, R�seau local, Sans restriction"
diff -u dokuwiki-0.0.20060309/debian/po/sv.po
dokuwiki-0.0.20060309/debian/po/sv.po
--- dokuwiki-0.0.20060309/debian/po/sv.po
+++ dokuwiki-0.0.20060309/debian/po/sv.po
@@ -15,8 +15,8 @@
msgstr ""
"Project-Id-Version: dokuwiki 0.0.20050922-4\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
-"PO-Revision-Date: 2006-05-02 22:54+0100\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
+"PO-Revision-Date: 2006-10-02 16:22+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
@@ -27,215 +27,142 @@
#. Description
#: ../templates:1001
msgid "Wiki location:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr "Var ska den via webben �tkomliga platsen f�r DokuWiki vara?"
+msgstr "Wiki-plats:"
#. Type: string
#. Description
#: ../templates:1001
-msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
-msgstr ""
-"Detta �r katalogen p� din webbplats som folk ska anv�nda f�r att komma �t "
-"DokuWiki. Som standard �r detta http://dinserver/dokuwiki men du kan �ndra "
-"det till var du �nskar inom din server. Ange endast katalogdelen nedan."
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Allow access from:"
-msgstr ""
+msgid "DokuWiki will be accessible through a directory of your website. By
default, this is http://yourserver/dokuwiki, but you can change it to be
anything within your server. Enter just the directory portion below."
+msgstr "DokuWiki kommer att vara �tkomlig genom en katalog p� ditt webbplats.
Som standard �r detta http://dinserver/dokuwiki men du kan �ndra det till var
du �nskar inom din server. Ange endast katalogdelen nedan."
#. Type: select
#. Description
#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Vem ska kunna komma �t din DokuWiki?"
+msgid "Authorized network:"
+msgstr "Beh�rigt n�tverk:"
#. Type: select
#. Description
#: ../templates:2001
-msgid ""
-"A Wiki is normally used to provide unlimited access to information, which "
-"can be freely modified by anyone. Since this is not always wanted, it is "
-"possible to restrict access to the site on the basis of the originating IP "
-"address."
-msgstr ""
-"En Wiki anv�nds normalt f�r att tillhandah�lla obegr�nsad �tkomst till "
-"information, vilken kan helt fritt �ndras av vem som helst. Eftersom det "
-"ibland inte �r vad alla vill �r det m�jligt att begr�nsa �tkomst till "
-"webbplatsen baserat p� klientens IP-adress."
+msgid "A Wiki is normally used to provide unlimited access to information,
which can be freely modified by anyone. Since this is not always wanted, it
is possible to restrict access to the site on the basis of the originating IP
address."
+msgstr "En wiki anv�nds vanligtvis f�r att tillhandah�lla obegr�nsad �tkomst
till information, vilken kan helt fritt �ndras av vem som helst. Eftersom det
ibland inte �r vad alla vill �r det m�jligt att begr�nsa �tkomsten till
webbplatsen baserat p� klientens IP-adress."
#. Type: select
#. Description
#: ../templates:2001
-msgid ""
-"If you select 'localhost only', only people on the localhost (the machine "
-"the Wiki is running on) will be able to connect. 'local network' will allow "
-"people on machines in a local network (which you will need to specify) to "
-"talk to the Wiki. 'global' will allow anyone, any where, to connect to the "
-"Wiki."
-msgstr ""
-"Om du v�ljer \"endast localhost\" kan endast folk p� lokala v�rdsystemet "
-"(maskinen som Wiki k�rs p�) att kunna ansluta. Valet \"lokalt n�tverk\" "
-"till�ter folk p� maskiner i det lokala n�tverket (vilket du beh�ver "
-"specificera) att prata med Wikin. Valet \"globalt\" till�ter alla, var som "
-"helst, att ansluta till Wikin."
+msgid "If you select 'localhost only', only people on the localhost (the
machine the Wiki is running on) will be able to connect. 'local network' will
allow people on machines in a local network (which you will need to specify) to
talk to the Wiki. 'global' will allow anyone, any where, to connect to the
Wiki."
+msgstr "Om du v�ljer \"endast localhost\" kommer endast personer p� lokala
v�rdsystemet (maskinen som wiki k�r p�) att kunna ansluta till den.
Alternativet \"lokalt n�tverk\" till�ter personer p� maskiner i det lokala
n�tverket (vilket du beh�ver ange) att prata med wikin. Alternativet
\"globalt\" till�ter alla, var som helst, att ansluta till wikin."
#. Type: select
#. Description
#: ../templates:2001
-msgid ""
-"For security, this is set to 'localhost only' by default. Unless you have a "
-"particular need for privacy on your Wiki, you should be able to allow access "
-"globally without compromising site security."
-msgstr ""
-"Av s�kerhetssk�l �r denna satt till \"endast localhost\" som standard. Om "
-"du inte har speciella integritetskrav f�r din Wiki b�r du kunna till�ta "
-"globala klient utan att inskr�nka p� systemets s�kerhet."
+msgid "For security, this is set to 'localhost only' by default. Unless you
have a particular need for privacy on your Wiki, you should be able to allow
access globally without compromising site security."
+msgstr "Av s�kerhetssk�l �r detta alternativ inst�llt till \"endast
localhost\" som standard. Om du inte har speciella integritetskrav f�r din
Wiki b�r du kunna till�ta globala klienter utan att inskr�nka p� systemets
s�kerhet."
#. Type: select
#. Choices
#: ../templates:2002
msgid "localhost only"
-msgstr ""
+msgstr "endast localhost"
#. Type: select
#. Choices
#: ../templates:2002
-#, fuzzy
msgid "local network"
-msgstr "Lokalt n�tverk"
+msgstr "lokalt n�tverk"
#. Type: select
#. Choices
#: ../templates:2002
msgid "global"
-msgstr ""
+msgstr "global"
#. Type: string
#. Description
#: ../templates:3001
-#, fuzzy
msgid "Local network:"
-msgstr "Lokalt n�tverk"
+msgstr "Lokalt n�tverk:"
#. Type: string
#. Description
#: ../templates:3001
-msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
-msgstr ""
-"Vad definierar du som ditt lokala n�tverk? Specifikationen b�r antingen "
-"vara ett IP-n�tverk i CIDR-format (x.x.x.x/y) eller en dom�nspecifikation "
-"(s�som .mindomain.se)."
+msgid "The specification of your local network should either be an IP network
in CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
+msgstr "Specifikationen av ditt lokala n�tverk b�r antingen vara ett
IP-n�tverk i CIDR-format (x.x.x.x/y) eller en dom�nspecifikation (s�som
.mindom�n.se)."
#. Type: string
#. Description
#: ../templates:3001
-msgid ""
-"Anyone who matches the specification given below will be given full and "
-"complete access to the DokuWiki."
-msgstr ""
-"Alla som matchar specifikationen som anges nedan kommer att ges komplett "
-"tillg�ng till DokuWikin."
+msgid "Anyone who matches the specification given below will be given full and
complete access to the DokuWiki."
+msgstr "Alla som matchar specifikationen som anges nedan kommer att ges
fullst�ndig tillg�ng till DokuWiki:n."
#. Type: boolean
#. Description
#: ../templates:4001
-#, fuzzy
msgid "Purge pages on package removal?"
-msgstr "Rensa ut sidor vid avinstallation?"
+msgstr "Rensa ut sidor n�r paketet tas bort?"
#. Type: boolean
#. Description
#: ../templates:4001
-#, fuzzy
-msgid ""
-"By default, DokuWiki stores all its pages in a file database in /var/lib/"
-"dokuwiki."
-msgstr ""
-"Som standard lagrar DokuWiki alla sina sidor i en fildatabas i /var/lib/"
-"dokuwiki. Vill du att DokuWiki ska ta bort alla databasfiler n�r du tar "
-"bort paketet?"
+msgid "By default, DokuWiki stores all its pages in a file database in
/var/lib/dokuwiki."
+msgstr "Som standard lagrar DokuWiki alla sina sidor i en fildatabas i
/var/lib/dokuwiki."
#. Type: boolean
#. Description
#: ../templates:4001
-msgid ""
-"Accepting this option will leave you with a tidier system when the DokuWiki "
-"package is removed, but may cause information loss if you have an "
-"operational Wiki that gets removed."
-msgstr ""
-"Acceptera denna inst�llning och d� f�r en mindre system n�r DokuWiki-paketet "
-"�r borttaget men kan orsaka att information g�r f�rlorad om du har en "
-"operationell Wiki som blir borttagen."
+msgid "Accepting this option will leave you with a tidier system when the
DokuWiki package is removed, but may cause information loss if you have an
operational Wiki that gets removed."
+msgstr "Acceptera detta alternativ och du f�r ett mindre system n�r
DokuWiki-paketet �r borttaget men kan orsaka att information g�r f�rlorad om du
har en operativ Wiki som blir borttagen."
#. Type: multiselect
#. Description
#: ../templates:5001
msgid "Web servers:"
-msgstr ""
+msgstr "Webbservrar:"
#. Type: multiselect
#. Description
#: ../templates:5001
-msgid ""
-"DokuWiki can be used with any of the given web servers. Select the servers "
-"which you would like DokuWiki to be installed into."
-msgstr ""
-"DokuWiki kan anv�ndas med n�gon av angivna webbservrar. V�lj de servrar som "
-"du vill att DokuWiki ska installeras till."
+msgid "DokuWiki can be used with any of the given web servers. Select the
servers which you would like DokuWiki to be installed into."
+msgstr "DokuWiki kan anv�ndas med alla de angivna webbservrarna. V�lj de
servrar som du vill att DokuWiki ska installeras i."
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache"
-msgstr ""
+msgstr "apache"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache2"
-msgstr ""
+msgstr "apache2"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-ssl"
-msgstr ""
+msgstr "apache-ssl"
#. Type: multiselect
#. Choices
#: ../templates:5002
msgid "apache-perl"
-msgstr ""
+msgstr "apache-perl"
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr "Var ska den via webben �tkomliga platsen f�r DokuWiki vara?"
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Vem ska kunna komma �t din DokuWiki?"
#~ msgid "localhost only, local network, global"
#~ msgstr "endast localhost, lokalt n�tverk, globalt"
-
#~ msgid "/dokuwiki"
#~ msgstr "/dokuwiki"
-
#~ msgid "10.0.0.0/24"
#~ msgstr "10.0.0.0/24"
-
#~ msgid "Which web servers do you want to install into?"
#~ msgstr "Vilka webbservrar vill du att DokuWiki ska installeras i?"
-
#~ msgid "apache, apache2, apache-ssl, apache-perl"
#~ msgstr "apache, apache2, apache-ssl, apache-perl"
-
#~ msgid ""
#~ "DokuWiki can install into any of the given web servers. All those you "
#~ "specify will have a default config line added to them to install a "
@@ -247,0 +175 @@
+
diff -u dokuwiki-0.0.20060309/debian/po/vi.po
dokuwiki-0.0.20060309/debian/po/vi.po
--- dokuwiki-0.0.20060309/debian/po/vi.po
+++ dokuwiki-0.0.20060309/debian/po/vi.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: dokuwiki 0.0.20050701-8\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-09-25 18:31+0200\n"
+"POT-Creation-Date: 2006-10-02 14:32+0200\n"
"PO-Revision-Date: 2005-06-02 14:23+0930\n"
"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
@@ -24,18 +24,11 @@
#. Type: string
#. Description
#: ../templates:1001
-msgid "Where should the web-accessible location of the DokuWiki be?"
-msgstr ""
-"Cần một địa điểm có thể truy cập qua Mạng cho DokuWiki này: nó sẽ ở đâu vậy?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
+#, fuzzy
msgid ""
-"This is the directory off your website that people should use to access the "
-"DokuWiki. By default, this is http://yourserver/dokuwiki, but you can "
-"change it to be anything within your server. Enter just the directory "
-"portion below."
+"DokuWiki will be accessible through a directory of your website. By default, "
+"this is http://yourserver/dokuwiki, but you can change it to be anything "
+"within your server. Enter just the directory portion below."
msgstr ""
"Ở đây hãy gõ thư mục các người dùng sẽ dùng để truy cập DokuWiki này: một "
"thư mục dưới bộ trang Mạng của bạn. Mặc định là:\n"
@@ -46,14 +39,9 @@
#. Type: select
#. Description
#: ../templates:2001
-msgid "Allow access from:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2001
-msgid "Who should be able to access your DokuWiki?"
-msgstr "Bạn cho phép ai truy cập DokuWiki này?"
+#, fuzzy
+msgid "Authorized network:"
+msgstr "mạng địa phương"
#. Type: select
#. Description
@@ -132,10 +120,10 @@
#. Type: string
#. Description
#: ../templates:3001
+#, fuzzy
msgid ""
-"What is defined as your local network? The specification should either be "
-"an IP network in CIDR format (x.x.x.x/y) or a domain specification (like ."
-"mydomain.com)."
+"The specification of your local network should either be an IP network in "
+"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)."
msgstr ""
"mạng địa phương của bạn là gì? Để ghi rõ nó thì hãy nhập mạng IP dạng CIDR "
"(x.x.x.x/y) hoặc mạng dạng miền (v.d. miền_tôi.com)."
@@ -219,6 +207,14 @@
msgid "apache-perl"
msgstr ""
+#~ msgid "Where should the web-accessible location of the DokuWiki be?"
+#~ msgstr ""
+#~ "Cần một địa điểm có thể truy cập qua Mạng cho DokuWiki này: nó sẽ ở đâu "
+#~ "vậy?"
+
+#~ msgid "Who should be able to access your DokuWiki?"
+#~ msgstr "Bạn cho phép ai truy cập DokuWiki này?"
+
#~ msgid "localhost only, local network, global"
#~ msgstr "chỉ máy địa phương, mạng địa phương, toàn cục"
diff -u dokuwiki-0.0.20060309/debian/changelog
dokuwiki-0.0.20060309/debian/changelog
--- dokuwiki-0.0.20060309/debian/changelog
+++ dokuwiki-0.0.20060309/debian/changelog
@@ -1,3 +1,17 @@
+dokuwiki (0.0.20060309-5.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Refresh new_upstream_2006-03-09d into new_upstream_2006-03-09e.
+ (Closes: #391291)
+ * Correct templates:
+ + patch from Thomas Huriaux.
+ * Debconf Translations updates:
+ + Czech, thanks to Miroslav Kure.
+ + Swedish, thanks to Daniel Nylander.
+ + French, thanks to Steve Petruzzello.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Thu, 12 Oct 2006 11:37:10
+0200
+
dokuwiki (0.0.20060309-5.1) unstable; urgency=high
* Non-maintainer upload.
diff -u dokuwiki-0.0.20060309/debian/patches/00list
dokuwiki-0.0.20060309/debian/patches/00list
--- dokuwiki-0.0.20060309/debian/patches/00list
+++ dokuwiki-0.0.20060309/debian/patches/00list
@@ -1,4 +1,4 @@
-new_upstream_2006-03-09d.dpatch
+new_upstream_2006-03-09e.dpatch
debianize.dpatch
removeextrabuttonz.dpatch
removeccreferences.dpatch
reverted:
--- dokuwiki-0.0.20060309/debian/patches/new_upstream_2006-03-09d.dpatch
+++ dokuwiki-0.0.20060309.orig/debian/patches/new_upstream_2006-03-09d.dpatch
@@ -1,135 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## new_upstream_2006-03-09d.dpatch by Mohammed Adnène Trojette <[EMAIL
PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New upstream release 2006-03-09d
-
[EMAIL PROTECTED]@
-
-diff -urNb dokuwiki-2006-03-09/bin/dwpage.php
dokuwiki-2006-03-09d/bin/dwpage.php
---- dokuwiki-2006-03-09/bin/dwpage.php 2006-03-09 21:32:34.000000000 +0100
-+++ dokuwiki-2006-03-09d/bin/dwpage.php 2006-09-13 20:46:22.000000000
+0200
-@@ -1,6 +1,7 @@
- #!/usr/bin/php -d short_open_tag=on
- <?php
-
#------------------------------------------------------------------------------
-+if ('cli' != php_sapi_name()) die();
- if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
- require_once DOKU_INC.'inc/init.php';
- require_once DOKU_INC.'inc/common.php';
-diff -urNb dokuwiki-2006-03-09/bin/.htaccess dokuwiki-2006-03-09d/bin/.htaccess
---- dokuwiki-2006-03-09/bin/.htaccess 1970-01-01 01:00:00.000000000 +0100
-+++ dokuwiki-2006-03-09d/bin/.htaccess 2006-09-08 09:23:57.000000000 +0200
-@@ -0,0 +1,2 @@
-+order allow,deny
-+deny from all
-diff -urNb dokuwiki-2006-03-09/bin/indexer.php
dokuwiki-2006-03-09d/bin/indexer.php
---- dokuwiki-2006-03-09/bin/indexer.php 2006-03-09 21:32:34.000000000
+0100
-+++ dokuwiki-2006-03-09d/bin/indexer.php 2006-09-13 20:46:29.000000000
+0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/php
- <?php
--
-+if ('cli' != php_sapi_name()) die();
- if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
- require_once(DOKU_INC.'inc/init.php');
- require_once(DOKU_INC.'inc/common.php');
-diff -urNb dokuwiki-2006-03-09/bin/wantedpages.php
dokuwiki-2006-03-09d/bin/wantedpages.php
---- dokuwiki-2006-03-09/bin/wantedpages.php 2006-03-09 21:32:34.000000000
+0100
-+++ dokuwiki-2006-03-09d/bin/wantedpages.php 2006-09-13 20:46:38.000000000
+0200
-@@ -1,6 +1,7 @@
- #!/usr/bin/php -d short_open_tag=on
- <?php
-
#------------------------------------------------------------------------------
-+if ('cli' != php_sapi_name()) die();
- ini_set('memory_limit','128M');
- if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
- require_once DOKU_INC.'inc/init.php';
-diff -urNb dokuwiki-2006-03-09/inc/actions.php
dokuwiki-2006-03-09d/inc/actions.php
---- dokuwiki-2006-03-09/inc/actions.php 2006-03-09 21:32:34.000000000
+0100
-+++ dokuwiki-2006-03-09d/inc/actions.php 2006-06-06 20:07:01.000000000
+0200
-@@ -98,6 +98,9 @@
- */
- }
-
-+ // check permissions again - the action may have changed
-+ $ACT = act_permcheck($ACT);
-+
- //call template FIXME: all needed vars available?
- header('Content-Type: text/html; charset=utf-8');
- include(template('main.php'));
-diff -urNb dokuwiki-2006-03-09/inc/auth.php dokuwiki-2006-03-09d/inc/auth.php
---- dokuwiki-2006-03-09/inc/auth.php 2006-03-09 21:32:34.000000000 +0100
-+++ dokuwiki-2006-03-09d/inc/auth.php 2006-06-04 20:10:16.000000000 +0200
-@@ -452,8 +452,8 @@
- $_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
- $_POST['login'] = cleanID($_POST['login']);
- //clean fullname and email
-- $_POST['fullname'] = trim(str_replace(':','',$_POST['fullname']));
-- $_POST['email'] = trim(str_replace(':','',$_POST['email']));
-+ $_POST['fullname'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['fullname']));
-+ $_POST['email'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['email']));
-
- if( empty($_POST['login']) ||
- empty($_POST['fullname']) ||
-@@ -527,8 +527,8 @@
- }
-
- //clean fullname and email
-- $_POST['fullname'] = trim(str_replace(':','',$_POST['fullname']));
-- $_POST['email'] = trim(str_replace(':','',$_POST['email']));
-+ $_POST['fullname'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['fullname']));
-+ $_POST['email'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['email']));
-
- if (empty($_POST['fullname']) || empty($_POST['email'])) {
- msg($lang['profnoempty'],-1);
-diff -urNb dokuwiki-2006-03-09/inc/.htaccess dokuwiki-2006-03-09d/inc/.htaccess
---- dokuwiki-2006-03-09/inc/.htaccess 1970-01-01 01:00:00.000000000 +0100
-+++ dokuwiki-2006-03-09d/inc/.htaccess 2006-09-13 20:44:30.000000000 +0200
-@@ -0,0 +1,2 @@
-+order allow,deny
-+deny from all
-diff -urNb dokuwiki-2006-03-09/lib/exe/spellcheck.php
dokuwiki-2006-03-09d/lib/exe/spellcheck.php
---- dokuwiki-2006-03-09/lib/exe/spellcheck.php 2006-03-09 21:32:34.000000000
+0100
-+++ dokuwiki-2006-03-09d/lib/exe/spellcheck.php 2006-06-04
20:07:05.000000000 +0200
-@@ -51,6 +51,7 @@
- session_write_close();
- require_once (DOKU_INC.'inc/utf8.php');
- require_once (DOKU_INC.'inc/aspell.php');
-+require_once (DOKU_INC.'inc/common.php');
-
- header('Content-Type: text/plain; charset=utf-8');
-
-@@ -79,10 +80,14 @@
- * the result string and will be checked for
- * spelling errors again.
- *
-+ * callback for preg_replace_callback
-+ *
- * @author Matthias Grimm <[EMAIL PROTECTED]>
- * @author Andreas Gohr <[EMAIL PROTECTED]>
- */
--function spaceslink($string, $check=""){
-+function spaceslink($matches){
-+ $string = unslash($matches[1]);
-+ $check = unslash($matches[2]);
- $result = ' '; //opening [[
- $result .= str_pad('',utf8_strlen($string),' ');
- $result .= $check;
-@@ -119,8 +124,8 @@
- $data = explode("\n",$string);
-
- // don't check links and medialinks for spelling errors
-- $string =
preg_replace('/\{\{(.*?)(\|(.*?))?(\}\})/e','spaceslink("\\1","\\2")',$string);
-- $string =
preg_replace('/\[\[(.*?)(\|(.*?))?(\]\])/e','spaceslink("\\1","\\2")',$string);
-+ $string =
preg_replace_callback('/\{\{(.*?)(\|(.*?))?(\}\})/','spaceslink',$string);
-+ $string =
preg_replace_callback('/\[\[(.*?)(\|(.*?))?(\]\])/','spaceslink',$string);
-
- // run aspell in terse sgml mode, ignore nbsp as correct word
- if(!$spell->runAspell($string,$out,$err,array('!','+html','@nbsp'))){
-diff -urNb dokuwiki-2006-03-09/VERSION dokuwiki-2006-03-09d/VERSION
---- dokuwiki-2006-03-09/VERSION 2006-03-09 21:32:35.000000000 +0100
-+++ dokuwiki-2006-03-09d/VERSION 2006-09-13 20:46:59.000000000 +0200
-@@ -1 +1 @@
--2006-03-09
-+2006-03-09d
diff -u dokuwiki-0.0.20060309/debian/templates
dokuwiki-0.0.20060309/debian/templates
--- dokuwiki-0.0.20060309/debian/templates
+++ dokuwiki-0.0.20060309/debian/templates
@@ -1,19 +1,15 @@
Template: dokuwiki/system/documentroot
Type: string
_Description: Wiki location:
- Where should the web-accessible location of the DokuWiki be?
- .
- This is the directory off your website that people should use to access
- the DokuWiki. By default, this is http://yourserver/dokuwiki, but you can
+ DokuWiki will be accessible through a directory of your website.
+ By default, this is http://yourserver/dokuwiki, but you can
change it to be anything within your server. Enter just the directory
portion below.
Default: /dokuwiki
Template: dokuwiki/system/accessible
Type: select
-_Description: Allow access from:
- Who should be able to access your DokuWiki?
- .
+_Description: Authorized network:
A Wiki is normally used to provide unlimited access to information, which
can be freely modified by anyone. Since this is not always wanted,
it is possible to restrict access to the site on the basis of the
@@ -34,7 +30,7 @@
Template: dokuwiki/system/localnet
Type: string
_Description: Local network:
- What is defined as your local network? The specification should either be
+ The specification of your local network should either be
an IP network in CIDR format (x.x.x.x/y) or a domain specification (like
.mydomain.com).
.
only in patch2:
unchanged:
--- dokuwiki-0.0.20060309.orig/debian/patches/new_upstream_2006-03-09e.dpatch
+++ dokuwiki-0.0.20060309/debian/patches/new_upstream_2006-03-09e.dpatch
@@ -0,0 +1,158 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## new_upstream_2006-03-09e.dpatch by Mohammed Adnène Trojette <[EMAIL
PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New upstream release 2006-03-09e
+
[EMAIL PROTECTED]@
+
+diff -urNb dokuwiki-2006-03-09/bin/dwpage.php
dokuwiki-2006-03-09e/bin/dwpage.php
+--- dokuwiki-2006-03-09/bin/dwpage.php 2006-03-09 21:32:34.000000000 +0100
++++ dokuwiki-2006-03-09e/bin/dwpage.php 2006-09-13 20:46:22.000000000
+0200
+@@ -1,6 +1,7 @@
+ #!/usr/bin/php -d short_open_tag=on
+ <?php
+
#------------------------------------------------------------------------------
++if ('cli' != php_sapi_name()) die();
+ if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+ require_once DOKU_INC.'inc/init.php';
+ require_once DOKU_INC.'inc/common.php';
+diff -urNb dokuwiki-2006-03-09/bin/.htaccess dokuwiki-2006-03-09e/bin/.htaccess
+--- dokuwiki-2006-03-09/bin/.htaccess 1970-01-01 01:00:00.000000000 +0100
++++ dokuwiki-2006-03-09e/bin/.htaccess 2006-09-08 09:23:57.000000000 +0200
+@@ -0,0 +1,2 @@
++order allow,deny
++deny from all
+diff -urNb dokuwiki-2006-03-09/bin/indexer.php
dokuwiki-2006-03-09e/bin/indexer.php
+--- dokuwiki-2006-03-09/bin/indexer.php 2006-03-09 21:32:34.000000000
+0100
++++ dokuwiki-2006-03-09e/bin/indexer.php 2006-09-13 20:46:29.000000000
+0200
+@@ -1,6 +1,6 @@
+ #!/usr/bin/php
+ <?php
+-
++if ('cli' != php_sapi_name()) die();
+ if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+ require_once(DOKU_INC.'inc/init.php');
+ require_once(DOKU_INC.'inc/common.php');
+diff -urNb dokuwiki-2006-03-09/bin/wantedpages.php
dokuwiki-2006-03-09e/bin/wantedpages.php
+--- dokuwiki-2006-03-09/bin/wantedpages.php 2006-03-09 21:32:34.000000000
+0100
++++ dokuwiki-2006-03-09e/bin/wantedpages.php 2006-09-13 20:46:38.000000000
+0200
+@@ -1,6 +1,7 @@
+ #!/usr/bin/php -d short_open_tag=on
+ <?php
+
#------------------------------------------------------------------------------
++if ('cli' != php_sapi_name()) die();
+ ini_set('memory_limit','128M');
+ if(!defined('DOKU_INC'))
define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+ require_once DOKU_INC.'inc/init.php';
+diff -urNb dokuwiki-2006-03-09/inc/actions.php
dokuwiki-2006-03-09e/inc/actions.php
+--- dokuwiki-2006-03-09/inc/actions.php 2006-03-09 21:32:34.000000000
+0100
++++ dokuwiki-2006-03-09e/inc/actions.php 2006-06-06 20:07:01.000000000
+0200
+@@ -98,6 +98,9 @@
+ */
+ }
+
++ // check permissions again - the action may have changed
++ $ACT = act_permcheck($ACT);
++
+ //call template FIXME: all needed vars available?
+ header('Content-Type: text/html; charset=utf-8');
+ include(template('main.php'));
+diff -urNb dokuwiki-2006-03-09/inc/auth.php dokuwiki-2006-03-09e/inc/auth.php
+--- dokuwiki-2006-03-09/inc/auth.php 2006-03-09 21:32:34.000000000 +0100
++++ dokuwiki-2006-03-09e/inc/auth.php 2006-06-04 20:10:16.000000000 +0200
+@@ -452,8 +452,8 @@
+ $_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
+ $_POST['login'] = cleanID($_POST['login']);
+ //clean fullname and email
+- $_POST['fullname'] = trim(str_replace(':','',$_POST['fullname']));
+- $_POST['email'] = trim(str_replace(':','',$_POST['email']));
++ $_POST['fullname'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['fullname']));
++ $_POST['email'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['email']));
+
+ if( empty($_POST['login']) ||
+ empty($_POST['fullname']) ||
+@@ -527,8 +527,8 @@
+ }
+
+ //clean fullname and email
+- $_POST['fullname'] = trim(str_replace(':','',$_POST['fullname']));
+- $_POST['email'] = trim(str_replace(':','',$_POST['email']));
++ $_POST['fullname'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['fullname']));
++ $_POST['email'] =
trim(preg_replace('/[\x00-\x1f:<>&%]+/','',$_POST['email']));
+
+ if (empty($_POST['fullname']) || empty($_POST['email'])) {
+ msg($lang['profnoempty'],-1);
+diff -urNb dokuwiki-2006-03-09/inc/.htaccess dokuwiki-2006-03-09e/inc/.htaccess
+--- dokuwiki-2006-03-09/inc/.htaccess 1970-01-01 01:00:00.000000000 +0100
++++ dokuwiki-2006-03-09e/inc/.htaccess 2006-09-13 20:44:30.000000000 +0200
+@@ -0,0 +1,2 @@
++order allow,deny
++deny from all
+diff -urNb dokuwiki-2006-03-09/lib/exe/fetch.php
dokuwiki-2006-03-09e/lib/exe/fetch.php
+--- dokuwiki-2006-03-09/lib/exe/fetch.php 2006-03-09 21:32:34.000000000
+0100
++++ dokuwiki-2006-03-09e/lib/exe/fetch.php 2006-09-26 22:09:40.000000000
+0200
+@@ -21,8 +21,8 @@
+ //get input
+ $MEDIA = getID('media',false); // no cleaning - maybe external
+ $CACHE = calc_cache($_REQUEST['cache']);
+- $WIDTH = $_REQUEST['w'];
+- $HEIGHT = $_REQUEST['h'];
++ $WIDTH = (int) $_REQUEST['w'];
++ $HEIGHT = (int) $_REQUEST['h'];
+ list($EXT,$MIME) = mimetype($MEDIA);
+ if($EXT === false){
+ $EXT = 'unknown';
+@@ -198,6 +198,8 @@
+ $info = getimagesize($file);
+ if(!$h) $h = round(($w * $info[1]) / $info[0]);
+
++ // we wont scale up to infinity
++ if($w > 2000 || $h > 2000) return $file;
+
+ //cache
+ $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext);
+diff -urNb dokuwiki-2006-03-09/lib/exe/spellcheck.php
dokuwiki-2006-03-09e/lib/exe/spellcheck.php
+--- dokuwiki-2006-03-09/lib/exe/spellcheck.php 2006-03-09 21:32:34.000000000
+0100
++++ dokuwiki-2006-03-09e/lib/exe/spellcheck.php 2006-06-04
20:07:05.000000000 +0200
+@@ -51,6 +51,7 @@
+ session_write_close();
+ require_once (DOKU_INC.'inc/utf8.php');
+ require_once (DOKU_INC.'inc/aspell.php');
++require_once (DOKU_INC.'inc/common.php');
+
+ header('Content-Type: text/plain; charset=utf-8');
+
+@@ -79,10 +80,14 @@
+ * the result string and will be checked for
+ * spelling errors again.
+ *
++ * callback for preg_replace_callback
++ *
+ * @author Matthias Grimm <[EMAIL PROTECTED]>
+ * @author Andreas Gohr <[EMAIL PROTECTED]>
+ */
+-function spaceslink($string, $check=""){
++function spaceslink($matches){
++ $string = unslash($matches[1]);
++ $check = unslash($matches[2]);
+ $result = ' '; //opening [[
+ $result .= str_pad('',utf8_strlen($string),' ');
+ $result .= $check;
+@@ -119,8 +124,8 @@
+ $data = explode("\n",$string);
+
+ // don't check links and medialinks for spelling errors
+- $string =
preg_replace('/\{\{(.*?)(\|(.*?))?(\}\})/e','spaceslink("\\1","\\2")',$string);
+- $string =
preg_replace('/\[\[(.*?)(\|(.*?))?(\]\])/e','spaceslink("\\1","\\2")',$string);
++ $string =
preg_replace_callback('/\{\{(.*?)(\|(.*?))?(\}\})/','spaceslink',$string);
++ $string =
preg_replace_callback('/\[\[(.*?)(\|(.*?))?(\]\])/','spaceslink',$string);
+
+ // run aspell in terse sgml mode, ignore nbsp as correct word
+ if(!$spell->runAspell($string,$out,$err,array('!','+html','@nbsp'))){
+diff -urNb dokuwiki-2006-03-09/VERSION dokuwiki-2006-03-09e/VERSION
+--- dokuwiki-2006-03-09/VERSION 2006-03-09 21:32:35.000000000 +0100
++++ dokuwiki-2006-03-09e/VERSION 2006-09-26 22:08:13.000000000 +0200
+@@ -1 +1 @@
+-2006-03-09
++2006-03-09e
