phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki/locale/po es.po,1.14,1.15

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv20766/phpwiki/locale/po

Modified Files:
	es.po 
Log Message:
Re[make]d locale to add new strings (some database error messages were recently gettext-ified).

Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** es.po	2001/12/18 06:24:59	1.14
--- es.po	2001/12/19 08:58:02	1.15
***************
*** 13,17 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-18 01:18-0500\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
--- 13,17 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.2.0\n"
! "POT-Creation-Date: 2001-12-19 03:49-0500\n"
  "PO-Revision-Date: 2000-02-01 00:50-0500\n"
  "Last-Translator: Pablo Roca <pr...@cl...>\n"
***************
*** 58,62 ****
  # lib/stdlib.php:384 lib/stdlib.php:445
  #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
! #: ../lib/plugin/RecentChanges.php:262 ../lib/plugin/RecentChanges.php:307
  #: ../templates/browse.html:56
  msgid "RecentChanges"
--- 58,62 ----
  # lib/stdlib.php:384 lib/stdlib.php:445
  #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
! #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
  #: ../templates/browse.html:56
  msgid "RecentChanges"
***************
*** 108,112 ****
  msgstr ""
  
! #: ../templates/browse.html:100
  msgid "SignIn"
  msgstr ""
--- 108,112 ----
  msgstr ""
  
! #: ../templates/browse.html:100 ../templates/editpage.html:74
  msgid "SignIn"
  msgstr ""
***************
*** 157,185 ****
  msgstr ""
  
! #: ../templates/editpage.html:78
  msgid "You can change the size of the editing area in"
  msgstr ""
  
! #: ../templates/editpage.html:79
  msgid "UserPreferences"
  msgstr ""
  
! #: ../templates/editpage.html:80
  msgid "See"
  msgstr ""
  
! #: ../templates/editpage.html:80
  msgid "GoodStyle"
  msgstr "BuenEstilo"
  
! #: ../templates/editpage.html:80
  msgid "tips for editing."
  msgstr "tips para editar."
  
! #: ../templates/editpage.html:84
  msgid "TextFormattingRules"
  msgstr "ReglasDeFormatoDeTexto"
  
! #: ../templates/editpage.html:84
  msgid "Synopsis"
  msgstr ""
--- 157,185 ----
  msgstr ""
  
! #: ../templates/editpage.html:80
  msgid "You can change the size of the editing area in"
  msgstr ""
  
! #: ../templates/editpage.html:81
  msgid "UserPreferences"
  msgstr ""
  
! #: ../templates/editpage.html:82
  msgid "See"
  msgstr ""
  
! #: ../templates/editpage.html:82
  msgid "GoodStyle"
  msgstr "BuenEstilo"
  
! #: ../templates/editpage.html:82
  msgid "tips for editing."
  msgstr "tips para editar."
  
! #: ../templates/editpage.html:86
  msgid "TextFormattingRules"
  msgstr "ReglasDeFormatoDeTexto"
  
! #: ../templates/editpage.html:86
  msgid "Synopsis"
  msgstr ""
***************
*** 415,429 ****
  
  #: ../lib/main.php:26 ../lib/main.php:85 ../lib/main.php:87
! #: ../lib/plugin/RecentChanges.php:245
  msgid "HomePage"
  msgstr "PáginaPrincipal"
  
  # lib/stdlib.php:207 lib/stdlib.php:215
! #: ../lib/plugin/RecentChanges.php:250
  msgid "Search"
  msgstr "Buscar"
  
  # lib/fullsearch.php:48
! #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  #, fuzzy
  msgid "Title Search"
--- 415,429 ----
  
  #: ../lib/main.php:26 ../lib/main.php:85 ../lib/main.php:87
! #: ../lib/plugin/RecentChanges.php:247
  msgid "HomePage"
  msgstr "PáginaPrincipal"
  
  # lib/stdlib.php:207 lib/stdlib.php:215
! #: ../lib/plugin/RecentChanges.php:252
  msgid "Search"
  msgstr "Buscar"
  
  # lib/fullsearch.php:48
! #: ../lib/plugin/RecentChanges.php:253 ../lib/plugin/TitleSearch.php:16
  #, fuzzy
  msgid "Title Search"
***************
*** 431,435 ****
  
  # lib/fullsearch.php:48
! #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  #, fuzzy
--- 431,435 ----
  
  # lib/fullsearch.php:48
! #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:255
  #: ../lib/plugin/TitleSearch.php:12
  #, fuzzy
***************
*** 763,766 ****
--- 763,954 ----
  msgstr ""
  
+ # lib/msql.php:29 lib/mysql.php:36
+ #: ../lib/WikiDB/backend/PearDB.php:26
+ #, fuzzy, c-format
+ msgid "Can't connect to database: %s"
+ msgstr "No se puede establecer conexión con la base de datos, me doy por vencido."
+ 
+ #: ../lib/WikiDB/backend/PearDB.php:57
+ #, c-format
+ msgid "WARNING: database still locked (lock_count = %s)"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/PearDB.php:710
+ #, c-format
+ msgid "%s: fatal database error"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:93
+ #, c-format
+ msgid "Creating new repository [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:128
+ #, c-format
+ msgid "Found [%s] in [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:182
+ msgid "update_pagedata: Argument 'newdata' was not array"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:190
+ msgid "update_pagedata: no meta data found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:243
+ #, c-format
+ msgid "get_latest_versioned FAILED for [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:260
+ #, c-format
+ msgid "get_versiondata: [%s] [%s] [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:315
+ #, c-format
+ msgid "delete_page [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:337
+ msgid "delete_versiondata: Not Implemented"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:347
+ msgid "set_versiondata: Not Implemented"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:450
+ msgid "lock: Not Implemented"
+ msgstr ""
+ 
+ # admin.php:55
+ #: ../lib/WikiDB/backend/cvs.php:456
+ #, fuzzy
+ msgid "unlock: Not Implemented"
+ msgstr "Función todaví no implementada"
+ 
+ #: ../lib/WikiDB/backend/cvs.php:520
+ #, c-format
+ msgid "Creating meta file for [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:614
+ msgid "CP: got revision information"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:619
+ msgid "CP: is initial release"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:622
+ msgid "CP: returning old version"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:689
+ msgid "Unable to delete file, lock was not obtained."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:699
+ msgid "deleteFile: Unable to open file"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:709
+ #, fuzzy
+ msgid "no message"
+ msgstr "PáginaPrincipal"
+ 
+ #: ../lib/WikiDB/backend/cvs.php:749
+ #, c-format
+ msgid "unable to locate/open [%s], turning debug off"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:760
+ #, c-format
+ msgid "Preparing to execute [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:763
+ #, c-format
+ msgid "Command failed [%s], Output: ["
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:765
+ #, c-format
+ msgid "Command failed [%s], Return value: %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:768
+ msgid "Done execution"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:782
+ msgid "Unable to obtain read lock."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:789
+ #, c-format
+ msgid "Unable to open file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:808
+ msgid "Timeout while obtaining lock."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:827
+ #, c-format
+ msgid "Copying from [%s] to [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:830
+ msgid "Copying"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:835
+ #, c-format
+ msgid "Copied to [%s/%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:837
+ #, c-format
+ msgid "Failed to copy [%s/%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:843
+ msgid "Not copying"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dba.php:23
+ #, c-format
+ msgid "%s: Can't open dba database"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:330
+ #, c-format
+ msgid "Bad key in linktable: '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:352
+ #, c-format
+ msgid "Bad key '%s' in table"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:360
+ #, c-format
+ msgid "backlink entry missing for link '%s'->'%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:368
+ #, c-format
+ msgid "link entry missing for backlink '%s'<-'%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/dba.php:17
+ msgid ""
+ "DBA files are in the /tmp directory. Please read the INSTALL file and move "
+ "the DB file to a permanent location or risk losing all the pages!"
+ msgstr ""
+ 
  #~ msgid "WikiDiff::apply: line count mismatch: %s != %s"
  #~ msgstr "WikiDiff::apply: conteo de líneas difiere: %s != %s"
***************
*** 857,864 ****
  #~ msgstr "%d veces encontrado en %d páginas."
  
- # lib/msql.php:29 lib/mysql.php:36
- #~ msgid "Cannot establish connection to database, giving up."
- #~ msgstr "No se puede establecer conexión con la base de datos, me doy por vencido."
- 
  # lib/msql.php:31 lib/msql.php:37
  #~ msgid "Error message: %s"
--- 1045,1048 ----
***************
*** 908,915 ****
  #~ msgid "(first day for this Wiki)"
  #~ msgstr "(primer dia de este Wiki)"
- 
- # admin.php:55
- #~ msgid "Function not yet implemented."
- #~ msgstr "Función todaví no implementada"
  
  # lib/config.php:162
--- 1092,1095 ----

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.20,1.21

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv20721/phpwiki/locale/po

Modified Files:
	de.po 
Log Message:
Re[make]d locale to add new strings (some database error messages were recently gettext-ified).

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** de.po	2001/12/19 05:24:43	1.20
--- de.po	2001/12/19 08:57:57	1.21
***************
*** 6,10 ****
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-12-18 21:32-0500\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Arno Hollosi <aho...@ma...>\n"
--- 6,10 ----
  msgstr ""
  "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2001-12-19 03:49-0500\n"
  "PO-Revision-Date: 2000-10-31 02:23+0200\n"
  "Last-Translator: Arno Hollosi <aho...@ma...>\n"
***************
*** 34,38 ****
  msgstr "um die aktuellste Version zu schauen."
  
! #: ../lib/stdlib.php:629 ../templates/browse.html:50
  msgid "Last edited on"
  msgstr "Zuletzt verändert am"
--- 34,38 ----
  msgstr "um die aktuellste Version zu schauen."
  
! #: ../templates/browse.html:50
  msgid "Last edited on"
  msgstr "Zuletzt verändert am"
***************
*** 47,51 ****
  
  #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
! #: ../lib/plugin/RecentChanges.php:262 ../lib/plugin/RecentChanges.php:307
  #: ../templates/browse.html:56
  msgid "RecentChanges"
--- 47,51 ----
  
  #: ../lib/loadsave.php:452 ../lib/plugin/RecentChanges.php:159
! #: ../lib/plugin/RecentChanges.php:264 ../lib/plugin/RecentChanges.php:309
  #: ../templates/browse.html:56
  msgid "RecentChanges"
***************
*** 96,101 ****
  msgstr "Ausmelden"
  
! #: ../lib/stdlib.php:614 ../lib/stdlib.php:621 ../templates/browse.html:100
! #: ../templates/browse.html:129 ../templates/editpage.html:74
  msgid "SignIn"
  msgstr "Anmelden"
--- 96,100 ----
  msgstr "Ausmelden"
  
! #: ../templates/browse.html:100 ../templates/editpage.html:74
  msgid "SignIn"
  msgstr "Anmelden"
***************
*** 105,111 ****
  msgstr "PHP Warnungen"
  
! #: ../lib/plugin/_BackendInfo.php:10 ../lib/stdlib.php:624
! #: ../lib/stdlib.php:625 ../lib/stdlib.php:628 ../templates/browse.html:123
! #: ../templates/browse.html:124 ../templates/browse.html:130
  msgid "DebugInfo"
  msgstr "DebugInfo"
--- 104,109 ----
  msgstr "PHP Warnungen"
  
! #: ../lib/plugin/_BackendInfo.php:10 ../templates/browse.html:123
! #: ../templates/browse.html:124
  msgid "DebugInfo"
  msgstr "DebugInfo"
***************
*** 399,415 ****
  
  #: ../lib/main.php:26 ../lib/main.php:85 ../lib/main.php:87
! #: ../lib/plugin/RecentChanges.php:245
  msgid "HomePage"
  msgstr "StartSeite"
  
! #: ../lib/plugin/RecentChanges.php:250
  msgid "Search"
  msgstr "Suche"
  
! #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
  msgstr "Titelsuche"
  
! #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
--- 397,413 ----
  
  #: ../lib/main.php:26 ../lib/main.php:85 ../lib/main.php:87
! #: ../lib/plugin/RecentChanges.php:247
  msgid "HomePage"
  msgstr "StartSeite"
  
! #: ../lib/plugin/RecentChanges.php:252
  msgid "Search"
  msgstr "Suche"
  
! #: ../lib/plugin/RecentChanges.php:253 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
  msgstr "Titelsuche"
  
! #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:255
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
***************
*** 754,757 ****
--- 752,941 ----
  msgstr "!Fußnoten"
  
+ #: ../lib/WikiDB/backend/PearDB.php:26
+ #, fuzzy, c-format
+ msgid "Can't connect to database: %s"
+ msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch."
+ 
+ #: ../lib/WikiDB/backend/PearDB.php:57
+ #, c-format
+ msgid "WARNING: database still locked (lock_count = %s)"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/PearDB.php:710
+ #, c-format
+ msgid "%s: fatal database error"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:93
+ #, c-format
+ msgid "Creating new repository [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:128
+ #, c-format
+ msgid "Found [%s] in [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:182
+ msgid "update_pagedata: Argument 'newdata' was not array"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:190
+ msgid "update_pagedata: no meta data found"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:243
+ #, c-format
+ msgid "get_latest_versioned FAILED for [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:260
+ #, c-format
+ msgid "get_versiondata: [%s] [%s] [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:315
+ #, c-format
+ msgid "delete_page [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:337
+ msgid "delete_versiondata: Not Implemented"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:347
+ msgid "set_versiondata: Not Implemented"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:450
+ msgid "lock: Not Implemented"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:456
+ #, fuzzy
+ msgid "unlock: Not Implemented"
+ msgstr "Funktion noch nicht implementiert."
+ 
+ #: ../lib/WikiDB/backend/cvs.php:520
+ #, c-format
+ msgid "Creating meta file for [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:614
+ msgid "CP: got revision information"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:619
+ msgid "CP: is initial release"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:622
+ msgid "CP: returning old version"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:689
+ msgid "Unable to delete file, lock was not obtained."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:699
+ msgid "deleteFile: Unable to open file"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:709
+ #, fuzzy
+ msgid "no message"
+ msgstr "StartSeite"
+ 
+ #: ../lib/WikiDB/backend/cvs.php:749
+ #, c-format
+ msgid "unable to locate/open [%s], turning debug off"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:760
+ #, c-format
+ msgid "Preparing to execute [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:763
+ #, c-format
+ msgid "Command failed [%s], Output: ["
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:765
+ #, c-format
+ msgid "Command failed [%s], Return value: %s"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:768
+ msgid "Done execution"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:782
+ msgid "Unable to obtain read lock."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:789
+ #, c-format
+ msgid "Unable to open file '%s' for reading"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:808
+ msgid "Timeout while obtaining lock."
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:827
+ #, c-format
+ msgid "Copying from [%s] to [%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:830
+ msgid "Copying"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:835
+ #, c-format
+ msgid "Copied to [%s/%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:837
+ #, c-format
+ msgid "Failed to copy [%s/%s]"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/cvs.php:843
+ msgid "Not copying"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dba.php:23
+ #, c-format
+ msgid "%s: Can't open dba database"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:330
+ #, c-format
+ msgid "Bad key in linktable: '%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:352
+ #, c-format
+ msgid "Bad key '%s' in table"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:360
+ #, c-format
+ msgid "backlink entry missing for link '%s'->'%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/backend/dbaBase.php:368
+ #, c-format
+ msgid "link entry missing for backlink '%s'<-'%s'"
+ msgstr ""
+ 
+ #: ../lib/WikiDB/dba.php:17
+ msgid ""
+ "DBA files are in the /tmp directory. Please read the INSTALL file and move "
+ "the DB file to a permanent location or risk losing all the pages!"
+ msgstr ""
+ 
  #~ msgid "Current page:"
  #~ msgstr "Aktuelle Seite:"
***************
*** 769,775 ****
  #~ msgstr "%d Treffer in %d Seiten."
  
- #~ msgid "Cannot establish connection to database, giving up."
- #~ msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch."
- 
  #~ msgid "Error message: %s"
  #~ msgstr "Fehlermeldung: %s"
--- 953,956 ----
***************
*** 807,813 ****
  #~ msgid "(first day for this Wiki)"
  #~ msgstr "(Erster Tag dieses Wikis)"
- 
- #~ msgid "Function not yet implemented."
- #~ msgstr "Funktion noch nicht implementiert."
  
  #~ msgid "templates/browse.html"
--- 988,991 ----

[phpwiki-checkins] CVS: phpwiki/locale/nl/LC_MESSAGES phpwiki.mo,1.15,1.16

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv20668/phpwiki/locale/nl/LC_MESSAGES

Modified Files:
	phpwiki.mo 
Log Message:
Re[make]d locale to add new strings (some database error messages were recently gettext-ified).

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
Binary files /tmp/cvsqvjRjY and /tmp/cvswhlwmM differ

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,1.12,1.13

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv20561/phpwiki/locale/de/LC_MESSAGES

Modified Files:
	phpwiki.mo 
Log Message:
Re[make]d locale to add new strings (some database error messages were recently gettext-ified).

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
Binary files /tmp/cvsMDRKjR and /tmp/cvsWopKoy differ

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB dba.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB
In directory usw-pr-cvs1:/tmp/cvs-serv19761/phpwiki/lib/WikiDB

Modified Files:
	dba.php 
Log Message:
gettext-ified error messages with sprintf(_("%s"),$v)

Index: dba.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/dba.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dba.php	2001/09/18 19:16:23	1.1
--- dba.php	2001/12/19 08:54:19	1.2
***************
*** 15,22 ****
              || preg_match('@^/tmp\b@', $dbparams['directory'])) {
              $this->_warnings
!                 = " DBA files are in the /tmp directory. "
!                 . "Please read the INSTALL file and move "
! 		. "the DB file to a permanent location or risk losing "
! 		. "all the pages!";
          }
          else
--- 15,19 ----
              || preg_match('@^/tmp\b@', $dbparams['directory'])) {
              $this->_warnings
!                 = _("DBA files are in the /tmp directory. Please read the INSTALL file and move the DB file to a permanent location or risk losing all the pages!");
          }
          else

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend PearDB.php,1.12,1.13

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv19735/phpwiki/lib/WikiDB/backend

Modified Files:
	PearDB.php 
Log Message:
gettext-ified error messages with sprintf(_("%s"),$v)

Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** PearDB.php	2001/12/14 22:20:44	1.12
--- PearDB.php	2001/12/19 08:54:15	1.13
***************
*** 24,29 ****
          $dbh = &$this->_dbh;
          if (DB::isError($dbh)) {
!             trigger_error("Can't connect to database: "
!                           . $this->_pear_error_message($dbh),
                            E_USER_ERROR);
          }
--- 24,28 ----
          $dbh = &$this->_dbh;
          if (DB::isError($dbh)) {
!             trigger_error(sprintf(_("Can't connect to database: %s"),$this->_pear_error_message($dbh)),
                            E_USER_ERROR);
          }
***************
*** 56,61 ****
              return;
          if ($this->_lock_count) {
!             trigger_error("WARNING: database still locked"
!                           . " (lock_count = $this->_lock_count)\n<br>",
                            E_USER_WARNING);
          }
--- 55,59 ----
              return;
          if ($this->_lock_count) {
!             trigger_error(sprintf(_("WARNING: database still locked (lock_count = %s)"),$this->_lock_count) . "\n<br>",
                            E_USER_WARNING);
          }
***************
*** 710,714 ****
      function _pear_error_message($error) {
          $class = get_class($this);
!         $message = "$class: fatal database error\n"
               . "\t" . $error->getMessage() . "\n"
               . "\t(" . $error->getDebugInfo() . ")\n";
--- 708,712 ----
      function _pear_error_message($error) {
          $class = get_class($this);
!         $message = sprintf(_("%s: fatal database error"),$class) ."\n"
               . "\t" . $error->getMessage() . "\n"
               . "\t(" . $error->getDebugInfo() . ")\n";

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend dbaBase.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv19712/phpwiki/lib/WikiDB/backend

Modified Files:
	dbaBase.php 
Log Message:
gettext-ified error messages with sprintf(_("%s"),$v)

Index: dbaBase.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dbaBase.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dbaBase.php	2001/09/18 19:16:23	1.1
--- dbaBase.php	2001/12/19 08:54:10	1.2
***************
*** 328,332 ****
                  $okeys[] = $key;
              else {
!                 trigger_error("Bad key in linktable: '$key'", E_USER_WARNING);
                  $ikeys[] = $key;
              }
--- 328,332 ----
                  $okeys[] = $key;
              else {
!                 trigger_error(sprintf(_("Bad key in linktable: '%s'"),$key), E_USER_WARNING);
                  $ikeys[] = $key;
              }
***************
*** 350,354 ****
          for ($key = $db->firstkey(); $key; $key = $db->nextkey()) {
              if (strlen($key) < 1 || ($key[0] != 'i' && $key[0] != 'o')) {
!                 $errs[] = "Bad key '$key' in table";
                  continue;
              }
--- 350,354 ----
          for ($key = $db->firstkey(); $key; $key = $db->nextkey()) {
              if (strlen($key) < 1 || ($key[0] != 'i' && $key[0] != 'o')) {
!                 $errs[] = sprintf(_("Bad key '%s' in table"),$key);
                  continue;
              }
***************
*** 358,362 ****
                  foreach($this->_get_links('o', $page) as $link) {
                      if (!$this->_has_link('i', $link, $page))
!                         $errs[] = "backlink entry missing for link '$page'->'$link'";
                  }
              }
--- 358,362 ----
                  foreach($this->_get_links('o', $page) as $link) {
                      if (!$this->_has_link('i', $link, $page))
!                         $errs[] = sprintf(_("backlink entry missing for link '%s'->'%s'"),$page,$link);
                  }
              }
***************
*** 366,370 ****
                  foreach($this->_get_links('i', $page) as $link) {
                      if (!$this->_has_link('o', $link, $page))
!                         $errs[] = "link entry missing for backlink '$page'<-'$link'";
                  }
              }
--- 366,370 ----
                  foreach($this->_get_links('i', $page) as $link) {
                      if (!$this->_has_link('o', $link, $page))
!                         $errs[] = sprintf(_("link entry missing for backlink '%s'<-'%s'"),$page,$link);
                  }
              }

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend dba.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv19684/phpwiki/lib/WikiDB/backend

Modified Files:
	dba.php 
Log Message:
gettext-ified error messages with sprintf(_("%s"),$v)

Index: dba.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/dba.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dba.php	2001/09/18 19:16:23	1.1
--- dba.php	2001/12/19 08:54:05	1.2
***************
*** 21,25 ****
          $db->set_timeout($timeout);
          if (!$db->open('c')) {
!             trigger_error("$dbfile: Can't open dba database", E_USER_ERROR);
              ExitWikit();
          }
--- 21,25 ----
          $db->set_timeout($timeout);
          if (!$db->open('c')) {
!             trigger_error(sprintf(_("%s: Can't open dba database"),$dbfile), E_USER_ERROR);
              ExitWikit();
          }

[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend cvs.php,1.4,1.5

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv19629/phpwiki/lib/WikiDB/backend

Modified Files:
	cvs.php 
Log Message:
gettext-ified error messages with sprintf(_("%s"),$v)

Index: cvs.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/cvs.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** cvs.php	2001/11/26 09:25:36	1.4
--- cvs.php	2001/12/19 08:54:01	1.5
***************
*** 91,95 ****
                  && is_dir( $this->_repository . "/" . $this->_module_name ))) {
  
!             $this->_cvsDebug( "Creating new repository [$this->_repository]" );
  
              // doesn't exist, need to create it and the replace the wiki 
--- 91,95 ----
                  && is_dir( $this->_repository . "/" . $this->_module_name ))) {
  
!             $this->_cvsDebug( sprintf(_("Creating new repository [%s]"),$this->_repository) );
  
              // doesn't exist, need to create it and the replace the wiki 
***************
*** 126,131 ****
                  while ( $entry = readdir( $d ) ) {
                      $filename = $dbparam[CVS_PAGE_SOURCE] . "/" . $entry;
!                     $this->_cvsDebug("Found [$entry] in ["
!                                      . $dbparam[CVS_PAGE_SOURCE]."]");
                      
                      if ( is_file( $filename ) ) {
--- 126,130 ----
                  while ( $entry = readdir( $d ) ) {
                      $filename = $dbparam[CVS_PAGE_SOURCE] . "/" . $entry;
!                     $this->_cvsDebug( sprintf(_("Found [%s] in [%s]"),$entry,$dbparam[CVS_PAGE_SOURCE]) );
                      
                      if ( is_file( $filename ) ) {
***************
*** 181,185 ****
          // check argument
          if ( ! is_array( $newdata ) ) {
!             trigger_error("update_pagedata: Argument 'newdata' was not array", 
                            E_USER_WARNING);
          }
--- 180,184 ----
          // check argument
          if ( ! is_array( $newdata ) ) {
!             trigger_error(_("update_pagedata: Argument 'newdata' was not array"), 
                            E_USER_WARNING);
          }
***************
*** 189,193 ****
  
          if ( ! $metaData ) {
!             $this->_cvsDebug( "update_pagedata: no meta data found" );
              // this means that the page does not exist, we need to create
              // it.
--- 188,192 ----
  
          if ( ! $metaData ) {
!             $this->_cvsDebug( _("update_pagedata: no meta data found") );
              // this means that the page does not exist, we need to create
              // it.
***************
*** 242,246 ****
              return $metaData[CMD_VERSION];
          } else {
!             $this->_cvsDebug( "get_latest_versioned FAILED for [$pagename]" );
              return 0;
          }
--- 241,245 ----
              return $metaData[CMD_VERSION];
          } else {
!             $this->_cvsDebug( sprintf(_("get_latest_versioned FAILED for [%s]"),$pagename) );
              return 0;
          }
***************
*** 259,264 ****
      function get_versiondata($pagename, $version, $want_content = false) 
      {
!         $this->_cvsDebug( "get_versiondata: [$pagename] "
!                           . "[$version] [$want_content]" );
        
          $filedata = "";
--- 258,262 ----
      function get_versiondata($pagename, $version, $want_content = false) 
      {
!         $this->_cvsDebug( sprintf(_("get_versiondata: [%s] [%s] [%s]"),$pagename,$version,$want_content) );
        
          $filedata = "";
***************
*** 315,319 ****
      function delete_page($pagename) 
      {
!         $this->_cvsDebug( "delete_page [$pagename]" );
          $filename = $this->_docDir . "/" . $pagename;
          $metaFile = $this->_docDir . "/CVS/_" . $pagename;
--- 313,317 ----
      function delete_page($pagename) 
      {
!         $this->_cvsDebug( sprintf(_("delete_page [%s]"),$pagename) ;
          $filename = $this->_docDir . "/" . $pagename;
          $metaFile = $this->_docDir . "/CVS/_" . $pagename;
***************
*** 337,341 ****
          // TODO: revision somewhere in the middle of a revision tree, and
          // TODO: this is basically not possible!
!         trigger_error("delete_versiondata: Not Implemented", E_USER_WARNING);
      }
  
--- 335,339 ----
          // TODO: revision somewhere in the middle of a revision tree, and
          // TODO: this is basically not possible!
!         trigger_error( _("delete_versiondata: Not Implemented"), E_USER_WARNING);
      }
  
***************
*** 347,351 ****
          // TODO: file directly but i don't know of a way of doing it via
          // TODO: the cvs tools).
!         trigger_error("set_versiondata: Not Implemented", E_USER_WARNING);
      }
  
--- 345,349 ----
          // TODO: file directly but i don't know of a way of doing it via
          // TODO: the cvs tools).
!         trigger_error( _("set_versiondata: Not Implemented"), E_USER_WARNING);
      }
  
***************
*** 450,454 ****
      {
          // TODO: to be implemented
!         trigger_error("lock: Not Implemented", E_USER_WARNING);
      }
  
--- 448,452 ----
      {
          // TODO: to be implemented
!         trigger_error(_("lock: Not Implemented"), E_USER_WARNING);
      }
  
***************
*** 456,460 ****
      {
          // TODO: to be implemented
!         trigger_error("unlock: Not Implemented", E_USER_WARNING);
      }
  
--- 454,458 ----
      {
          // TODO: to be implemented
!         trigger_error(_("unlock: Not Implemented"), E_USER_WARNING);
      }
  
***************
*** 520,524 ****
          // this is used as part of an array walk and therefore takes
          // the backend argument
!         $backend->_cvsDebug( "Creating meta file for [$page_name]" );
          $backend->update_pagedata( $page_name, array() );
      }
--- 518,522 ----
          // this is used as part of an array walk and therefore takes
          // the backend argument
!         $backend->_cvsDebug( sprintf(_("Creating meta file for [%s]"),$page_name) );
          $backend->update_pagedata( $page_name, array() );
      }
***************
*** 614,626 ****
          $this->_cvsDebug( "CP: $cmdOutput" );
          if ( isset( $revInfo[1] ) ) {
!             $this->_cvsDebug( "CP: got revision information" );
              return $revInfo[1];
          } else {
              ereg( "\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo );
              if ( isset( $revInfo[1] ) ) {
!                 $this->_cvsDebug( "CP: is initial release" );
                  return 1;
              }
!             $this->_cvsDebug( "CP: returning old version" );
              return $meta_data[CMD_VERSION];
          }
--- 612,624 ----
          $this->_cvsDebug( "CP: $cmdOutput" );
          if ( isset( $revInfo[1] ) ) {
!             $this->_cvsDebug( _("CP: got revision information") );
              return $revInfo[1];
          } else {
              ereg( "\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo );
              if ( isset( $revInfo[1] ) ) {
!                 $this->_cvsDebug( _("CP: is initial release") );
                  return 1;
              }
!             $this->_cvsDebug( _("CP: returning old version") );
              return $meta_data[CMD_VERSION];
          }
***************
*** 689,694 ****
  
              if (!$locked) { 
!                 $this->_cvsError("Unable to delete file, "
!                                  . "lock was not obtained.",
                                   __LINE__, $filename, EM_NOTICE_ERRORS );
              } 
--- 687,691 ----
  
              if (!$locked) { 
!                 $this->_cvsError(_("Unable to delete file, lock was not obtained."),
                                   __LINE__, $filename, EM_NOTICE_ERRORS );
              } 
***************
*** 700,704 ****
              return $rVal;
          } else {
!             $this->_cvsError("deleteFile: Unable to open file",
                        __LINE__, $filename, EM_NOTICE_ERRORS );
              return false;
--- 697,701 ----
              return $rVal;
          } else {
!             $this->_cvsError(_("deleteFile: Unable to open file"),
                        __LINE__, $filename, EM_NOTICE_ERRORS );
              return false;
***************
*** 710,714 ****
       * fail.
       */
!     function _cvsError( $msg     = "no message", 
                          $errline = 0, 
                          $errfile = "lib/WikiDB/backend/cvs.php",
--- 707,711 ----
       * fail.
       */
!     function _cvsError( $msg     = _("no message"), 
                          $errline = 0, 
                          $errfile = "lib/WikiDB/backend/cvs.php",
***************
*** 750,754 ****
          else {
              // TODO: this should be replaced ...
!             print( "unable to locate/open [$filename], turning debug off\n" );
              $this->_debug_file = "";
          }
--- 747,751 ----
          else {
              // TODO: this should be replaced ...
!             printf( _("unable to locate/open [%s], turning debug off"),$filename)."\n";
              $this->_debug_file = "";
          }
***************
*** 761,774 ****
      function _execCommand( $cmdLine, &$cmdOutput, $exitOnNonZero )
      {
!         $this->_cvsDebug( "Preparing to execute [$cmdLine]" );
          exec( $cmdLine, $cmdOutput, $cmdReturnVal );
          if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
!             $this->_cvsDebug( "Command failed [$cmdLine], Output: [" . 
                                join("\n",$cmdOutput) . "]" );
!             $this->_cvsError("Command failed [$cmdLine], "
!                              . "Return value: $cmdReturnVal",
!                              __LINE__ );
          }
!         $this->_cvsDebug( "Done execution [" . join("\n", $cmdOutput ) . "]" );
  
          return $cmdReturnVal;
--- 758,770 ----
      function _execCommand( $cmdLine, &$cmdOutput, $exitOnNonZero )
      {
!         $this->_cvsDebug( sprintf(_("Preparing to execute [%s]"),$cmdLine) );
          exec( $cmdLine, $cmdOutput, $cmdReturnVal );
          if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
!             $this->_cvsDebug( sprintf(_("Command failed [%s], Output: ["),$cmdLine) . 
                                join("\n",$cmdOutput) . "]" );
!             $this->_cvsError( sprintf(_("Command failed [%s], Return value: %s"),$cmdLine,$cmdReturnVal),
!                             __LINE__ );
          }
!         $this->_cvsDebug( _("Done execution")." [" . join("\n", $cmdOutput ) . "]" );
  
          return $cmdReturnVal;
***************
*** 784,788 ****
              if ( !$locked ) {
                  fclose( $fd );
!                 $this->_cvsError( "Unable to obtain read lock.",__LINE__);
              }
  
--- 780,784 ----
              if ( !$locked ) {
                  fclose( $fd );
!                 $this->_cvsError( _("Unable to obtain read lock."),__LINE__);
              }
  
***************
*** 791,795 ****
              return $content;
          } else {
!             $this->_cvsError( "Unable to open file '$filename' for reading",
                                __LINE__ );
              return false;
--- 787,791 ----
              return $content;
          } else {
!             $this->_cvsError( sprintf(_("Unable to open file '%s' for reading"),$filename),
                                __LINE__ );
              return false;
***************
*** 810,814 ****
              $locked = flock($fd,2);  // Exclusive blocking lock 
              if (!$locked) { 
!                 $this->_cvsError("Timeout while obtaining lock.",__LINE__);
              } 
  
--- 806,810 ----
              $locked = flock($fd,2);  // Exclusive blocking lock 
              if (!$locked) { 
!                 $this->_cvsError( _("Timeout while obtaining lock."),__LINE__);
              } 
  
***************
*** 829,843 ****
      function _copyFilesFromDirectory( $src, $dest )
      {
!         $this->_cvsDebug( "Copying from [$src] to [$dest]" );
  
          if ( is_dir( $src ) && is_dir( $dest ) ) {
!             $this->_cvsDebug( "Copying " );
              $d = opendir( $src );
              while ( $entry = readdir( $d ) ) {
                  if ( is_file( $src . "/" . $entry )
                       && copy( $src . "/" . $entry, $dest . "/" . $entry ) ) {
!                     $this->_cvsDebug( "Copied to [$dest/$entry]" );
                  } else {
!                     $this->_cvsDebug( "Failed to copy [$src/$entry]" );
                  }
              }
--- 825,839 ----
      function _copyFilesFromDirectory( $src, $dest )
      {
!         $this->_cvsDebug( sprintf(_("Copying from [%s] to [%s]"),$src,$dest) );
  
          if ( is_dir( $src ) && is_dir( $dest ) ) {
!             $this->_cvsDebug( _("Copying") ." " );
              $d = opendir( $src );
              while ( $entry = readdir( $d ) ) {
                  if ( is_file( $src . "/" . $entry )
                       && copy( $src . "/" . $entry, $dest . "/" . $entry ) ) {
!                     $this->_cvsDebug( sprintf(_("Copied to [%s/%s]"),$dest,$entry) );
                  } else {
!                     $this->_cvsDebug( sprintf(_("Failed to copy [%s/%s]"),$src,$entry) );
                  }
              }
***************
*** 845,849 ****
              return true;
          } else {
!             $this->_cvsDebug( "Not copying" );
              return false;
          }
--- 841,845 ----
              return true;
          } else {
!             $this->_cvsDebug( _("Not copying") );
              return false;
          }

PhpWikiSystemverwalten

[[no a. g. (PhpWiki)]

__Note__: Most of the actions on this page require administrative =
privileges.
They won't work unless you have set an admin username and password in the =
PhpWiki config file.

-----------
! Log In

__[Log In | phpwiki:?action=3Dlogin]__

This allows you to login.
While you are logged in you will be able to ''lock'', ''unlock'' and =
''delete'' pages.
You will also be able edit ''locked'' pages.

----------

!! Making Snapshots or Backups

! ZIP files of database

These links lead to zip files, generated on the fly, which contain all
the  pages in your Wiki.  The zip file will be downloaded to your local =
computer.

This __[ZIP Snapshot | phpwiki:?action=3Dzip]__ contains only the latest =
versions
of each page, while this __[ZIP Dump | =
phpwiki:?action=3Dzip&include=3Dall]__ contains all
archived versions.

(If the PhpWiki is configured to allow it,) anyone can download a zip file.

If your php has ''zlib'' support, the files in the archive will be =
compressed,
otherwise they will just be stored.

! Dump to directory

Here you can dump pages of your Wiki into a directory of your choice.

[ Dump Pages | phpwiki:?action=3Ddumpserial&directory=3D(/tmp/wikidump) ]

The most recent version of each page will written out to the
directory, one page per file.
Your server must have write permissions to the directory!

-----------

!! Restoring

If you have dumped a set of pages from PhpWiki, you can reload them here.
Note that pages in your database will be overwritten; thus, if you dumped
your HomePage when you load it from this form it will overwrite the one
in your database now. If you want to be selective just delete
the pages from the directory (or zip file) which you don't want to load.

! Upload File

Here you can upload ZIP archives, or individual files from
your (client) machine.

[ Upload | phpwiki:?action=3Dupload&file=3D50()upload ]

! Load File

Here you can load ZIP archives, individual files or entire directories.
The file or directory must be local to the http server.
You can also use this form to load from an http: or ftp: URL.

[ Load | phpwiki:?action=3Dloadfile&source=3D50(/tmp/wikidump) ]

-----------

!! Format of the files

Currently the pages are stored, one per
file, as MIME ([ RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail
([ RFC822 | http://www.faqs.org/rfcs/rfc822.html ]) messages.
The content-type ''application/x-phpwiki'' is used, and page meta-data
is encoded in the content-type parameters.
(If the file contains several versions of a page, it will have
type ''multipart/mixed'', and contain several sub-parts, each
with type ''application/x-phpwiki''.)
The message body contains the page text.

! Old Formats

__Serialized Files__

The dump to directory command used to dump the pages as
php ''serialized()'' strings.  For humans, this made the files very hard
to read, and nearly impossible to edit.

__Plain Files__

Before that the page text was just dumped to a file --- this means
that all page meta-data was lost.

The upload and load functions will automatically recognize each of these
three types of files, and handle them accordingly.
Note that when loading ''plain files'', the page name is deduced from the
file name.

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.pgsql,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv26769/phpwiki/doc

Modified Files:
	INSTALL.pgsql 
Log Message:
troubleshooting tip, note about schema file with latest pgsql

Index: INSTALL.pgsql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.pgsql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** INSTALL.pgsql	2001/12/03 04:10:38	1.2
--- INSTALL.pgsql	2001/12/19 06:22:06	1.3
***************
*** 1,2 ****
--- 1,4 ----
+ Note: postgresql does work with phpwiki 1.3.
+ 
  FIXME: The pgsql backend has not yet been ported to the new database
  scheme.  (Though it should not be very hard, and is certainly in
***************
*** 36,39 ****
--- 38,43 ----
  </IfModule>
  
+ FIXME: php4
+ 
  (This is from a stock 6.2 Red Hat distro, which ships with an rpm of
  PHP 3.0.12, but should give you an idea. I had to add the line for
***************
*** 59,65 ****
  bash$ createdb wiki
  
! Now run the script schemas/psql.sql
  
  bash$ psql wiki -f schemas/psql.sql
  
  For some reason I had to stop/start the database so that these changes took 
--- 63,73 ----
  bash$ createdb wiki
  
! Now run the script schemas/psql.sql to create the tables:
  
  bash$ psql wiki -f schemas/psql.sql
+ 
+ (Newer versions of postgresql will require: psql wiki < schemas/psql.sql)
+ 
+ If the schema starts to load but then fails near the end, you might need to change the user name at the top of psql.sql to match that which is used by your web server; e.g. nobody, apache, or www.
  
  For some reason I had to stop/start the database so that these changes took 

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.php,1.21,1.22

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv7087/phpwiki/locale/de/LC_MESSAGES

Modified Files:
	phpwiki.php 
Log Message:
fixed string typo which inadvertantly broke the search plugins (VolltextsuchE u. TitelsuchE)

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** phpwiki.php	2001/12/19 04:54:29	1.21
--- phpwiki.php	2001/12/19 05:24:48	1.22
***************
*** 70,78 ****
     "SeiteFinden";
  $locale["Full Text Search"] =
!    "Volltextsuch";
  $locale["Full text search results for '%s'"] =
     "Volltext-Suchresultate nach »%s«";
  $locale["FullTextSearch"] =
!    "Volltextsuch";
  $locale["Get BackLinks for [pagename]"] =
     "Hole BackLinks für [pagename]";
--- 70,78 ----
     "SeiteFinden";
  $locale["Full Text Search"] =
!    "Volltextsuche";
  $locale["Full text search results for '%s'"] =
     "Volltext-Suchresultate nach »%s«";
  $locale["FullTextSearch"] =
!    "Volltextsuche";
  $locale["Get BackLinks for [pagename]"] =
     "Hole BackLinks für [pagename]";
***************
*** 226,234 ****
     "Diese Seite wurde vom Systemverwalter gesperrt und kann nicht editiert werden.";
  $locale["Title Search"] =
!    "Titelsuch";
  $locale["Title search results for '%s'"] =
     "Titel-Suchresultate nach »%s«";
  $locale["TitleSearch"] =
!    "Titelsuch";
  $locale["To cancel press the \"Back\" button of your browser."] =
     "Anderenfalls benütze die »Zurück« Funktion deines Browsers.";
--- 226,234 ----
     "Diese Seite wurde vom Systemverwalter gesperrt und kann nicht editiert werden.";
  $locale["Title Search"] =
!    "Titelsuche";
  $locale["Title search results for '%s'"] =
     "Titel-Suchresultate nach »%s«";
  $locale["TitleSearch"] =
!    "Titelsuche";
  $locale["To cancel press the \"Back\" button of your browser."] =
     "Anderenfalls benütze die »Zurück« Funktion deines Browsers.";

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.19,1.20

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv7060/phpwiki/locale/po

Modified Files:
	de.po 
Log Message:
fixed string typo which inadvertantly broke the search plugins (VolltextsuchE u. TitelsuchE)

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** de.po	2001/12/19 04:54:34	1.19
--- de.po	2001/12/19 05:24:43	1.20
***************
*** 212,220 ****
  #: ../lib/main.php:120 ../lib/plugin/FullTextSearch.php:12
  msgid "FullTextSearch"
! msgstr "Volltextsuch"
  
  #: ../lib/plugin/FullTextSearch.php:16
  msgid "Full Text Search"
! msgstr "Volltextsuch"
  
  #: ../lib/plugin/FullTextSearch.php:52
--- 212,220 ----
  #: ../lib/main.php:120 ../lib/plugin/FullTextSearch.php:12
  msgid "FullTextSearch"
! msgstr "Volltextsuche"
  
  #: ../lib/plugin/FullTextSearch.php:16
  msgid "Full Text Search"
! msgstr "Volltextsuche"
  
  #: ../lib/plugin/FullTextSearch.php:52
***************
*** 409,418 ****
  #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
! msgstr "Titelsuch"
  
  #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
! msgstr "Titelsuch"
  
  #: ../lib/plugin/TitleSearch.php:48
--- 409,418 ----
  #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
! msgstr "Titelsuche"
  
  #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
! msgstr "Titelsuche"
  
  #: ../lib/plugin/TitleSearch.php:48

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc Titelsuche,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv6423/phpwiki/locale/de/pgsrc

Modified Files:
	Titelsuche 
Log Message:
fixed line endings

Index: Titelsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Titelsuche,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Titelsuche	2001/12/18 07:58:00	1.2
--- Titelsuche	2001/12/19 05:21:19	1.3
***************
*** 1,16 ****
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: TitelSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 04:58:45 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=TitelSuche;
!   flags="";
!   lastmodified=1008496725;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin TitleSearch?>
! ----
! Wieder Suchen:
! <?plugin-form TitleSearch auto_redirect=3D0?>
! <?plugin-form FullTextSearch?>
--- 1,16 ----
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: TitelSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 04:58:45 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=Titelsuche;
!   flags="";
!   lastmodified=1008496725;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin TitleSearch?>
! ----
! Wieder Suchen:
! <?plugin-form TitleSearch auto_redirect=3D0?>
! <?plugin-form FullTextSearch?>

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc Volltextsuche,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv6394/phpwiki/locale/de/pgsrc

Modified Files:
	Volltextsuche 
Log Message:
fixed line endings

Index: Volltextsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Volltextsuche,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Volltextsuche	2001/12/18 07:58:04	1.2
--- Volltextsuche	2001/12/19 05:21:14	1.3
***************
*** 1,16 ****
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: VolltextSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:00:03 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=VolltextSuche;
!   flags="";
!   lastmodified=1008496803;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin FullTextSearch?>
! ----
! Wieder Suchen:
! <?plugin-form TitleSearch?>
! <?plugin-form FullTextSearch?>
--- 1,16 ----
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: VolltextSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:00:03 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=Volltextsuche;
!   flags="";
!   lastmodified=1008496803;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin FullTextSearch?>
! ----
! Wieder Suchen:
! <?plugin-form TitleSearch?>
! <?plugin-form FullTextSearch?>

[phpwiki-checkins] CVS: phpwiki/schemas psql.sql,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv5467/phpwiki/schemas

Modified Files:
	psql.sql 
Log Message:
suggested alternate username of 'www' in addition to 'nobody' or 'apache' in comments

Index: psql.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** psql.sql	2001/12/03 04:05:38	1.1
--- psql.sql	2001/12/19 05:16:13	1.2
***************
*** 19,23 ****
  --
  -- Commonly, connections from php are made under
! -- the user name of 'nobody' or 'apache'.  
  
  \set httpd_user	'apache'
--- 19,23 ----
  --
  -- Commonly, connections from php are made under
! -- the user name of 'nobody', 'apache' or 'www'.
  
  \set httpd_user	'apache'

[phpwiki-checkins] CVS: phpwiki/lib diff.php,1.22,1.23

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3884/lib

Modified Files:
	diff.php 
Log Message:
Fix Carsten's example translation problem using new __sprintf() function.


Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** diff.php	2001/12/18 06:28:16	1.22
--- diff.php	2001/12/19 05:07:14	1.23
***************
*** 249,254 ****
      
      $html = Element('p',
!                     sprintf(htmlspecialchars(_("Differences between %s and %s of %s.")),
!                             $new_link, $old_link, $page_link));
  
      $otherdiffs='';
--- 249,254 ----
      
      $html = Element('p',
!                     __sprintf("Differences between %s and %s of %s.",
!                               $new_link, $old_link, $page_link));
  
      $otherdiffs='';

[phpwiki-checkins] CVS: phpwiki/locale make-php-trans.awk,1.1,1.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale
In directory usw-pr-cvs1:/tmp/cvs-serv3680/locale

Modified Files:
	make-php-trans.awk 
Log Message:
Quote '$'s in translated strings.


Index: make-php-trans.awk
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/make-php-trans.awk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** make-php-trans.awk	2001/04/07 17:07:17	1.1
--- make-php-trans.awk	2001/12/19 05:06:17	1.2
***************
*** 4,27 ****
  }
  
- /^msgid ""/ {
-   if (msgid && str)
-     print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
-   str="";
-   next;
- }
- 
  /^msgid "/ { #"{
!   if (msgid && str)
      print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
    str = substr ($0, 8, length ($0) - 8);
    msgstr="";
  }
  
- /^msgstr ""/ {
-   msgid=str;
-   str="";
-   next;
- }
- 
  /^msgstr "/ { #"{
    msgid=str;
--- 4,16 ----
  }
  
  /^msgid "/ { #"{
!   if (msgid && str) {
!     gsub(/\$/, "\\$", str);
      print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
+   }
    str = substr ($0, 8, length ($0) - 8);
    msgstr="";
  }
  
  /^msgstr "/ { #"{
    msgid=str;
***************
*** 36,41 ****
  
  END {
!   if (msgid && str)
      print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
    print ("\n;?>");
  }
--- 25,32 ----
  
  END {
!   if (msgid && str) {
!     gsub(/\$/, "\\$", str);
      print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
+   }
    print ("\n;?>");
  }

[phpwiki-checkins] CVS: phpwiki/locale Makefile,1.4,1.5

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale
In directory usw-pr-cvs1:/tmp/cvs-serv3443/locale

Modified Files:
	Makefile 
Log Message:
New functions __printf, __sprintf, __vsprintf.  These are localized
versions of printf, et. al.   They differ from PHP's built-in printf
functions in that:
 1. The pass the format string through gettext().
 2. They support argument reordering ("%2$s").


Index: Makefile
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile	2001/12/17 23:03:42	1.4
--- Makefile	2001/12/19 05:05:14	1.5
***************
*** 23,27 ****
  
  po/phpwiki.pot : ${PHP_SRC}
! 	xgettext -L C++ -k_ -o $@ $^
  
  po/%.po : po/phpwiki.pot
--- 23,27 ----
  
  po/phpwiki.pot : ${PHP_SRC}
! 	xgettext -L C++ -k_ -k__printf -k__sprintf -k__vsprintf -o $@ $^
  
  po/%.po : po/phpwiki.pot

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.60,1.61

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3443/lib

Modified Files:
	stdlib.php 
Log Message:
New functions __printf, __sprintf, __vsprintf.  These are localized
versions of printf, et. al.   They differ from PHP's built-in printf
functions in that:
 1. The pass the format string through gettext().
 2. They support argument reordering ("%2$s").


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** stdlib.php	2001/12/16 18:33:25	1.60
--- stdlib.php	2001/12/19 05:05:14	1.61
***************
*** 599,602 ****
--- 599,701 ----
  }
  
+ 
+ 
+ /**
+  * Internationalized printf.
+  *
+  * This is essentially the same as PHP's built-in printf
+  * with the following exceptions:
+  * <ol>
+  * <li> It passes the format string through gettext().
+  * <li> It supports the argument reordering extensions.
+  * </ol>
+  *
+  * Example:
+  *
+  * In php code, use:
+  * <pre>
+  *    __printf("Differences between versions %s and %s of %s",
+  *             $new_link, $old_link, $page_link);
+  * </pre>
+  *
+  * Then in locale/po/de.po, one can reorder the printf arguments:
+  *
+  * <pre>
+  *    msgid "Differences between %s and %s of %s."
+  *    msgstr "Der Unterschiedsergebnis von %3$s, zwischen %1$s und %2$s."
+  * </pre>
+  *
+  * (Note that while PHP tries to expand $vars within double-quotes,
+  * the values in msgstr undergo no such expansion, so the '$'s okay...)
+  *
+  * One shouldn't use reordered arguments in the default format string.
+  * Backslashes in the default string would be necessary to escape the '$'s,
+  * and they'll cause all kinds of trouble....
+  */ 
+ function __printf ($fmt) {
+     $args = func_get_args();
+     array_shift($args);
+     echo __vsprintf($fmt, $args);
+ }
+ 
+ /**
+  * Internationalized sprintf.
+  *
+  * This is essentially the same as PHP's built-in printf
+  * with the following exceptions:
+  * <ol>
+  * <li> It passes the format string through gettext().
+  * <li> It supports the argument reordering extensions.
+  * </ol>
+  *
+  * @see __printf
+  */ 
+ function __sprintf ($fmt) {
+     $args = func_get_args();
+     array_shift($args);
+     return __vsprintf($fmt, $args);
+ }
+   
+ /**
+  * Internationalized vsprintf.
+  *
+  * This is essentially the same as PHP's built-in printf
+  * with the following exceptions:
+  * <ol>
+  * <li> It passes the format string through gettext().
+  * <li> It supports the argument reordering extensions.
+  * </ol>
+  *
+  * @see __printf
+  */ 
+ function __vsprintf ($fmt, $args) {
+     $fmt = gettext($fmt);
+     // PHP's sprintf doesn't support variable with specifiers,
+     // like sprintf("%*s", 10, "x"); --- so we won't either.
+     
+     if (preg_match_all('/(?<!%)%(\d+)\$/x', $fmt, $m)) {
+         // Format string has '%2$s' style argument reordering.
+         // PHP doesn't support this.
+         if (preg_match('/(?<!%)%[- ]?\d*[^- \d$]/x', $fmt))
+             trigger_error("Can't mix '%1\$s' with '%s' type format strings", E_USER_WARNING);
+     
+         $fmt = preg_replace('/(?<!%)%\d+\$/x', '%', $fmt);
+         $newargs = array();
+     
+         // Reorder arguments appropriately.
+         foreach($m[1] as $argnum) {
+             if ($argnum < 1 || $argnum > count($args))
+                 trigger_error("$argnum: argument index out of range", E_USER_WARNING);
+             $newargs[] = $args[$argnum - 1];
+         }
+         $args = $newargs;
+     }
+ 
+     // Not all PHP's have vsprintf, so...
+     array_unshift($args, $fmt);
+     return call_user_func_array('sprintf', $args);
+ }
+ 
+ 
  // (c-file-style: "gnu")
  // Local Variables:

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.18,1.19

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv1993/phpwiki/locale/po

Modified Files:
	de.po 
Log Message:
fixed Titelsuch (was incorrectly translated as Volltextsuch)

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** de.po	2001/12/19 03:41:45	1.18
--- de.po	2001/12/19 04:54:34	1.19
***************
*** 409,418 ****
  #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
! msgstr "Volltextsuch"
  
  #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
! msgstr "Volltextsuch"
  
  #: ../lib/plugin/TitleSearch.php:48
--- 409,418 ----
  #: ../lib/plugin/RecentChanges.php:251 ../lib/plugin/TitleSearch.php:16
  msgid "Title Search"
! msgstr "Titelsuch"
  
  #: ../lib/main.php:123 ../lib/plugin/RecentChanges.php:253
  #: ../lib/plugin/TitleSearch.php:12
  msgid "TitleSearch"
! msgstr "Titelsuch"
  
  #: ../lib/plugin/TitleSearch.php:48

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.php,1.20,1.21

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv1976/phpwiki/locale/de/LC_MESSAGES

Modified Files:
	phpwiki.php 
Log Message:
fixed Titelsuch (was incorrectly translated as Volltextsuch)

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** phpwiki.php	2001/12/19 03:41:39	1.20
--- phpwiki.php	2001/12/19 04:54:29	1.21
***************
*** 226,234 ****
     "Diese Seite wurde vom Systemverwalter gesperrt und kann nicht editiert werden.";
  $locale["Title Search"] =
!    "Volltextsuch";
  $locale["Title search results for '%s'"] =
     "Titel-Suchresultate nach »%s«";
  $locale["TitleSearch"] =
!    "Volltextsuch";
  $locale["To cancel press the \"Back\" button of your browser."] =
     "Anderenfalls benütze die »Zurück« Funktion deines Browsers.";
--- 226,234 ----
     "Diese Seite wurde vom Systemverwalter gesperrt und kann nicht editiert werden.";
  $locale["Title Search"] =
!    "Titelsuch";
  $locale["Title search results for '%s'"] =
     "Titel-Suchresultate nach »%s«";
  $locale["TitleSearch"] =
!    "Titelsuch";
  $locale["To cancel press the \"Back\" button of your browser."] =
     "Anderenfalls benütze die »Zurück« Funktion deines Browsers.";

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,1.11,1.12

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv1960/phpwiki/locale/de/LC_MESSAGES

Modified Files:
	phpwiki.mo 
Log Message:
fixed Titelsuch (was incorrectly translated as Volltextsuch)

Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
Binary files /tmp/cvsEiV1JP and /tmp/cvsuQfAev differ

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc WieManWikiBenutzt,1.5,1.6

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv1681/phpwiki/locale/de/pgsrc

Modified Files:
	WieManWikiBenutzt 
Log Message:
fixed line ending translation

Index: WieManWikiBenutzt
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WieManWikiBenutzt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** WieManWikiBenutzt	2001/12/16 11:47:28	1.5
--- WieManWikiBenutzt	2001/12/19 04:52:40	1.6
***************
*** 1,118 ****
  From [no address given]  Sun Dec 16 06:33:24 2001
- 
  Subject: WieManWikiBenutzt
- 
  From: [no address given] (PhpWiki)
- 
  Date: Sun, 16 Dec 2001 05:22:03 -0500
- 
  Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
- 
  Content-Type: application/x-phpwiki;
- 
    pagename=WieManWikiBenutzt;
- 
    flags="";
- 
  Content-Transfer-Encoding: quoted-printable
  
- 
- 
  ''=ABWiki wiki=BB'' hei=DFt =ABschnell=BB auf Hawai'anisch.
  
- 
- 
  __Alles was du wissen mu=DFt ist:__
  
- 
- 
  * Klicke auf =ABEditiereText=BB am unteren Ende der Seite, um sie zu =
- 
  bearbeiten. Du solltest das gleich jetzt tun und den Quelltext dieser =
- 
  Seite lesen - es ergibt dann mehr Sinn.
- 
  * Kursiven Text bekommt man, indem man W=F6rter in jeweils zwei =
- 
  Apostrophen ' einschlie=DFt, ''wie in diesem Beispiel''.
- 
  * Fette Schrift bekommt man, indem man W=F6rter in jeweils zwei =
- 
  untergesetzten Strichen einschlie=DFt, __wie in diesem Beispiel__
- 
  * Und beides, indem man __''beides verwendet''__.
- 
  * Eine Liste erh=E4lt man, indem man eine Zeile mit einem Sternchen =
- 
  =AB*=BB startet.
- 
  * Vorformatierten Text r=FCckt man mit mindestens einem Leerzeichen ein:
  
- 
- 
   Das ist ein Gedicht
- 
   =FCber vorformatierten Text
- 
   Es gibt Reime mit Gedicht
- 
   aber nicht mit Text
  
- 
- 
  * Abs=E4tze werden durch eine Leerzeile voneinander getrennt.
  
- 
- 
  Ich bin ein Absatz.
  
- 
- 
  Ich bin auch ein Absatz. Wir sind halt sehr kleine Abs=E4tze.
  
- 
- 
  * Eine horizontale Trennlinie bekommt man indem man vier oder mehr =
- 
  Bindestriche an den Anfang einer Zeile stellt:
- 
  ----
- 
  * Links kann man erzeugen, indem man einzelne W=F6rter, deren =
- 
  Anfangsbuchstabe gro=DF geschrieben wird, zusammenf=FCgt. Wenn du also =
- 
  etwa eine Seite dar=FCber  schreiben willst, da=DF Arno Ratten mag, =
- 
  schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert =
- 
  erscheint dahinter ein Fragezeichen, das dir die M=F6glichkeit gibt die =
- 
  Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das =
- 
  Beispiel nicht, indem du diese Seite erzeugst).
- 
  * Um externe Links zu setzen, kannst du einfach die Adresse eintippen und =
- 
  PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
- 
  * Um Bilder einzuf=FCgen, schlie=DFt man deren Adresse in eckigen Klammern =
- 
  ein, wie hier: [[!http://www.deinhost.de/bilder/bild.png]. Falls die =
- 
  Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die =
- 
  Adresse (nicht aber das Bild) angezeigt.
- 
  * Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
  
- 
- 
  ----
- 
  WikiWikiWeb soll schnell und einfach zu editieren sein. Es hat eine sehr
- 
  einfache Syntax, =FCber die du in TextFormatierungsRegeln mehr erfahren =
- 
  kannst.
- 
--- 1,59 ----

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc SeiteFinden,1.5,1.6

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv1653/phpwiki/locale/de/pgsrc

Modified Files:
	SeiteFinden 
Log Message:
fixed line ending translation

Index: SeiteFinden
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SeiteFinden,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SeiteFinden	2001/12/18 07:57:46	1.5
--- SeiteFinden	2001/12/19 04:52:35	1.6
***************
*** 1,74 ****
  From [no address given]  Tue Dec 18 02:37:26 2001
- 
  Subject: SeiteFinden
- 
  From: [no address given] (PhpWiki)
- 
  Date: Sun, 16 Dec 2001 05:22:02 -0500
- 
  Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
- 
  Content-Type: application/x-phpwiki;
- 
    pagename=SeiteFinden;
- 
    flags=PAGE_LOCKED;
- 
    lastmodified=1008498122;
- 
  Content-Transfer-Encoding: quoted-printable
  
- 
- 
  Als Startpunkt zum Herumst=F6bern im Wiki eignen sich am besten die =
- 
  folgenden Seiten:
  
- 
- 
  * WieManWikiBenutzt sagt wie die Sache hier in einem Wiki funzt.
- 
  * FrischeSeiten ist eine automatisch erstellte Liste der ge=E4nderten =
- 
  Seiten.
- 
  * WikiTechnik erkl=E4rt die Technik, mit der PhpWiki arbeitet.
  
  
  
- 
- 
- 
- 
  Hier ist eine Suche nach Seitentiteln. Suche zum Beispiel nach ''wiki'' =
- 
  oder ''sandwich''.
  
- 
- 
  <?plugin-form TitleSearch?>
  
- 
- 
  Und hier ist eine Volltextsuche. Die Suche dauert ein paar Sekunden. Im =
- 
  Suchergebnis werden die Zeilen aus den gefundenen Seiten angezeigt, in =
- 
  denen ein Suchbegriff gefunden wurde.
  
- 
- 
  <?plugin-form FullTextSearch?>
  
- 
- 
  ------
- 
  Separate words with a space. All words have to match.
- 
  %%%To exclude words prepend a '-'.
- 
  %%%Example: 'wiki text -php' looks for all pages containing the words 'wiki'
- 
  __and__ 'text', but __not__ containing the word 'php'.
- 
--- 1,37 ----