From: <min...@us...> - 2006-12-13 20:06:31
|
Revision: 15448 http://svn.sourceforge.net/gallery/?rev=15448&view=rev Author: mindless Date: 2006-12-13 12:05:02 -0800 (Wed, 13 Dec 2006) Log Message: ----------- extract.php doesn't support translate(array('text'=>'one part' . 'next part' so change the 6 places this was done to use 'one string' Modified Paths: -------------- trunk/gallery2/modules/core/CoreModuleExtras.inc trunk/gallery2/modules/core/po/af.po trunk/gallery2/modules/core/po/ar.po trunk/gallery2/modules/core/po/bg.po trunk/gallery2/modules/core/po/ca.po trunk/gallery2/modules/core/po/cs.po trunk/gallery2/modules/core/po/da.po trunk/gallery2/modules/core/po/de.po trunk/gallery2/modules/core/po/el.po trunk/gallery2/modules/core/po/en_GB.po trunk/gallery2/modules/core/po/es.po trunk/gallery2/modules/core/po/es_AR.po trunk/gallery2/modules/core/po/es_MX.po trunk/gallery2/modules/core/po/et.po trunk/gallery2/modules/core/po/eu.po trunk/gallery2/modules/core/po/fi.po trunk/gallery2/modules/core/po/fr.po trunk/gallery2/modules/core/po/ga.po trunk/gallery2/modules/core/po/he.po trunk/gallery2/modules/core/po/hu.po trunk/gallery2/modules/core/po/is.po trunk/gallery2/modules/core/po/it.po trunk/gallery2/modules/core/po/ja.po trunk/gallery2/modules/core/po/ko.po trunk/gallery2/modules/core/po/lt.po trunk/gallery2/modules/core/po/lv.po trunk/gallery2/modules/core/po/nl.po trunk/gallery2/modules/core/po/no.po trunk/gallery2/modules/core/po/pl.po trunk/gallery2/modules/core/po/pt.po trunk/gallery2/modules/core/po/pt_BR.po trunk/gallery2/modules/core/po/ro.po trunk/gallery2/modules/core/po/ru.po trunk/gallery2/modules/core/po/sk.po trunk/gallery2/modules/core/po/sl.po trunk/gallery2/modules/core/po/sr.po trunk/gallery2/modules/core/po/strings.raw trunk/gallery2/modules/core/po/sv.po trunk/gallery2/modules/core/po/tr.po trunk/gallery2/modules/core/po/uk.po trunk/gallery2/modules/core/po/vi.po trunk/gallery2/modules/core/po/zh_CN.po trunk/gallery2/modules/core/po/zh_TW.po trunk/gallery2/modules/migrate/module.inc trunk/gallery2/modules/migrate/po/af.po trunk/gallery2/modules/migrate/po/cs.po trunk/gallery2/modules/migrate/po/de.po trunk/gallery2/modules/migrate/po/es.po trunk/gallery2/modules/migrate/po/eu.po trunk/gallery2/modules/migrate/po/fi.po trunk/gallery2/modules/migrate/po/fr.po trunk/gallery2/modules/migrate/po/ga.po trunk/gallery2/modules/migrate/po/is.po trunk/gallery2/modules/migrate/po/it.po trunk/gallery2/modules/migrate/po/ja.po trunk/gallery2/modules/migrate/po/nl.po trunk/gallery2/modules/migrate/po/no.po trunk/gallery2/modules/migrate/po/pl.po trunk/gallery2/modules/migrate/po/pt.po trunk/gallery2/modules/migrate/po/ru.po trunk/gallery2/modules/migrate/po/sk.po trunk/gallery2/modules/migrate/po/sr.po trunk/gallery2/modules/migrate/po/strings.raw trunk/gallery2/modules/migrate/po/sv.po trunk/gallery2/modules/migrate/po/tr.po trunk/gallery2/modules/migrate/po/zh_CN.po trunk/gallery2/modules/migrate/po/zh_TW.po trunk/gallery2/modules/quotas/DiskQuotaOption.inc trunk/gallery2/modules/quotas/po/af.po trunk/gallery2/modules/quotas/po/ca.po trunk/gallery2/modules/quotas/po/cs.po trunk/gallery2/modules/quotas/po/da.po trunk/gallery2/modules/quotas/po/de.po trunk/gallery2/modules/quotas/po/es.po trunk/gallery2/modules/quotas/po/et.po trunk/gallery2/modules/quotas/po/eu.po trunk/gallery2/modules/quotas/po/fr.po trunk/gallery2/modules/quotas/po/it.po trunk/gallery2/modules/quotas/po/ja.po trunk/gallery2/modules/quotas/po/ko.po trunk/gallery2/modules/quotas/po/nl.po trunk/gallery2/modules/quotas/po/no.po trunk/gallery2/modules/quotas/po/pl.po trunk/gallery2/modules/quotas/po/ru.po trunk/gallery2/modules/quotas/po/sk.po trunk/gallery2/modules/quotas/po/sr.po trunk/gallery2/modules/quotas/po/strings.raw trunk/gallery2/modules/quotas/po/sv.po trunk/gallery2/modules/quotas/po/tr.po trunk/gallery2/modules/quotas/po/zh_CN.po trunk/gallery2/modules/quotas/po/zh_TW.po Modified: trunk/gallery2/modules/core/CoreModuleExtras.inc =================================================================== --- trunk/gallery2/modules/core/CoreModuleExtras.inc 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/CoreModuleExtras.inc 2006-12-13 20:05:02 UTC (rev 15448) @@ -978,8 +978,8 @@ /* Prevent apache timeout */ $ret = $statusMonitor->renderStatusMessage( $module->translate( - array('text' => 'Detecting broken derivatives, loading ' . - '(%d derivatives checked, %d remaining)', + array('text' => + 'Detecting broken derivatives, loading (%d derivatives checked, %d remaining)', 'arg1' => $itemsProcessed, 'arg2' => sizeof($derivativeIds))), '', $itemsProcessed / $totalDerivatives); @@ -1009,8 +1009,8 @@ $itemsProcessed == $totalDerivatives) { $ret = $statusMonitor->renderStatusMessage( $module->translate( - array('text' => 'Detecting broken derivatives ' . - '(%d derivatives checked, %d remaining)', + array('text' => + 'Detecting broken derivatives (%d derivatives checked, %d remaining)', 'arg1' => $itemsProcessed, 'arg2' => $totalDerivatives - $itemsProcessed)), '', $itemsProcessed / $totalDerivatives); @@ -1066,9 +1066,8 @@ $ret = $statusMonitor->renderStatusMessage( $module->translate( - array('text' => 'Detecting broken derivatives, ' . - 'saving ' . - '(%d derivatives checked, %d remaining)', + array('text' => + 'Detecting broken derivatives, saving (%d derivatives checked, %d remaining)', 'arg1' => $itemsProcessed, 'arg2' => $totalDerivatives - $itemsProcessed)), '', $itemsProcessed / $totalDerivatives); @@ -1088,9 +1087,8 @@ if ($itemsSaved % $saveProgressStepSize == 0) { $ret = $statusMonitor->renderStatusMessage( $module->translate( - array('text' => 'Detecting broken derivatives, saving ' . - 'item %d of %d ' . - '(%d derivatives complete, %d remaining)', + array('text' => + 'Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)', 'arg1' => $itemsSaved, 'arg2' => sizeof($brokenDerivatives), 'arg3' => $itemsProcessed, Modified: trunk/gallery2/modules/core/po/af.po =================================================================== --- trunk/gallery2/modules/core/po/af.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/af.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -238,18 +238,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Kry stukkende afgeleides, laai" -msgid "Detecting broken derivatives " -msgstr "Kry stukkende afgeleides " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Kry stukkende afgeleides, stoor" -msgid "Detecting broken derivatives, " -msgstr "Kry stukkende afgeleides, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Kry stukkende afgeleides, stoor" +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "" + #, fuzzy, c-format msgid "Deleting old session files (iteration %d)" msgstr "Verwyder ouer regtetabelle" @@ -3650,6 +3655,12 @@ msgid "Links to album/photo peers" msgstr "Skakel na album/foto op gelyke vlak" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Kry stukkende afgeleides " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Kry stukkende afgeleides, " + #~ msgid "Unit test module" #~ msgstr "Eenheidstoetsmodule" Modified: trunk/gallery2/modules/core/po/ar.po =================================================================== --- trunk/gallery2/modules/core/po/ar.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ar.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -237,16 +237,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, fuzzy, c-format Modified: trunk/gallery2/modules/core/po/bg.po =================================================================== --- trunk/gallery2/modules/core/po/bg.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/bg.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -241,16 +241,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, c-format Modified: trunk/gallery2/modules/core/po/ca.po =================================================================== --- trunk/gallery2/modules/core/po/ca.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ca.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -237,19 +237,24 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectant derivades trencades, carregant " -msgid "Detecting broken derivatives " -msgstr "Detectant derivades trencades" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectant derivades trencades, guardant" -msgid "Detecting broken derivatives, " -msgstr "Detectant derivades trencades" - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectant derivades trencades, guardant" #, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "" + +#, c-format msgid "Deleting old session files (iteration %d)" msgstr "Borrant arxius de sessió antics (iteració %d)" @@ -3621,6 +3626,12 @@ msgid "Links to album/photo peers" msgstr "Enllaços als parells d'àlbum/foto" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectant derivades trencades" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectant derivades trencades" + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/cs.po =================================================================== --- trunk/gallery2/modules/core/po/cs.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/cs.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -236,18 +236,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Aktualizuji oprávnění (%d položek hotových, %d zbývá)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detekuji chybné zmenšeniny, nahrávám " -msgid "Detecting broken derivatives " -msgstr "Detekuji chybné zmenšeniny " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detekuji chybné zmenšeniny, ukládám " -msgid "Detecting broken derivatives, " -msgstr "Detekuji chybné zmenšeniny, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detekuji chybné zmenšeniny, ukládám " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Aktualizuji oprávnění (%d položek hotových, %d zbývá)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Mažu staré session soubory (průchod %d)" @@ -3618,6 +3623,12 @@ msgid "Links to album/photo peers" msgstr "Odkazy na vrstevníky alba/fotografie" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detekuji chybné zmenšeniny " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detekuji chybné zmenšeniny, " + #, fuzzy #~ msgid "Mock module" #~ msgstr "Moduly" Modified: trunk/gallery2/modules/core/po/da.po =================================================================== --- trunk/gallery2/modules/core/po/da.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/da.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -239,18 +239,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Opgraderer tilladelser (%d opjekter er færdige, der mangler %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Finder afledte filer med fejl, henter " -msgid "Detecting broken derivatives " -msgstr "Finder afledte filer med fejl " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Finder afledte filer med fejl, gemmer " -msgid "Detecting broken derivatives, " -msgstr "Finder afledte filer med fejl, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Finder afledte filer med fejl, gemmer " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Opgraderer tilladelser (%d opjekter er færdige, der mangler %d)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Sletter gamle 'session' filer (gennemløb %d)" @@ -3636,6 +3641,12 @@ msgid "Links to album/photo peers" msgstr "Links til album/foto 'peers'" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Finder afledte filer med fejl " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Finder afledte filer med fejl, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/de.po =================================================================== --- trunk/gallery2/modules/core/po/de.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/de.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -241,18 +241,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Zugriffsrechte werden aktualisiert (%d Elemente abgeschlossen, %d verbleibend)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Defekte Bildderivate werden ermittelt, lade " -msgid "Detecting broken derivatives " -msgstr "Defekte Bildderivate werden ermittelt " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Defekte Bildderivate werden ermittelt, speichere " -msgid "Detecting broken derivatives, " -msgstr "Defekte Bildderivate werden ermittelt, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Defekte Bildderivate werden ermittelt, speichere " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Zugriffsrechte werden aktualisiert (%d Elemente abgeschlossen, %d verbleibend)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Lösche alte Session Dateien (Durchlauf %d)" @@ -3721,6 +3726,12 @@ msgid "Links to album/photo peers" msgstr "Verweise zu angrenzenden Alben/Photos" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Defekte Bildderivate werden ermittelt " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Defekte Bildderivate werden ermittelt, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/el.po =================================================================== --- trunk/gallery2/modules/core/po/el.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/el.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -244,16 +244,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, fuzzy, c-format Modified: trunk/gallery2/modules/core/po/en_GB.po =================================================================== --- trunk/gallery2/modules/core/po/en_GB.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/en_GB.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -230,16 +230,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, c-format Modified: trunk/gallery2/modules/core/po/es.po =================================================================== --- trunk/gallery2/modules/core/po/es.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/es.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -234,18 +234,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Actualizando permisos (%d elementos competos, faltan %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, cargando " -msgid "Detecting broken derivatives " -msgstr "Detectando derivadas rotas " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectando derivadas rotas, guardando " -msgid "Detecting broken derivatives, " -msgstr "Detectando derivadas rotas, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, guardando " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Actualizando permisos (%d elementos competos, faltan %d)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Borrando los ficheros de sesión antiguos (interacción %d)" @@ -3669,6 +3674,12 @@ msgid "Links to album/photo peers" msgstr "Enlaces a los pares de álbum/foto" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectando derivadas rotas " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectando derivadas rotas, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/es_AR.po =================================================================== --- trunk/gallery2/modules/core/po/es_AR.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/es_AR.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -247,19 +247,24 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Actualizando permisos (%d elementos competos, faltan %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, cargando " -msgid "Detecting broken derivatives " -msgstr "Detectando derivadas rotas " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectando derivadas rotas, guardando " -msgid "Detecting broken derivatives, " -msgstr "Detectando derivadas rotas, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, guardando " #, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Actualizando permisos (%d elementos competos, faltan %d)" + +#, fuzzy, c-format msgid "Deleting old session files (iteration %d)" msgstr "permisos" @@ -3985,6 +3990,15 @@ msgid "Links to album/photo peers" msgstr "Enlaces a los pares de álbum/foto" +#~ msgid "Detecting broken derivatives, loading " +#~ msgstr "Detectando derivadas rotas, cargando " + +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectando derivadas rotas " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectando derivadas rotas, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/es_MX.po =================================================================== --- trunk/gallery2/modules/core/po/es_MX.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/es_MX.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -249,19 +249,24 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Actualizando permisos (%d elementos competos, faltan %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, cargando " -msgid "Detecting broken derivatives " -msgstr "Detectando derivadas rotas " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectando derivadas rotas, guardando " -msgid "Detecting broken derivatives, " -msgstr "Detectando derivadas rotas, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectando derivadas rotas, guardando " #, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Actualizando permisos (%d elementos competos, faltan %d)" + +#, fuzzy, c-format msgid "Deleting old session files (iteration %d)" msgstr "editar permisos %s" @@ -4010,6 +4015,15 @@ msgid "Links to album/photo peers" msgstr "Enlaces a los pares de álbum/foto" +#~ msgid "Detecting broken derivatives, loading " +#~ msgstr "Detectando derivadas rotas, cargando " + +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectando derivadas rotas " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectando derivadas rotas, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/et.po =================================================================== --- trunk/gallery2/modules/core/po/et.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/et.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -232,18 +232,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Õiguste uuendamine (%d pilti/albumit valmis, %d veel)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Katkiste tuletiste avastamine, sisse lugemine" -msgid "Detecting broken derivatives " -msgstr "Katkiste tuletiste avastamine" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Katkiste tuletiste avastamine, salvestamine" -msgid "Detecting broken derivatives, " -msgstr "Katkiste tuletiste avastamine," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Katkiste tuletiste avastamine, salvestamine" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Õiguste uuendamine (%d pilti/albumit valmis, %d veel)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Vanade sessioonifailide kustutamine (iteratsioon %d)" @@ -3452,6 +3457,12 @@ msgid "Links to album/photo peers" msgstr "" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Katkiste tuletiste avastamine" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Katkiste tuletiste avastamine," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/eu.po =================================================================== --- trunk/gallery2/modules/core/po/eu.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/eu.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -237,18 +237,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Baimenak eguneratzen (%d elementu buruturik, %d falta dira)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Hautsitako eratorriak atzematen, kargatzen " -msgid "Detecting broken derivatives " -msgstr "Hautsitako eratorriak atzematen " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Hautsitako eratorriak atzematen, gordetzen " -msgid "Detecting broken derivatives, " -msgstr "Hautsitako eratorriak atzematen, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Hautsitako eratorriak atzematen, gordetzen " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Baimenak eguneratzen (%d elementu buruturik, %d falta dira)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Saio fitxategi zaharrak ezabatzen (%d iterazioa)" @@ -3635,6 +3640,12 @@ msgid "Links to album/photo peers" msgstr "Ondoko album/argazkietara loturak" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Hautsitako eratorriak atzematen " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Hautsitako eratorriak atzematen, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/fi.po =================================================================== --- trunk/gallery2/modules/core/po/fi.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/fi.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -240,18 +240,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Etsii rikkoutuneita johdannaisia, lataa " -msgid "Detecting broken derivatives " -msgstr "Etsii rikkoutuneita johdannaisia" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Etsii rikkoutuneita johdannaisia, tallentaa " -msgid "Detecting broken derivatives, " -msgstr "Etsii rikkoutuneita johdannaisia, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Etsii rikkoutuneita johdannaisia, tallentaa " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "" + #, fuzzy, c-format msgid "Deleting old session files (iteration %d)" msgstr "Poistaa vanhoja oikeus tietoja" @@ -3597,6 +3602,12 @@ msgid "Links to album/photo peers" msgstr "Linkit albumin/kuvan vastapuoliin" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Etsii rikkoutuneita johdannaisia" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Etsii rikkoutuneita johdannaisia, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/fr.po =================================================================== --- trunk/gallery2/modules/core/po/fr.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/fr.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -235,18 +235,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Mise à jour des permissions en cours (%d éléments traités, %d à faire)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Détection des images dérivées corrompues, chargement " -msgid "Detecting broken derivatives " -msgstr "Détection des images dérivées corrompues " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Détection des images dérivées corrompues, sauvegarde " -msgid "Detecting broken derivatives, " -msgstr "Détection des images dérivées corrompues, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Détection des images dérivées corrompues, sauvegarde " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Mise à jour des permissions en cours (%d éléments traités, %d à faire)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Suppression des anciens fichiers de session (itération %d)" @@ -3690,6 +3695,12 @@ msgid "Links to album/photo peers" msgstr "Liens vers les éléments voisins" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Détection des images dérivées corrompues " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Détection des images dérivées corrompues, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1 : Blackjack" Modified: trunk/gallery2/modules/core/po/ga.po =================================================================== --- trunk/gallery2/modules/core/po/ga.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ga.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -277,16 +277,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, fuzzy, c-format Modified: trunk/gallery2/modules/core/po/he.po =================================================================== --- trunk/gallery2/modules/core/po/he.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/he.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -234,18 +234,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "משדרג הרשאות (%d פריטים הושלמו, נותרו %d פריטים)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "מזהה נגזרות שבורות, טוען " -msgid "Detecting broken derivatives " -msgstr "מזהה נגזרות שבורות " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "מזהה נגזרות שבורות, שומר " -msgid "Detecting broken derivatives, " -msgstr "מזהה נגזרות שבורות, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "מזהה נגזרות שבורות, שומר " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "משדרג הרשאות (%d פריטים הושלמו, נותרו %d פריטים)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "מוחק את קבצי הסשן הישנים (מחזור %d)" @@ -3548,6 +3553,12 @@ msgid "Links to album/photo peers" msgstr "" +#~ msgid "Detecting broken derivatives " +#~ msgstr "מזהה נגזרות שבורות " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "מזהה נגזרות שבורות, " + #, fuzzy #~ msgid "Unit test module" #~ msgstr "מודול בדיקת יחידה" Modified: trunk/gallery2/modules/core/po/hu.po =================================================================== --- trunk/gallery2/modules/core/po/hu.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/hu.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -243,16 +243,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, fuzzy, c-format Modified: trunk/gallery2/modules/core/po/is.po =================================================================== --- trunk/gallery2/modules/core/po/is.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/is.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -231,16 +231,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, c-format Modified: trunk/gallery2/modules/core/po/it.po =================================================================== --- trunk/gallery2/modules/core/po/it.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/it.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -239,18 +239,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Aggiornamento permessi in corso (%d oggetti completati, %d rimanenti)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Ricerca derivati danneggiati, caricamento" -msgid "Detecting broken derivatives " -msgstr "Ricerca derivati danneggiati" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Ricerca derivati danneggiati, salvataggio" -msgid "Detecting broken derivatives, " -msgstr "Ricerca derivati danneggiati," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Ricerca derivati danneggiati, salvataggio" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Aggiornamento permessi in corso (%d oggetti completati, %d rimanenti)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Eliminazione vecchi file di sessione (iterazione %d)" @@ -3677,6 +3682,12 @@ msgid "Links to album/photo peers" msgstr "Link ai peers della foto/album" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Ricerca derivati danneggiati" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Ricerca derivati danneggiati," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/ja.po =================================================================== --- trunk/gallery2/modules/core/po/ja.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ja.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -233,18 +233,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "パーミッションを更新中( %d の項目が完了、残り %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "壊れた派生物を検出しています ロード中" -msgid "Detecting broken derivatives " -msgstr "壊れた派生物を検出しています " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "壊れた派生物を検出しています 保存中" -msgid "Detecting broken derivatives, " -msgstr "壊れた派生物を検出しています、" - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "壊れた派生物を検出しています 保存中" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "パーミッションを更新中( %d の項目が完了、残り %d)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "古いセッションファイルを削除しています( %d の繰り返し )" @@ -3611,6 +3616,12 @@ msgid "Links to album/photo peers" msgstr "アルバム/画像へのリンク" +#~ msgid "Detecting broken derivatives " +#~ msgstr "壊れた派生物を検出しています " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "壊れた派生物を検出しています、" + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/ko.po =================================================================== --- trunk/gallery2/modules/core/po/ko.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ko.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -239,17 +239,22 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "권한 업그레이드중입니다. (%d 아이템 완료, %d 남았습니다.)" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " -msgstr "" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "권한 업그레이드중입니다. (%d 아이템 완료, %d 남았습니다.)" -msgid "Detecting broken derivatives, " -msgstr "" +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" +msgstr "권한 업그레이드중입니다. (%d 아이템 완료, %d 남았습니다.)" -msgid "Detecting broken derivatives, saving " -msgstr "" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "권한 업그레이드중입니다. (%d 아이템 완료, %d 남았습니다.)" #, c-format msgid "Deleting old session files (iteration %d)" Modified: trunk/gallery2/modules/core/po/lt.po =================================================================== --- trunk/gallery2/modules/core/po/lt.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/lt.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -241,18 +241,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Atnaujinamos prieigos teisės (%d pakeista, liko %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Ieškoma blogų pagalbinių failų, įkeliama " -msgid "Detecting broken derivatives " -msgstr "Ieškoma blogų pagalbinių failų " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Ieškoma blogų pagalbinių failų, išsaugoma " -msgid "Detecting broken derivatives, " -msgstr "Ieškoma blogų pagalbinių failų, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Ieškoma blogų pagalbinių failų, išsaugoma " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Atnaujinamos prieigos teisės (%d pakeista, liko %d)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Šalinami seni sesijos failai (pakartojimas %d)" @@ -3654,6 +3659,12 @@ msgid "Links to album/photo peers" msgstr "Nuorodos į albumus/fotografijas" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Ieškoma blogų pagalbinių failų " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Ieškoma blogų pagalbinių failų, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/lv.po =================================================================== --- trunk/gallery2/modules/core/po/lv.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/lv.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -240,18 +240,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Atjauno tiesības (%d vienumi pabeigti, %d atlikuši)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Nosaka sabojātos atvasinājumus, ielādē" -msgid "Detecting broken derivatives " -msgstr "Nosaka sabojātos atvasinājumus" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Nosaka sabojātos atvasinājumus, saglabā" -msgid "Detecting broken derivatives, " -msgstr "Nosaka sabojātos atvasinājumus," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Nosaka sabojātos atvasinājumus, saglabā" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Atjauno tiesības (%d vienumi pabeigti, %d atlikuši)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Dzēš vecos sesiju failus (%d iterācija)" @@ -3365,6 +3370,12 @@ msgid "Links to album/photo peers" msgstr "" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Nosaka sabojātos atvasinājumus" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Nosaka sabojātos atvasinājumus," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/nl.po =================================================================== --- trunk/gallery2/modules/core/po/nl.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/nl.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -238,18 +238,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Permissie wijzigingen doorvoeren (%d items gereed, %d te gaan)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detecteren foute afgeleiden, laden " -msgid "Detecting broken derivatives " -msgstr "Detecteren foute afgeleiden " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detecteren foute afgeleiden, opslaan " -msgid "Detecting broken derivatives, " -msgstr "Detecteren foute afgeleiden, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detecteren foute afgeleiden, opslaan " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Permissie wijzigingen doorvoeren (%d items gereed, %d te gaan)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Verwijder oude sessie bestanden (iteration %d)" @@ -3671,6 +3676,12 @@ msgid "Links to album/photo peers" msgstr "Linken naar album/foto gelijken" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detecteren foute afgeleiden " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detecteren foute afgeleiden, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/no.po =================================================================== --- trunk/gallery2/modules/core/po/no.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/no.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -233,18 +233,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Oppgraderer tilganger (%d objekter fullført, %d gjenstår)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Gjenkjenner ugyldige avledninger, laster " -msgid "Detecting broken derivatives " -msgstr "Gjenkjenner ugyldige avledninger " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Gjenkjenner ugyldige avledninger, lagrer " -msgid "Detecting broken derivatives, " -msgstr "Gjenkjenner ugyldige avledninger, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Gjenkjenner ugyldige avledninger, lagrer " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Oppgraderer tilganger (%d objekter fullført, %d gjenstår)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Sletter gamle tilgangstabeller (iterasjon %d)" @@ -3612,6 +3617,12 @@ msgid "Links to album/photo peers" msgstr "Lenker til album/fotonoder" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Gjenkjenner ugyldige avledninger " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Gjenkjenner ugyldige avledninger, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/pl.po =================================================================== --- trunk/gallery2/modules/core/po/pl.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/pl.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -236,18 +236,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Aktualizacja uprawnień (skończone pozycje: %d; pozostałe pozycje: %d)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Wykrywanie uszkodzonych zmiennych, ładowanie " -msgid "Detecting broken derivatives " -msgstr "Wykrywanie uszkodzonych zmiennych " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Wykrywanie uszkodzonych zmiennych, zapisywanie " -msgid "Detecting broken derivatives, " -msgstr "Wykrywanie uszkodzonych zmiennych, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Wykrywanie uszkodzonych zmiennych, zapisywanie " +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Aktualizacja uprawnień (skończone pozycje: %d; pozostałe pozycje: %d)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Usuwanie starych plików sesji (krok %d)" @@ -3627,6 +3632,12 @@ msgid "Links to album/photo peers" msgstr "Linki do albumów i zdjęć znajomych" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Wykrywanie uszkodzonych zmiennych " + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Wykrywanie uszkodzonych zmiennych, " + #~ msgid "Unit test module" #~ msgstr "Moduł testów poprawności programu" Modified: trunk/gallery2/modules/core/po/pt.po =================================================================== --- trunk/gallery2/modules/core/po/pt.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/pt.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -246,16 +246,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, fuzzy, c-format Modified: trunk/gallery2/modules/core/po/pt_BR.po =================================================================== --- trunk/gallery2/modules/core/po/pt_BR.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/pt_BR.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -236,18 +236,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectando derivativas corrompidas, carregando" -msgid "Detecting broken derivatives " -msgstr "Detectando derivativas corrompidas" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectando derivativas corrompidas, salvando " -msgid "Detecting broken derivatives, " -msgstr "Detectando derivativas corrompidas, " - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectando derivativas corrompidas, salvando " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "" + #, fuzzy, c-format msgid "Deleting old session files (iteration %d)" msgstr "Apagando tabelas de permissões antigas" @@ -3618,6 +3623,12 @@ msgid "Links to album/photo peers" msgstr "Links para álbum/foto" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectando derivativas corrompidas" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectando derivativas corrompidas, " + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/ro.po =================================================================== --- trunk/gallery2/modules/core/po/ro.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ro.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -239,18 +239,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Actualizeaza permisiunile (%d complete, %d ramase)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Detectez derivati pierduti, incarc" -msgid "Detecting broken derivatives " -msgstr "Detectez derivati pierduti" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Detectez derivati pierduti, salvez" -msgid "Detecting broken derivatives, " -msgstr "Detectez derivati pierduti," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectez derivati pierduti, salvez" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Actualizeaza permisiunile (%d complete, %d ramase)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Sterg vechile fisiere sesiune (iteratia %d)" @@ -3643,6 +3648,12 @@ msgid "Links to album/photo peers" msgstr "Link-uri catre albume/corespondenti" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectez derivati pierduti" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectez derivati pierduti," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/ru.po =================================================================== --- trunk/gallery2/modules/core/po/ru.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/ru.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -244,18 +244,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Обновление разрешение (%d элементов завершено, %d осталось)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Обнаружение неисправных модификаций, при загрузке" -msgid "Detecting broken derivatives " -msgstr "Обнаружение неисправных модификаций" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Обнаружение неисправных модификаций, при сохранении" -msgid "Detecting broken derivatives, " -msgstr "Обнаружение неисправных модификаций," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Обнаружение неисправных модификаций, при сохранении" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Обновление разрешение (%d элементов завершено, %d осталось)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Удаление старых файлов сессий (итераций %d)" @@ -3730,6 +3735,12 @@ msgid "Links to album/photo peers" msgstr "Соседние альбомы/фотографии" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Обнаружение неисправных модификаций" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Обнаружение неисправных модификаций," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/sk.po =================================================================== --- trunk/gallery2/modules/core/po/sk.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/sk.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -244,18 +244,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Aktualizujú sa oprávnenia (%d položiek hotových, %d zostáva)" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Odhaľujú sa chybné zmenšeniny, nahráva sa " -msgid "Detecting broken derivatives " -msgstr "Odhaľujú sa chybné zmenšeniny" +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Odhaľujú sa chybné zmenšeniny, ukladá sa" -msgid "Detecting broken derivatives, " -msgstr "Odhaľujú sa chybné zmenšeniny," - -msgid "Detecting broken derivatives, saving " +#, fuzzy, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Odhaľujú sa chybné zmenšeniny, ukladá sa" +#, fuzzy, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" +msgstr "Aktualizujú sa oprávnenia (%d položiek hotových, %d zostáva)" + #, c-format msgid "Deleting old session files (iteration %d)" msgstr "Mažú sa staré súbory sedení (prechod %d)" @@ -3473,6 +3478,12 @@ msgid "Links to album/photo peers" msgstr "" +#~ msgid "Detecting broken derivatives " +#~ msgstr "Odhaľujú sa chybné zmenšeniny" + +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Odhaľujú sa chybné zmenšeniny," + #~ msgid "G2.1: Blackjack" #~ msgstr "G2.1: Blackjack" Modified: trunk/gallery2/modules/core/po/sl.po =================================================================== --- trunk/gallery2/modules/core/po/sl.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/sl.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -242,16 +242,21 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives " +#, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, " +#, c-format +msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, saving " +#, c-format +msgid "" +"Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" msgstr "" #, c-format Modified: trunk/gallery2/modules/core/po/sr.po =================================================================== --- trunk/gallery2/modules/core/po/sr.po 2006-12-13 19:23:45 UTC (rev 15447) +++ trunk/gallery2/modules/core/po/sr.po 2006-12-13 20:05:02 UTC (rev 15448) @@ -238,18 +238,23 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "" -msgid "Detecting broken derivatives, loading " +#, fuzzy, c-format +msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" msgstr "Otrivanje oštećenih derivata, učitavanje " -msgid "Detecting broken derivatives " -msgstr "Otkrivanje oštečenih derivata " +#, fuzzy, c-format +msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" +msgstr "Otkrivanje oštećenih derivata, čuvanje " -msgid... [truncated message content] |
From: <an...@us...> - 2006-12-17 22:55:15
|
Revision: 15474 http://svn.sourceforge.net/gallery/?rev=15474&view=rev Author: andy_st Date: 2006-12-17 14:55:15 -0800 (Sun, 17 Dec 2006) Log Message: ----------- Fix for bug 1611198: "Upgrading causes rewrite problems" - GalleryModule version bump to document getRewriteRules() change (pattern is no longer mandatory, parser => preGallery is implied when 'restriction' is used) - Watermark Module: be compatible with old and new rewrite rules format. - Webdav: is new, thus adding dependency on new rewrite module in activate() - Rewrite: upgrade fixes: Only set pattern in rewrite rule if the same rule still has a pattern (thanks to jablko for providing this fix) Modified Paths: -------------- trunk/gallery2/modules/core/classes/GalleryModule.class trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc trunk/gallery2/modules/rewrite/module.inc trunk/gallery2/modules/watermark/module.inc trunk/gallery2/modules/webdav/module.inc Modified: trunk/gallery2/modules/core/classes/GalleryModule.class =================================================================== --- trunk/gallery2/modules/core/classes/GalleryModule.class 2006-12-17 18:45:53 UTC (rev 15473) +++ trunk/gallery2/modules/core/classes/GalleryModule.class 2006-12-17 22:55:15 UTC (rev 15474) @@ -76,11 +76,12 @@ * major bump in GalleryTheme) * - Remove TYPE=DB_TABLE_TYPE replacement in MySqlStorage::_getSqlReplacements * - change signature of getItemlinks() in all modules (add new parameter) + * - Remove rewrite v1.1.8 version checks in webdav, watermark, httpauth, ... (look for todo) * * @return array major number, minor number */ function getApiVersion() { - return array(3, 4); + return array(3, 5); } /** Modified: trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc =================================================================== --- trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc 2006-12-17 18:45:53 UTC (rev 15473) +++ trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc 2006-12-17 22:55:15 UTC (rev 15474) @@ -245,8 +245,21 @@ * array($moduleId => array($ruleId => array('pattern' => $pattern))) */ foreach (array_keys($activeRules) as $moduleId) { + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', $moduleId, true); + if ($ret) { + return $ret; + } + $rules = $module->getRewriteRules(); + foreach ($activeRules[$moduleId] as $ruleId => $pattern) { - $activeRules[$moduleId][$ruleId] = array('pattern' => $pattern); + $activeRules[$moduleId][$ruleId] = array(); + /* + * Only save old pattern if the rule defines a pattern. Saving a pattern for a + * rule which doesn't define a pattern is invalid. + */ + if (isset($rules[$ruleId]['pattern'])) { + $activeRules[$moduleId][$ruleId]['pattern'] = $pattern; + } } } @@ -272,10 +285,23 @@ if (strncmp($key, 'history.', 8) !== 0) { continue; } + $history = unserialize($value); - $history = unserialize($value); + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', substr($key, 8), true); + if ($ret) { + return $ret; + } + $rules = $module->getRewriteRules(); + foreach ($history as $ruleId => $pattern) { - $history[$ruleId] = array('pattern' => $pattern); + $history[$ruleId] = array(); + /* + * Only save old pattern if the rule defines a pattern. Saving a pattern for a + * rule which doesn't define a pattern is invalid. + */ + if (isset($rules[$ruleId]['pattern'])) { + $history[$ruleId]['pattern'] = $pattern; + } } $ret = $module->setParameter($key, serialize($history)); @@ -285,7 +311,9 @@ } case '1.1.8': - /* Remove L from mandatory flags */ + /* Remove L from mandatory flags, remove pattern for restrict rules */ + case '1.1.9': + /* Updating required Module API version for getRewriteRules change from v1.1.8 */ case 'end of upgrade path': break; @@ -383,11 +411,13 @@ foreach ($history as $ruleId => $rule) { if (isset($rules[$ruleId])) { - if (isset($rule['pattern'])) { + if (isset($rules[$ruleId]['pattern']) && isset($rule['pattern'])) { if (isset($seen[$rule['pattern']])) { continue; } $seen[$rule['pattern']] = true; + } else { + $rule = array(); } $activeRules[$pluginId][$ruleId] = $rule; } Modified: trunk/gallery2/modules/rewrite/module.inc =================================================================== --- trunk/gallery2/modules/rewrite/module.inc 2006-12-17 18:45:53 UTC (rev 15473) +++ trunk/gallery2/modules/rewrite/module.inc 2006-12-17 22:55:15 UTC (rev 15474) @@ -35,11 +35,11 @@ $this->setName($gallery->i18n('URL Rewrite')); $this->setDescription($gallery->i18n( 'Enables short URLs using Apache mod_rewrite, ISAPI Rewrite, or PathInfo')); - $this->setVersion('1.1.9'); /* Update RewriteModuleExtras::upgrade also! */ + $this->setVersion('1.1.10'); /* Update RewriteModuleExtras::upgrade also! */ $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getSiteAdminViews|registerEventListeners'); $this->setRequiredCoreApi(array(7, 5)); - $this->setRequiredModuleApi(array(3, 0)); + $this->setRequiredModuleApi(array(3, 5)); } /** Modified: trunk/gallery2/modules/watermark/module.inc =================================================================== --- trunk/gallery2/modules/watermark/module.inc 2006-12-17 18:45:53 UTC (rev 15473) +++ trunk/gallery2/modules/watermark/module.inc 2006-12-17 22:55:15 UTC (rev 15474) @@ -33,11 +33,11 @@ $this->setId('watermark'); $this->setName($gallery->i18n('Watermark')); $this->setDescription($gallery->i18n('Watermark your images')); - $this->setVersion('1.0.8'); /* Update upgrade() too */ + $this->setVersion('1.0.9'); /* Update upgrade() too */ $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('registerEventListeners|getSiteAdminViews|getUserAdminViews'); $this->setRequiredCoreApi(array(7, 4)); - $this->setRequiredModuleApi(array(3, 4)); + $this->setRequiredModuleApi(array(3, 5)); } /** @@ -167,6 +167,8 @@ case '1.0.5': case '1.0.6': case '1.0.7': + case '1.0.8': + /* Adding dependency on getRewriteRule() changes */ case 'end of upgrade path': /* @@ -327,21 +329,43 @@ /** * @see GalleryModule::getRewriteRules + * @todo The explicit rewrite module version check can be removed on the next major Module API + * version. */ function getRewriteRules() { - return array( - array( 'comment' => $this->translate('Watermark hotlinked images'), - 'restrict' => array('view' => 'core.DownloadItem', - 'itemId' => '([0-9]+)'), - 'queryString' => array('view' => 'watermark.DownloadItem', - 'itemId' => '%1'), - 'flags' => array('L'), - 'exemptReferer' => 1, - 'help' => $this->translate( - 'Apply watermark to images downloaded from outside your Gallery. Select ' . - 'which watermark to use in Watermark Site Admin.') - ) - ); + /* Ensure the rewrite module is compatible, 'pattern' is optional since v1.1.8 of rewrite */ + list ($ret, $rewrite) = GalleryCoreApi::loadPlugin('module', 'rewrite', true); + if ($ret) { + if ($gallery->getDebug()) { + $gallery->debug('WatermarkModule::getRewriteRules ingoring error: ' . + $ret->getAsText()); + } + $oldRewriteVersion = false; + } else { + $oldRewriteVersion = version_compare($rewrite->getVersion(), '1.1.8', '<'); + } + + $rules = array(); + $rule = array( + 'comment' => $this->translate('Watermark hotlinked images'), + 'restrict' => array('view' => 'core.DownloadItem', + 'itemId' => '([0-9]+)'), + 'queryString' => array('view' => 'watermark.DownloadItem', + 'itemId' => '%1'), + 'flags' => array('L'), + 'exemptReferer' => 1, + 'help' => $this->translate( + 'Apply watermark to images downloaded from outside your Gallery. Select ' . + 'which watermark to use in Watermark Site Admin.')); + if ($oldRewriteVersion) { + /* Add a pseudo pattern since it was mandatory until v1.1.8 of the rewrite module. */ + $rule['pattern'] = '.'; + $rule['locked'] = true; + $rule['parser'] = 'preGallery'; + } + $rules[0] = $rule; + + return $rules; } } ?> Modified: trunk/gallery2/modules/webdav/module.inc =================================================================== --- trunk/gallery2/modules/webdav/module.inc 2006-12-17 18:45:53 UTC (rev 15473) +++ trunk/gallery2/modules/webdav/module.inc 2006-12-17 22:55:15 UTC (rev 15474) @@ -31,12 +31,12 @@ $this->setId('webdav'); $this->setName($gallery->i18n('WebDAV')); - $this->setVersion('0.6.1'); /* Update upgrade() too */ + $this->setVersion('0.6.2'); /* Update upgrade() too */ $this->setDescription($gallery->i18n('Mount Gallery on your desktop')); $this->setGroup('interfaces', $gallery->i18n('Remote Interfaces')); $this->setCallbacks('getItemLinks|registerEventListeners'); - $this->setRequiredCoreApi(array(7, 10)); - $this->setRequiredModuleApi(array(3, 3)); + $this->setRequiredCoreApi(array(7, 16)); + $this->setRequiredModuleApi(array(3, 5)); } /** @@ -118,6 +118,11 @@ if ($ret) { return $ret; } + case '0.6.1': + /* + * Adding dependency on latest changes in getRewriteRules() and on generateUrl's + * protocol option. + */ case 'end of upgrade path': break; @@ -129,6 +134,37 @@ } /** + * @see GalleryModule::activate + * @todo The explicit rewrite module version check can be removed on the next major Module API + * version. + */ + function activate($postActivationEvent=true) { + /* Ensure the rewrite module is compatible, 'pattern' is optional since v1.1.8 of rewrite */ + list ($ret, $modules) = GalleryCoreApi::fetchPluginList('module'); + if ($ret) { + return array($ret, null); + } + + if (isset($modules['rewrite'])) { + list ($ret, $rewrite) = GalleryCoreApi::loadPlugin('module', 'rewrite', true); + if ($ret) { + return array($ret, null); + } + + if (version_compare($rewrite->getVersion(), '1.1.8', '<')) { + return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED), null); + } + } + + list ($ret, $redirect) = parent::activate($postActivationEvent); + if ($ret) { + return array($ret, null); + } + + return array(null, $redirect); + } + + /** * @see GalleryModule::getItemLinks */ function getItemLinks($items, $wantsDetailedLinks, $permissions, $userId) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ja...@us...> - 2006-12-20 02:42:24
|
Revision: 15516 http://svn.sourceforge.net/gallery/?rev=15516&view=rev Author: jablko Date: 2006-12-19 18:42:23 -0800 (Tue, 19 Dec 2006) Log Message: ----------- Support GalleryUrlGenerator::generateUrl useAuthToken=false option to avoid adding the authToken request variable to generated URLs Add unit tests for GalleryUrlGenerator and RewriteUrlGenerator Use the useAuthToken=false option in WebDavHelper to avoid adding the authToken request variable, which breaks the Windows WebDAV client Modified Paths: -------------- trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class trunk/gallery2/modules/webdav/classes/WebDavHelper.class Modified: trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class =================================================================== --- trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -536,7 +536,8 @@ * 'forceServerRelativeUrl' => true; to generate server-relative URLs if possible but no * relative URLs (e.g. /gallery2/main.php instead of * http://example.com/gallery2/main.php but never just main.php (without path)) - * 'useAuthToken' => true; to add an authToken to the URL parameters, false is ignored + * 'useAuthToken' => boolean; to force auth token to be in/not in the URL; by default it is + * included in controller URLs * 'protocol' => string; to override the URL scheme * @return string URL */ @@ -672,7 +673,8 @@ unset($params['navId']); } else { /* Add authToken to all controller URLs */ - if (isset($params['controller']) || !empty($options['useAuthToken'])) { + if (!empty($options['useAuthToken']) + || (!isset($options['useAuthToken']) && !empty($params['controller']))) { $params['authToken'] = $session->getAuthToken(); } } Modified: trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -1537,7 +1537,7 @@ $this->assertEquals($expectedUrl, $url); } - function testGenerateUrlUseAuthTokenOption() { + function testGenerateUrlUseAuthTokenTrueHasAuthToken() { global $gallery; $session =& $gallery->getSession(); @@ -1549,6 +1549,31 @@ $this->assertEquals($expectedUrl, $url); } + function testGenerateUrlUseAuthTokenTrueControllerUrlHasAuthToken() { + global $gallery; + $session =& $gallery->getSession(); + + $session->put('core.authToken', 'AUTH-TOKEN'); + $url = $this->_urlGenerator->generateUrl( + array('controller' => 'core.UserLogin', 'foo' => 123), + array('useAuthToken' => true)); + $expectedUrl = 'phpunit_test.php?g2_controller=core.UserLogin&g2_foo=123' + . '&g2_authToken=AUTH-TOKEN'; + $this->assertEquals($expectedUrl, $url); + } + + function testGenerateUrlUseAuthTokenFalseHasNoAuthToken() { + global $gallery; + $session =& $gallery->getSession(); + + $session->put('core.authToken', 'AUTH-TOKEN'); + $url = $this->_urlGenerator->generateUrl( + array('controller' => 'core.UserLogin', 'foo' => 123), + array('useAuthToken' => false)); + $expectedUrl = 'phpunit_test.php?g2_controller=core.UserLogin&g2_foo=123'; + $this->assertEquals($expectedUrl, $url); + } + function testAppendParamsToUrl() { $this->assertEquals( 'test.php?g2_a=foo1%25bar&g2_b=foo2%25bar', Modified: trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -127,7 +127,7 @@ } /* Check if we are forced to append the auth token */ - if (!empty($params['controller'])) { + if (!isset($options['useAuthToken']) && !empty($params['controller'])) { $options['useAuthToken'] = true; } Modified: trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -552,5 +552,72 @@ parent::testGenerateUrlRewriteErrorFallback(); } + + function testGenerateUrlUseAuthTokenTrue() { + $this->_expectedUrl[0] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'); + $this->_expectedUrl[1] = + $this->_signUrl(sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent()))); + $this->_expectedUrl[2] = $this->_signUrl('http://href_website.com/foo'); + $this->_expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[4] = $this->_signUrl('/gallery2/themes/foo/images/bar.jpg'); + $this->_expectedUrl[5] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP); + $this->_expectedUrl[6] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/v' . $this->_testAlbumPath); + $this->_expectedUrl[7] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/v' . $this->_testItemPath . '.html'); + $this->_expectedUrl[8] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=-5759'); + $this->_expectedUrl[9] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId()); + $this->_expectedUrl[10] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/' . ltrim($this->_testAlbumPath, '/') . 'test.html'); + $this->_expectedUrl[11] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/' . ltrim($this->_testItemPath, '/') . '/test.html'); + $this->_expectedUrl[12] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/t' . rtrim($this->_testAlbumPath, '/') . '.test'); + $this->_expectedUrl[13] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '/t' . $this->_testItemPath . '.test'); + $this->_expectedUrl[14] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'); + $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'); + + return parent::testGenerateUrlUseAuthTokenTrue(); + } + + function testGenerateUrlUseAuthTokenFalse() { + $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[2] = 'http://href_website.com/foo'; + $this->_expectedUrl[3] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId(); + $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; + $this->_expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP; + $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP + . '/v' . $this->_testItemPath . '.html'; + $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'; + $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP + . '/' . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP + . '/' . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP + . '/t' . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP + . '/t' . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'; + $this->_expectedUrl[15] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'; + + return parent::testGenerateUrlUseAuthTokenFalse(); + } } ?> Modified: trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -400,6 +400,7 @@ * 12. php.Unit with extension suffix for album item (short URL) * 13. php.Unit with extension suffix for data item (short URL) * 14. php.Unit without any keywords (short URL) + * 15. php.Unit controller */ $params = array(); $params[0] = array('view' => 'rand164.NonShort', 'foo' => 'bar'); @@ -486,9 +487,10 @@ * 1. baseUrl => string; implicitly tested with normal URLs * 2. forceDirect => true; tested with embedded Gallery * 3. forceFullUrl => true; to generate absolute URL instead of relative path URL - * 4. forceSessionId => boolean; to force session id to be in/not in the URL; + * 4. forceSessionId => boolean; to force session id to be in/not in the URL * 5. htmlEntities => false; to use & parameter separator instead of & - * 6. forceServerRelativeUrl => (implicitly tested with normal URLs + * 6. forceServerRelativeUrl => (implicitly tested with normal URLs) + * 7. useAuthToken => boolean; to force auth token to be in/not in the URL */ function testGenerateUrl() { $params = $this->_getTestUrlParams(); @@ -536,9 +538,8 @@ $this->_testItem->getId(), $this->_testItem->getSerialNumber(), urlencode($this->_testItem->getPathComponent())); $expectedUrl[2] = 'http://href_website.com/foo'; - $expectedUrl[3] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . - '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId() . - '&g2_authToken=' . $session->getAuthToken(); + $expectedUrl[3] = $this->_signUrl('http://example.com/gallery2/' . GALLERY_MAIN_PHP . + '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $expectedUrl[4] = 'http://example.com/gallery2/themes/foo/images/bar.jpg'; $expectedUrl[5] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP; $expectedUrl[6] = 'http://example.com/gallery2/v' . $this->_testAlbumPath; @@ -554,8 +555,7 @@ '.test'; $expectedUrl[13] = 'http://example.com/gallery2/t' . $this->_testItemPath . '.test'; $expectedUrl[14] = 'http://example.com/gallery2/phpunit1/'; - $expectedUrl[15] = 'http://example.com/gallery2/phpunit2/?g2_authToken=' . - $session->getAuthToken(); + $expectedUrl[15] = $this->_signUrl('http://example.com/gallery2/phpunit2/'); $ret = $this->_runGenerateUrlTest(array(), $expectedUrl, $params, $options); if ($ret) { @@ -943,5 +943,74 @@ $this->failWithStatus($ret); } } + + function testGenerateUrlUseAuthTokenTrue() { + $params = $this->_getTestUrlParams(); + $options = array('useAuthToken' => true); + + $expectedUrl[0] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'); + $expectedUrl[1] = $this->_signUrl(sprintf('/gallery2/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent()))); + $expectedUrl[2] = $this->_signUrl('http://href_website.com/foo'); + $expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $expectedUrl[4] = $this->_signUrl('/gallery2/themes/foo/images/bar.jpg'); + $expectedUrl[5] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP); + $expectedUrl[6] = $this->_signUrl('/gallery2/v' . $this->_testAlbumPath); + $expectedUrl[7] = $this->_signUrl('/gallery2/v' . $this->_testItemPath . '.html'); + $expectedUrl[8] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'); + $expectedUrl[9] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId()); + $expectedUrl[10] = $this->_signUrl('/gallery2/' . ltrim($this->_testAlbumPath, '/') + . 'test.html'); + $expectedUrl[11] = $this->_signUrl('/gallery2/' . ltrim($this->_testItemPath, '/') + . '/test.html'); + $expectedUrl[12] = $this->_signUrl('/gallery2/t' . rtrim($this->_testAlbumPath, '/') + . '.test'); + $expectedUrl[13] = $this->_signUrl('/gallery2/t' . $this->_testItemPath . '.test'); + $expectedUrl[14] = $this->_signUrl('/gallery2/phpunit1/'); + $expectedUrl[15] = $this->_signUrl('/gallery2/phpunit2/'); + + $ret = $this->_runGenerateUrlTest(array(), $expectedUrl, $params, $options); + if ($ret) { + $this->failWithStatus($ret); + } + } + + function testGenerateUrlUseAuthTokenFalse() { + $params = $this->_getTestUrlParams(); + $options = array('useAuthToken' => false); + + $expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $expectedUrl[1] = sprintf('/gallery2/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); + $expectedUrl[2] = 'http://href_website.com/foo'; + $expectedUrl[3] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId(); + $expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; + $expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP; + $expectedUrl[6] = '/gallery2/v' . $this->_testAlbumPath; + $expectedUrl[7] = '/gallery2/v' . $this->_testItemPath . '.html'; + $expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'; + $expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=' . + $this->_derivative->getId(); + $expectedUrl[10] = '/gallery2/' . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $expectedUrl[11] = '/gallery2/' . ltrim($this->_testItemPath, '/') . '/test.html'; + $expectedUrl[12] = '/gallery2/t' . rtrim($this->_testAlbumPath, '/') . '.test'; + $expectedUrl[13] = '/gallery2/t' . $this->_testItemPath . '.test'; + $expectedUrl[14] = '/gallery2/phpunit1/'; + $expectedUrl[15] = '/gallery2/phpunit2/'; + + $ret = $this->_runGenerateUrlTest(array(), $expectedUrl, $params, $options); + if ($ret) { + $this->failWithStatus($ret); + } + } } ?> Modified: trunk/gallery2/modules/webdav/classes/WebDavHelper.class =================================================================== --- trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2006-12-20 01:17:15 UTC (rev 15515) +++ trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2006-12-20 02:42:23 UTC (rev 15516) @@ -201,7 +201,10 @@ $webDavServer->path = $path; $webDavServer->baseUrl = parse_url($urlGenerator->generateUrl( array('controller' => 'webdav.WebDav'), - array('forceFullUrl' => true, 'forceSessionId' => false))); + array('forceFullUrl' => true, + 'htmlEntities' => false, + 'forceSessionId' => false, + 'useAuthToken' => false))); } return $webDavServer; @@ -1723,7 +1726,9 @@ return $urlGenerator->generateUrl( array('controller' => 'webdav.WebDav', 'path' => $path), - array('forceSessionId' => false, 'forceServerRelativeUrl' => true)); + array('forceServerRelativeUrl' => true, + 'forceSessionId' => false, + 'useAuthToken' => false)); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2006-12-21 15:45:53
|
Revision: 15532 http://svn.sourceforge.net/gallery/?rev=15532&view=rev Author: mindless Date: 2006-12-21 07:38:18 -0800 (Thu, 21 Dec 2006) Log Message: ----------- Language update: fi Modified Paths: -------------- trunk/gallery2/modules/core/locale/fi/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/fi.po trunk/gallery2/modules/register/locale/fi/LC_MESSAGES/modules_register.mo trunk/gallery2/modules/register/po/fi.po trunk/gallery2/modules/remote/locale/fi/LC_MESSAGES/modules_remote.mo trunk/gallery2/modules/remote/po/fi.po trunk/gallery2/modules/slideshowapplet/locale/fi/LC_MESSAGES/modules_slideshowapplet.mo trunk/gallery2/modules/slideshowapplet/po/fi.po trunk/gallery2/modules/uploadapplet/locale/fi/LC_MESSAGES/modules_uploadapplet.mo trunk/gallery2/modules/uploadapplet/po/fi.po trunk/gallery2/modules/useralbum/locale/fi/LC_MESSAGES/modules_useralbum.mo trunk/gallery2/modules/useralbum/po/fi.po Modified: trunk/gallery2/modules/core/locale/fi/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/fi.po =================================================================== --- trunk/gallery2/modules/core/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/core/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Gallery: Core 1.1.25\n" "POT-Creation-Date: 2003-05-16 09:41+0300\n" -"PO-Revision-Date: 2006-12-20 12:21+0200\n" +"PO-Revision-Date: 2006-12-21 12:17+0200\n" "Last-Translator: Erkka Hakkarainen <erk...@pp...>\n" "Language-Team: Finnish <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -63,25 +63,25 @@ #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "yksi minuutti" +msgstr[0] "%d minuutti" msgstr[1] "%d minuuttia" #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "yksi tunti" +msgstr[0] "%d tunti" msgstr[1] "%d tuntia" #, c-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "yksi päivä" +msgstr[0] "%d päivä" msgstr[1] "%d päivää" #, c-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "yksi viikko" +msgstr[0] "%d viikko" msgstr[1] "%d viikkoa" msgid "<none>" @@ -99,38 +99,34 @@ msgid "Themes" msgstr "Teema" -#, fuzzy msgid "Updating Repository Index" -msgstr "Päivitä indeksi" +msgstr "Päivitetään Repositoryn indeksi" msgid "Scanning plugins" -msgstr "" +msgstr "Etsitään moduleita" -#, fuzzy msgid "Update Plugin List" -msgstr "Päivitä kaikki pluginit" +msgstr "Päivitä modulilista" msgid "Done." msgstr "Valmis." msgid "Updating Packages" -msgstr "" +msgstr "Päivitetään paketteja" #, c-format msgid "Downloading %s" msgstr "Ladataan %s" -#, fuzzy, c-format +#, c-format msgid "Activating %s" -msgstr "Toiminnot" +msgstr "Aktivoidaan %s" -#, fuzzy msgid "Deleting Language Packs" -msgstr "Oletuskieli" +msgstr "Poistetaan kielipaketteja" -#, fuzzy msgid "Update complete." -msgstr "Lähetys Valmis" +msgstr "Päivitys valmis" msgid "install" msgstr "asenna" @@ -139,16 +135,16 @@ msgstr "päivitä" msgid "activate" -msgstr "ota käyttöön" +msgstr "aktivoi" msgid "uninstall" -msgstr "poista" +msgstr "poista asennus" msgid "deactivate" -msgstr "poista käytöstä" +msgstr "deaktivoi" msgid "Inherit settings from parent album" -msgstr "Peri asetukset ulommasta albumista" +msgstr "Peri asetukset ylemmän tason albumista" msgid "Use these settings" msgstr "Käytä näitä asetuksia" @@ -166,7 +162,7 @@ msgstr "[ydin] Näytä kohde" msgid "[core] View resized version(s)" -msgstr "[ydin] Näytä muokatut versiot" +msgstr "[ydin] Näytä skaalatut versiot" msgid "[core] View original version" msgstr "[ydin] Näytä alkuperäinen versio" @@ -211,10 +207,10 @@ msgstr "Tyhjennetään nopean latauksen välimuisti" msgid "Updating panorama items" -msgstr "" +msgstr "Päivitetään panoraamakohteita" msgid "Optimizing AccessSubscriberMap table" -msgstr "" +msgstr "Optimoidaan AccessSubscriberMap taulua" msgid "Site Admins" msgstr "Gallerian Ylläpitäjät" @@ -238,22 +234,25 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Päivitetään oikeuksia (%d suoritettu, %d jäljellä)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" -msgstr "Etsii rikkoutuneita johdannaisia, lataa " +msgstr "Etsitään rikkinäisiä johdannaisia, ladataan (%d johdannaista tarkastettu, %d jäljellä)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" -msgstr "Etsii rikkoutuneita johdannaisia, tallentaa " +msgstr "Etsitään rikkinäisiä johdannaisia (%d johdannaista tarkastettu, %d jäljellä)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" -msgstr "Etsii rikkoutuneita johdannaisia, tallentaa " +msgstr "" +"Etsitään rikkinäisiä johdannaisia, tallenetaan (%d johdannaista tarkastettu, %d jäljellä)" -#, fuzzy, c-format +#, c-format msgid "" "Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" -msgstr "Päivitetään oikeuksia (%d suoritettu, %d jäljellä)" +msgstr "" +"Etsitään rikkinäisiä johdannaisia, tallennetaan kohdetta %d / %d (%d johdannaista " +"tarkastettu, %d jäljellä)" #, c-format msgid "Deleting old session files (iteration %d)" @@ -297,19 +296,19 @@ #, c-format msgid "Input file %s exceeds maximum permitted file size" -msgstr "" +msgstr "Tiedoston %s koko ylittää suurimman sallitun tiedostokoon" #, c-format msgid "Input file %s exceeds file size specified in the form" -msgstr "" +msgstr "Tiedoston %s koko ylittää lomakkella määritetyn koon" #, c-format msgid "Input file %s was only partially uploaded" -msgstr "" +msgstr "Tiedosto %s saatiin ladattua vain osittain" #, c-format msgid "Input file %s was not uploaded. Error %d" -msgstr "" +msgstr "Tiedostoa %s ei saatu ladattua. Virhe %d" msgid "Gallery Item Administration" msgstr "Gallerian Kohteen Ylläpito" @@ -331,16 +330,14 @@ msgid "Settings saved successfully." msgstr "Asetukset tallennettu." -#, fuzzy msgid "Apply resized image settings" -msgstr "Teeman asetukset palautettu" +msgstr "Käytä skaalattujen kuvien asetuksia" -#, fuzzy msgid "Preparing..." -msgstr "Työstää..." +msgstr "Valmistellaan..." msgid "Apply thumbnail settings" -msgstr "" +msgstr "Käytä esikatselukuvien asetuksia" msgid "Rebuilding thumbnails..." msgstr "Luodaan esikatselukuvat uudelleen..." @@ -424,9 +421,8 @@ msgid "Modify Photo" msgstr "Muokkaa Kuvaa" -#, fuzzy msgid "Successfully changed theme" -msgstr "Teema %s otettu käyttöön" +msgstr "Teema vaihdettiin onnistuneesti" msgid "« default theme »" msgstr "« oletusteema »" @@ -539,7 +535,7 @@ msgstr "Kirjaudu Ulos" msgid "Plugins" -msgstr "" +msgstr "Modulit" msgid "Users" msgstr "Käyttäjät" @@ -602,9 +598,8 @@ msgid "%d items failed" msgstr "%d kohdetta epäonnistui" -#, fuzzy msgid "Convert MySQL database to UTF8" -msgstr "Muutetaan MySQL tietoja UTF8 merkistöön" +msgstr "Muuta MySQL tietokanta UTF8 merkistöön" msgid "" "If you created your database with MySQL 3.x and you upgrade to MySQL 4.x, you will " @@ -613,13 +608,17 @@ "After using this, you should run the 'Delete database cache' task to get rid of any " "corruption in your cache." msgstr "" +"Jos loit tietokannan MySQL 3.x:llä ja päivitin sen MySQL 4.x:ksi, sinun täytyy muuttaa " +"merkistö UTF8:ksi (muuten merkeissä saattaa esiintyä sekaannuksia). Toiminto on vaaraton " +"vaikka tietokannan merkistö olisi jo muunnettu, joten sen tekeminen varmuuden vuoksi ei " +"epävarmuustilanteessa haittaa. Suoritettuasi tämän toiminnon, suorita 'Tyhjennä tietokannan " +"välimuisti' -toiminto, jotta merkistö olisi oikea myös välimuistin tiedoille." -#, fuzzy msgid "Database successfully converted to UTF8" -msgstr "Kohde poistettu" +msgstr "Tietokanta muutettu UTF8 merkistöön" msgid "No conversion required" -msgstr "" +msgstr "Konversiota ei tarvita" msgid "Delete user sessions" msgstr "Poista käyttäjäsessiot" @@ -628,9 +627,9 @@ "Delete all persistent user sessions according to your current session expiration settings." msgstr "Poista kaikki \"roikkuvat\" käyttäjäsessiot niiden vanhentumisasetusten mukaisesti." -#, fuzzy, c-format +#, c-format msgid "Deleted %d sessions." -msgstr "Poista käyttäjäsessiot" +msgstr "Poistettu %d sessiota." msgid "Delete database cache" msgstr "Poista tietokannan välimuisti" @@ -711,13 +710,11 @@ msgid "Owner" msgstr "Omistaja" -#, fuzzy msgid "Dynamic Album" -msgstr "Muokkaa Albumia" +msgstr "Dynaaminen albumi" -#, fuzzy msgid "dynamic album" -msgstr "Muokkaa Albumia" +msgstr "dynaaminen albumi" msgid "Group" msgstr "Ryhmä" @@ -747,15 +744,13 @@ "kirjoitusoikeudet kohteeseen" msgid "Official Release Repository" -msgstr "" +msgstr "Virallinen julkaisu Repository" -#, fuzzy msgid "Experimental Repository" -msgstr "Varasto" +msgstr "Kokeellinen (beta) Repository" -#, fuzzy msgid "Community Repository" -msgstr "Varasto" +msgstr "Käyttäjien tekemä Repository" #, c-format msgid "Error downloading index from '%s'." @@ -817,11 +812,11 @@ msgstr "Lahjoita Gallery projektille" msgid "G2.2: Double Double" -msgstr "" +msgstr "G2.2: Double Double" #, c-format msgid "Powered by Gallery v%s" -msgstr "" +msgstr "Powered by Gallery v%s" #, c-format msgid "Estimated time remaining: %d:%02d" @@ -864,19 +859,17 @@ msgid "Blocks to show on photo pages" msgstr "Kuvasivulla näytettävät lohkot" -#, fuzzy msgid "Thumbnail links in dynamic albums" -msgstr "Käytä tätä pikkukuvan kokoa kaikissa alialbumeissa" +msgstr "Käytä tätä esikatselukuvan kokoa kaikissa dynaamisissa albumeissa" -#, fuzzy msgid "Browse dynamic album" -msgstr "Valitse albumi määränpääksi" +msgstr "Selaa dynaamista albumia" msgid "Jump to original album" -msgstr "" +msgstr "Siirry alkuperäiseen albumiin" msgid "Separate link to original album" -msgstr "" +msgstr "Erillinen linkki alkuperäiseen albumiin" msgid "View Samples" msgstr "Katso Näytteet" @@ -897,7 +890,7 @@ msgstr "Sinun on syötettävä numero, joka on suurempi kuin nolla" msgid "Error reading block settings. Clear your browser cache and try again." -msgstr "" +msgstr "Virhe luettaessa lohkon asetuksia. Tyhjennä selaimen välimuisti ja yritä uudelleen." #, c-format msgid "%dx%d" @@ -927,9 +920,8 @@ msgid "spreadsheet" msgstr "taulukkolaskenta" -#, fuzzy msgid "file" -msgstr "Tiedosto" +msgstr "tiedosto" msgid "Back" msgstr "Takaisin" @@ -1032,13 +1024,11 @@ msgid "gettext" msgstr "gettext" -#, fuzzy msgid "enabled" -msgstr "Asennettu" +msgstr "on käytössä" -#, fuzzy msgid "disabled" -msgstr "%d kohdetta epäonnistui" +msgstr "pois käytöstä" msgid "Locale" msgstr "Lokaali" @@ -1048,7 +1038,7 @@ #, c-format msgid "Rows in %s table = %d" -msgstr "" +msgstr "Taulussa %s on %d riviä" msgid "Successfully saved theme settings" msgstr "Teeman asetukset tallennettu" @@ -1547,23 +1537,22 @@ msgid "Options" msgstr "Valinnat" -#, fuzzy msgid "Lock user." -msgstr "Lukkojärjestelmä" +msgstr "Lukitse käyttäjätili" msgid "" "Locked users are unable to edit their own account information. (Password, Name, Email, etc.)" msgstr "" +"Lukitut käyttäjät eivät voi muokata oman käyttäjätilinsä tietoja. (Salasana, nimi, email...)" -#, fuzzy msgid "Reset failed login count." -msgstr "Nollaa katselukerrat" +msgstr "Nollaa epäonnistuneisen kirjausyritysten laskuri." #, c-format msgid "%d failed login attempt since the last successful login." msgid_plural "%d failed login attempts since the last successful login." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d epäonnistunut kirjaantumisyritys sitten viimeisen onnistuneen kirjautumisen." +msgstr[1] "%d epäonnistunutta kirjaantumisyritystä sitten viimeisen onnistuneen kirjautumisen." msgid "Group Management" msgstr "Ryhmien Hallinta" @@ -1740,103 +1729,97 @@ msgid "Status: Inactive" msgstr "Tila: Ei Käytössä" -#, fuzzy msgid "__PLUGIN__ deactivated" -msgstr "poista käytöstä" +msgstr "__PLUGIN__ deaktivoitu" msgid "Status: Active" msgstr "Tila: Käytössä" msgid "__PLUGIN__ activated" -msgstr "" +msgstr "__PLUGIN__ aktivoitu" msgid "Status: Not Installed" msgstr "Tila: Ei Asennettu" msgid "__PLUGIN__ uninstalled" -msgstr "" +msgstr "__PLUGIN__ asennus poistettu" msgid "Status: Upgrade Required (Inactive)" msgstr "Tila: Tarvitsee Päivityksen (Ei Käytössä)" -#, fuzzy msgid "Status: Incompatible Plugin (Inactive)" -msgstr "Tila: Epäyhteensopiva (Ei Käytössä)" +msgstr "Status: Yhteensopimaton moduli (Ei Käytössä)" msgid "Status: Inactive (Configuration Required)" -msgstr "" +msgstr "Status: Ei käytössä (Määritys vaaditaan)" msgid "__PLUGIN__ needs configuration" -msgstr "" +msgstr "__PLUGIN__ tarvitsee määrityksen" msgid "__PLUGIN__ deleted" -msgstr "" +msgstr "__PLUGIN__ poistettu" -#, fuzzy msgid "Warning!" -msgstr "Varoitus" +msgstr "Varoitus!" -#, fuzzy msgid "Do you really want to uninstall __PLUGIN__?" -msgstr "Haluatko varmasti poistaa moduulin %s?" +msgstr "Haluat poistaa asennuksen __PLUGIN__?" msgid "" "This plugin will be uninstalled, but its files will be kept so that you can reinstall it." msgstr "" +"Tämän modulin asennus poistetaan, mutta tiedostot jätetään, jotta voit uudelleenasentaa sen " +"tarvittaessa." msgid "Yes" -msgstr "" +msgstr "Kyllä" msgid "No" -msgstr "" +msgstr "Ei" -#, fuzzy msgid "Do you really want to delete __PLUGIN__?" -msgstr "Haluatko varmasti poistaa moduulin %s?" +msgstr "Haluatko poistaa __PLUGIN__?" msgid "This plugin will be uninstalled and its files will be deleted." -msgstr "" +msgstr "Tämän modulin asennus poistetaan ja sen tiedostot tuhotaan." msgid "disabled(__COUNT__)" -msgstr "" +msgstr "disabloi(__COUNT__)" msgid "up to date(__COUNT__)" -msgstr "" +msgstr "ajantasalla(__COUNT__)" msgid "not installed(__COUNT__)" -msgstr "" +msgstr "ei asennettu(__COUNT__)" msgid "upgrade required(__COUNT__)" -msgstr "" +msgstr "päivitys tarvitaan(__COUNT__)" msgid "incompatible(__COUNT__)" -msgstr "" +msgstr "yhteensopimattomia(__COUNT__)" msgid "Failed to completely delete __PLUGIN__" -msgstr "" +msgstr "Kohteen poistaminen kokonaan ei onnistunut __PLUGIN__" -#, fuzzy msgid "Gallery Plugins" -msgstr "Gallerian Moduulit" +msgstr "Gallerian Modulit" msgid "Get More Plugins" -msgstr "" +msgstr "Hae lisää moduleita" -#, fuzzy msgid "" "Gallery features come as separate plugins. You can download and install plugins to add more " "features to your Gallery, or you can disable features if you don't want to use them. In " "order to use a feature, you must install, configure (if necessary) and activate it. If you " "don't wish to use a feature, you can deactivate it." msgstr "" -"Gallerian ominaisuuksiin kuuluu erilliset moduulit. Voit ladata ja asentaa moduuleita, " -"joilla saat lisää ominaisuuksia Galleriaasi, tai jos et halua käyttää jotain tiettyä " -"moduulia, voit poistaa sen käytöstä. Käyttääksesi moduulia, sinun täytyy asentaa, " -"konfiguroida ja otaa se käyttöön." +"Gallerian ominaisuudet sisältyvät eri moduleihin. Voit ladata ja asentaa moduuleita, joilla " +"saat lisää ominaisuuksia Galleriaasi, tai jos et halua käyttää jotain tiettyä moduulia, voit " +"poistaa sen käytöstä. Käyttääksesi moduulia, sinun täytyy asentaa, konfiguroida ja otaa se " +"käyttöön." -#, fuzzy msgid "Plugin Name" -msgstr "Koko Nimi" +msgstr "Modulin nimi" msgid "Installed" msgstr "Asennettu" @@ -1848,14 +1831,14 @@ msgstr "Toiminnot" msgid "help" -msgstr "" +msgstr "ohjeet" #, c-format msgid "Screenshot for %s" -msgstr "" +msgstr "Ruutukaappaus %s" msgid "Incompatible plugin!" -msgstr "Yhteensopimaton plugin!" +msgstr "Yhteensopimaton moduli!" #, c-format msgid "Core API Required: %s (available: %s)" @@ -1863,26 +1846,22 @@ #, c-format msgid "Plugin API Required: %s (available: %s)" -msgstr "Tarvittava plugin rajapinta (API): %s (käytettävissä: %s)" +msgstr "Tarvittava modulin rajapinta (API): %s (käytettävissä: %s)" msgid "configure" msgstr "konfiguroi" -#, fuzzy msgid "up to date" -msgstr "Päivitä" +msgstr "ajan tasalla" -#, fuzzy msgid "upgrade required" -msgstr "(vaadittu)" +msgstr "päivitys vaaditaan" -#, fuzzy msgid "not installed" -msgstr "poista" +msgstr "ei asennettu" -#, fuzzy msgid "incompatible" -msgstr "Yhteensopimaton plugin" +msgstr "Yhteensopimaton moduli" msgid "Repository" msgstr "Varasto" @@ -1893,28 +1872,28 @@ #, c-format msgid "Failed to scan status from plugin: %s." -msgstr "" +msgstr "Modulien %s statuskysely epäonnistui." msgid "The repository index has been successfully updated." msgstr "Varaston (repository) indeksin päivitys onnistui." msgid "All plugins are already up-to-date." -msgstr "Kaikki plugin:it ovat jo ajantasalla." +msgstr "Kaikki modulit ovat jo ajantasalla." #, c-format msgid "%s plugin updated." -msgstr "" +msgstr "%s modulia päivitettiin." #, c-format msgid "%d language pack deleted." msgid_plural "%d language packs deleted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d kielipaketti poistettiin." +msgstr[1] "%d kielipakettia poistettiin." msgid "" "No personal information about you or your Gallery installation is sent to the Gallery server " "at any time." -msgstr "" +msgstr "Tietoja sinusta tai Galleria-asennuksestasi ei lähetetä Galleria-palvelimille." #, c-format msgid "" @@ -1924,58 +1903,66 @@ "chosen, you must periodically download the latest plugin list to find out about available " "updates. %s On slower connections the process might take a minute or two." msgstr "" +"Lataa ja asenna uusia moduleita nopeasti ja helposti. Jos et halkua pitää yksittäistä " +"modulia voit poistaa sen Galleriasta. Moduli Repositoryjä on useita ja voit valita mitä " +"niistä haluat käyttää (myös kaikkien yhtäaikainen käyttö onnistuu). Kun olet valinnut " +"käytettävät Repositoryt, sinun pitää aika-ajoin ladata lista saatavilla olevista " +"päivityksistä ja uusimmista moduleista. %s Hitaammilla yhteyksillä prosessi voi kestää " +"minuutin-kaksi." #, c-format msgid "Officially Released Gallery Project plugins (%srecommended%s)" -msgstr "" +msgstr "Galleriaprojektin virallisesti julkaistut modulit (%ssuositellut%s)" #, c-format msgid "last updated on %s" -msgstr "" +msgstr "viimeksi päivitetty %s" #, c-format msgid "Experimental Gallery Project plugins (%scool new features, might be buggy%s)" msgstr "" +"Kokeelliset (beta) Galleriaprojektin modulit (%shienoa uutta ominaisuutta, saattaa olla " +"bugeja%s)" #, c-format msgid "Community plugins (%suse at your own risk!%s)" -msgstr "" +msgstr "Käyttäjien tekemät modulit (%skäyttö omalla vastuulla!%s)" -#, fuzzy msgid "Repository Error" -msgstr "Varasto" +msgstr "Repository virhe" -#, fuzzy msgid "You must select at least one repository." -msgstr "Sinun tulee valita poistettava käyttäjä." +msgstr "Sinun tulee valita ainakin yksi repository." msgid "Ok" -msgstr "" +msgstr "Ok" msgid "Configure your Gallery" -msgstr "" +msgstr "Määritä Galleria" msgid "" "Before you can proceed, you have to change some permissions so that Gallery can install " "plugins for you. It's easy. Just execute the following in a shell or via your ftp client:" msgstr "" +"Ennenkuin voit jatkaa, sinun täytyy muuttaa pääsyoikeuksia, jotta Galleria voi asentaa " +"moduleita puolestasi. Tämä on helppoa - suorita seuraavat komennot komentoriviltä tai ftp-" +"clientista:" msgid "" "If you have trouble changing permissions, ask your system administrator for assistance. " "When you've fixed the permissions, click the Continue button to proceed." msgstr "" +"Jos sinulla on hankaluuksia oikeuksien muuttamisessa, pyydä apua järjestelmän " +"pääkäyttäjältä. Kun oikeudet on asetettu, paina 'Jatka' siirtyäksesi seuraavaan vaiheeseen." -#, fuzzy msgid "Continue" -msgstr "Jatka..." +msgstr "Jatka" -#, fuzzy msgid "Download Plugin List" -msgstr "Lataa yksikkötestit (unit tests)" +msgstr "Lataa lista moduleista" -#, fuzzy msgid "Show Repository List" -msgstr "Varasto" +msgstr "Näytä lista repositoryistä" msgid "Upgrade Gallery" msgstr "Päivitä Galleria" @@ -1987,11 +1974,11 @@ "upgrading:" msgstr "" "Uusi versio Gallery:stä on julkaistu, mutta et voi päivittää sitä tämän käyttöliittymän " -"kautta. Päivitys saattaa rikkoa joitakin käyttämiäsi plugineja, mutta korvaavia versioita " +"kautta. Päivitys saattaa rikkoa joitakin käyttämiäsi moduleita, mutta korvaavia versioita " "saattaa tulla tilalle. Tässä näet päivitysohjeet:" msgid "Review plugin compatibility (on the Themes and Modules tabs)" -msgstr "Tarkista pluginien yhteensopivuus (Teemat ja Modulit -välilehdellä)" +msgstr "Tarkista modulien yhteensopivuus (Teemat ja Modulit -välilehdellä)" #, c-format msgid "%sDownload%s Gallery core" @@ -2002,7 +1989,7 @@ msgstr "Lue %späivitysohjeet%s ja suorita päivitys" msgid "Incompatible plugins are marked with an exclamation icon." -msgstr "Yhteensopimattomat pluginit on merkitty huutomerkillä." +msgstr "Yhteensopimattomat modulit on merkitty huutomerkillä." #, c-format msgid "" @@ -2010,16 +1997,15 @@ "installed core module, which are not shown here. You can view a %scomplete list%s of " "plugins, including incompatible ones, which are marked with a red icon." msgstr "" -"Uusi ydinmoduli on julkaistu. Osa plugineista voi olla yhteensopimattomia asennetun " -"ydinmodulin kanssa ja niitä ei näytetä. Voi katsoa %skoko plugin listaa%s " -"(yhteensopimattomat kohteet on merkitty punaisilla kuvakkeilla)" +"Uusi ydinmoduli on julkaistu. Osa moduleista voi olla yhteensopimattomia asennetun " +"ydinmodulin kanssa ja niitä ei näytetä. Voi katsoa %skoko modulilistaa%s (yhteensopimattomat " +"kohteet on merkitty punaisilla kuvakkeilla)" -#, fuzzy msgid "upgrade available" -msgstr "Päivitä Galleria" +msgstr "päivitys saatavilla" msgid "locked" -msgstr "" +msgstr "lukittu" msgid "Theme Name" msgstr "Teeman Nimi" @@ -2031,14 +2017,13 @@ msgstr "Viimeisin" msgid "Locked Plugin" -msgstr "" +msgstr "Lukittu moduli" msgid "Incompatible Plugin" -msgstr "Yhteensopimaton plugin" +msgstr "Yhteensopimaton moduli" -#, fuzzy msgid "Upgrade Available" -msgstr "Päivitä kaikki" +msgstr "Päivitys saatavilla" msgid "download" msgstr "lataa" @@ -2047,21 +2032,21 @@ msgstr "muokkaa" msgid "Upgrade All Plugins" -msgstr "Päivitä kaikki pluginit" +msgstr "Päivitä kaikki modulit" msgid "" "Gallery can automatically upgrade your themes and modules to the latest available versions. " "No new plugins will be downloaded." msgstr "" "Gallery voi automaattisesti päivittää teemat ja modulit uusimpiin versioihin. Uusia " -"pluginejä ei ladata." +"moduleita ei ladata." msgid "Upgrade All" msgstr "Päivitä kaikki" -#, fuzzy, c-format +#, c-format msgid "Download %s" -msgstr "Ladataan %s" +msgstr "Lataa %s" msgid "No packages have been selected." msgstr "Yhtään pakettia ei ole valittu." @@ -2071,52 +2056,53 @@ "of the package to download. Language packages are optional, You only need to download the " "ones that you want to use on your site." msgstr "" +"Lataa paketti käyttääksesi tätä modulia. Voit päivittää paketin valitsemalla ja lataamalla " +"uudemman version. Kielipaketit eivät ole pakollisia, lataa vain ne joita tarvitset omaan " +"Galleriaasi." -#, fuzzy msgid "Base Packages" -msgstr "Perustiedostot" +msgstr "Peruspaketit" #, c-format msgid "%s: version %s (build %s)" -msgstr "" +msgstr "%s: versio %s (build %s)" #, c-format msgid "%s: version %s (build %s) %sdowngrading is not supported!%s" -msgstr "" +msgstr "%s: versio %s (build %s) %späivitys vanhempaan versiion ei ole sallittua!%s" #, c-format msgid "%sCurrently Installed%s: version %s (build %s)" -msgstr "" +msgstr "%sAsennettu%s: versio %s (build %s)" -#, fuzzy msgid "Language Packages" -msgstr "Kielen Asetukset" +msgstr "Kielipaketit" #, c-format msgid "(%sselect all%s%sselect none%s)" -msgstr "" +msgstr "(%svalitse kaikkil%s%spoista valinnat%s)" #, c-format msgid "%s version %s (upgrading from %s)" -msgstr "" +msgstr "%s versio %s (päivitetään versiosta %s)" -#, fuzzy, c-format +#, c-format msgid "%s version %s" -msgstr "PHP versio" +msgstr "%s versio %s" #, c-format msgid "%s version %s (%snewer version %s is installed%s)" -msgstr "" +msgstr "%s versio %s (%suudempi versio %s on asennettu%s)" #, c-format msgid "%s version %s (currently installed)" -msgstr "" +msgstr "%s versio %s (olemassa oleva asennus)" msgid "No compatible language packages available" -msgstr "" +msgstr "Yhteensopivia kielipaketteja ei ole tarjolla" msgid "You must select a base package before choosing language packs." -msgstr "" +msgstr "Sinun täytyy valita peruspaketit ennen kielipakettien valitsemista." msgid "Update" msgstr "Päivitä" @@ -2167,9 +2153,8 @@ msgid "New albums" msgstr "Uusia albumeja" -#, fuzzy msgid "Save Defaults" -msgstr "Oletukset" +msgstr "Tallenna oletukset" #, c-format msgid "%s Theme Settings" @@ -2206,9 +2191,8 @@ msgid "There are no settings for this theme" msgstr "Tällä teemalla ei ole asetuksia" -#, fuzzy msgid "Save Theme Settings" -msgstr "Teeman %s Asetukset" +msgstr "Tallenna teeman asetukset" msgid "" "The toolkits shown below have some overlap in supported operations and mime types. Rank the " @@ -2262,13 +2246,11 @@ msgid "Edit User (by list)" msgstr "Muokkaa Käyttäjää (valitse listasta)" -#, fuzzy msgid "Locked" -msgstr "Lokaali" +msgstr "Lukittu" -#, fuzzy msgid "Failed Logins" -msgstr "Epäonnistui" +msgstr "Epäonnistuneita kirjautumisyrityksiä" msgid "Thumbnails" msgstr "Kuvakkeet" @@ -2302,9 +2284,8 @@ msgid "Platform Error" msgstr "Järjestelmävirhe" -#, fuzzy msgid "Authentication Failure" -msgstr "Autorisointi Vahvistettu" +msgstr "Autentikointi epäonnistui" msgid "Error" msgstr "Virhe" @@ -2325,10 +2306,11 @@ "If this problem happens repeatedly, it may be because of corruption in your cache. Site " "Administrators can clear out this cache." msgstr "" +"Jos ongelma on toistuva, kyseessä voi olla välimuistin korruptoituminen. Pyydä Gallerian " +"ylläpitäjää tyhjentämään välimuisti." -#, fuzzy msgid "Clear the cache" -msgstr "Poista tallennetut sivut" +msgstr "Tyhjennä välimuisti" msgid "Alternatively, you can return to the main Gallery page and resume browsing." msgstr "Vaihtoehtoisesti voit palata Gallerian pääsivulle ja jatkaa selailua." @@ -2340,6 +2322,8 @@ "Your change cannot be completed due to a loss of session data. Please try again. If it still " "doesn't work, try logging out and logging back in." msgstr "" +"Sessiotietojen katoamisen takia muutoksiasi ei voida tehdä. Ole hyvä ja yritä uudelleen. Jos " +"ongelma toistuu, kokeile kirjautua ulos ja takaisin sisään." msgid "An error has occurred while interacting with the database." msgstr "Tapahtui virhe tietokannan kanssa." @@ -2367,7 +2351,7 @@ "palautus varmuuskopiolta." msgid "Item not found." -msgstr "" +msgstr "Kohdetta ei löytynyt" msgid "An error has occurred." msgstr "Tapahtui virhe." @@ -2483,7 +2467,7 @@ "lähetystapaa, tai pyytää järjestelmän ylläpitäjää sallimaan isommat lähetykset." msgid "More Upload Boxes..." -msgstr "" +msgstr "Lisää latauskenttiä..." msgid "Set item titles from:" msgstr "Aseta kohteiden otsikot täältä:" @@ -2585,7 +2569,7 @@ "lisättyjä kohteita." msgid "Apply to all subalbums" -msgstr "Käytä kaikissa alialbumeissa" +msgstr "Käytä kaikissa albumeissa" msgid " Every item requires a thumbnail. Set the default size in pixels here." msgstr "" @@ -2595,7 +2579,7 @@ msgstr "Sinun on syötettävä numero, joka on suurempi kuin nolla" msgid "Use this thumbnail size in all subalbums" -msgstr "Käytä tätä pikkukuvan kokoa kaikissa alialbumeissa" +msgstr "Käytä tätä esikatselukuvan kokoa kaikissa seuraavissa albumeissa" msgid "Resized Images" msgstr "Skaalatut Kuvat" @@ -2613,11 +2597,10 @@ msgstr "Sinun tulee syöttää käyttökelpoinen koko" msgid "Use these target sizes in all subalbums" -msgstr "Käytä näitä kohdekokoja kaikissa alialbumeissa" +msgstr "Käytä näitä kohdekokoja kaikissa seuraavissa albumeissa" -#, fuzzy msgid "Apply settings to existing items" -msgstr "Muuta myös sisältyvät kohteet" +msgstr "Käytä asetuksia olemassa olevilla kohteilla" msgid "" "The thumbnail and resized image settings are for all new items. To apply these settings to " @@ -2626,24 +2609,27 @@ "Building images now makes this operation take longer, but saves the time to build and cache " "each file when it is first viewed." msgstr "" +"Esikatselu- ja skaalattujen kuvien asetukset koskevat uusia kuvia. Jotta asetuksia " +"käytettäisiin kaikkiin albumin kuviin, rastita ko. vaihtoehto. Vaihtoehdolla seuraavien " +"albumien kuva-asetukset asetetaan uudelleen albumikohtaisten asetuksiensa mukaisiksi, jotka " +"saattavat poiketa yo. asetuksista. Kuvien uudelleenrenderointi nyt vie pidempään, mutta " +"säästää aikaa verrattuna uudelleenrenderointiin silloin kun kuvaa katsellaan ensimmäisen " +"kerran." msgid "Apply album setting to thumbnails" -msgstr "" +msgstr "Käytä albumin asetuksia esikatselukuvissa" -#, fuzzy msgid "... and for all subalbums" -msgstr "Käytä kaikissa alialbumeissa" +msgstr "... ja kaikissa seuraavissa albumeissa" -#, fuzzy msgid "Build thumbnails too" -msgstr "Luodaan esikatselukuvat uudelleen..." +msgstr "Luo esikatselukuvat uudelleen myös" -#, fuzzy msgid "Apply album setting to resized images" -msgstr "Luodaan skaalatut kuvat uudelleen" +msgstr "Käytä albumin asetuksia skaalatuille kuville" msgid "Build resizes too" -msgstr "" +msgstr "Renderoi myös skaalatut koot" msgid "" "In order for Gallery to properly display this animation, it has to know the animation's " @@ -2772,9 +2758,8 @@ "Ei ole työkalua tämän tyyppiselle kohteelle, joten emme voi tehdä tai muokata " "esikatselukuvaa." -#, fuzzy msgid "Unable to create a thumbnail for this item" -msgstr "Sinun tulee antaa nimi tälle kohteelle." +msgstr "Kohteelle ei voitu luoda esikatselukuvaa" msgid "" "In order for Gallery to properly display this movie, it has to know the movie's width and " @@ -2819,9 +2804,8 @@ msgid "Crop" msgstr "Rajaa" -#, fuzzy msgid "Undo Changes" -msgstr "Muuta" +msgstr "Peruuta muutokset" msgid "Reset to default" msgstr "Palauta oletusarvo" @@ -2901,6 +2885,8 @@ "There is no toolkit support to modify the original so operations may only be applied to the " "copies" msgstr "" +"Työkaluja alkuperäisten kohteiden muokkaukseen ei ole, joten operaatio suoritetaan vain " +"kopioihin" msgid "Preserve Original Photo" msgstr "Säilytä Alkuperäinen Kuva" @@ -2919,34 +2905,33 @@ msgid "Restore original" msgstr "Palauta alkuperäinen" -#, fuzzy msgid "Choose a theme" -msgstr "Valitse lohko" +msgstr "Valitse teema" #, c-format msgid "" "Themes control the look and feel of the album. You can choose a different theme for each " "album. If you don't choose a theme, we'll use the %s theme by default." msgstr "" +"Teemoilla mukautat albumien ulkonäköä ja toiminnallisuutta. Voit valita eri teeman eri " +"albumeille. Oletuksena käytetään teemaa %s, jos valintaa ei suoriteta." msgid "Use this theme in all subalbums" -msgstr "Käytä tätä temaa kaikissa alialbumeissa" +msgstr "Käytä tätä temaa kaikissa seuraavissa albumeissa" msgid "Choose Theme" -msgstr "" +msgstr "Valitse teema" #, c-format msgid "Configure the %s theme" -msgstr "" +msgstr "Määritä %s teema" -#, fuzzy msgid "These settings only apply to the theme for this album." -msgstr "" -"Tämä albumi käyttää teemaa <b>%s</b>. Nämä asetukset koskevat vain tämän albumin teemaa." +msgstr "Näitä asetuksia käytetään vain tämän albumin teemassa." -#, fuzzy, c-format +#, c-format msgid "Use these settings in all subalbums that use the %s theme" -msgstr "Käytä näitä asetuksia kaikissa alialbumeissa, jotka käyttävät teemaa %s" +msgstr "Käytä asetuksia kaikissa seuraavissa albumeissa, jotka käyttävät teemaa %s" msgid "Album Highlight" msgstr "Albumin Esimerkkikuva" @@ -3162,13 +3147,16 @@ msgstr "jälkeen" msgid "Reorder" -msgstr "Järjestä" +msgstr "Järjestä uudelleen" msgid "" "JavaScript must be enabled for this page to function properly. However, it seems JavaScript " "is either disabled or not supported by your browser. Please enable JavaScript by changing " "your browser options, then try again." msgstr "" +"JavaScriptin täytyy olla päällä, jotta sivu toimisi kunnolla. Näyttäisi siltä, että " +"selaimesi ei tue JavaScriptiä. Ole hyvä ja salli JavaScriptin käyttö selaimesi asetuksista " +"ja yritä uudelleen." msgid "Site is temporarily down for maintenance." msgstr "Palvelin on tilapäisesti poissa käytöstä huollon takia." @@ -3180,7 +3168,7 @@ msgstr "Kirjoita URL" msgid "Enter some text describing the URL" -msgstr "Kirjoita jotain kuvaamaan URL" +msgstr "Anna URL:n kuvaus" msgid "Enter an image URL" msgstr "Kirjoita kuvan URL" @@ -3203,13 +3191,12 @@ msgid "image" msgstr "kuva" -#, fuzzy msgid "color" -msgstr "ydin" +msgstr "väri" #, c-format msgid "You can also use the <a href=\"%s\" target=\"_new\">color name</a> for example: %s" -msgstr "" +msgstr "Voit myös käyttää <a href=\"%s\" target=\"_new\">värin nimi</a> esim: %s" msgid "Configuration Error: Missing Theme" msgstr "Konfigurointivirhe: Puuttuva Teema" @@ -3315,11 +3302,13 @@ "This account is not allowed to modify account settings. Please contact your Gallery " "administrator" msgstr "" +"Tällä tilillä ei ole oikeuksia muuttaa tilien asetuksia. Ole hyvä ja ota yhteyttä Gallerian " +"ylläpitoon." msgid "" "Your administrator has locked this account, preventing changes from being made to the " "account information." -msgstr "" +msgstr "Ylläpito on lukinnut tämä tilin. Muutoksia tilin tietoihin ei voida suorittaa." msgid "Login to your account" msgstr "Kirjaudu sisään" @@ -3333,6 +3322,9 @@ "for access to be restored, or use the <a href=\"%s\">recover password</a> page to re-enable " "this account." msgstr "" +"Kirjautuminen näillä käyttäjätunnuksilla on tilapäisesti estetty. Syynä tähän ovat lukuisat " +"epäonnistuneet kirjautumisyritykset. Odota tilin oikeuksien palautumista tai käytä <a href=" +"\"%s\">palauta salasana</a> sivua käyttäjätilin palauttamiseen." msgid "Your login information is incorrect. Please try again." msgstr "Sisäänkirjautumistietosi ovat väärät. Yritä uudelleen." @@ -3633,499 +3625,3 @@ msgid "Links to album/photo peers" msgstr "Linkit albumin/kuvan vastapuoliin" - -#~ msgid "Performing Maintenance Tasks" -#~ msgstr "Suorita ylläpitotehtäviä" - -#~ msgid "Upgrade" -#~ msgstr "Päivitä" - -#~ msgid "Download" -#~ msgstr "Lataus" - -#~ msgid "Detecting broken derivatives " -#~ msgstr "Etsii rikkoutuneita johdannaisia" - -#~ msgid "Detecting broken derivatives, " -#~ msgstr "Etsii rikkoutuneita johdannaisia, " - -#~ msgid "From Local Server" -#~ msgstr "Paikalliselta Palvelimelta" - -#~ msgid "From Web Page" -#~ msgstr "Web-sivulta" - -#~ msgid "create link" -#~ msgstr "luo linkki" - -#~ msgid "link an item" -#~ msgstr "linkitä kohde" - -#~ msgid "Rebuilding resized images..." -#~ msgstr "Luodaan skaalatut kuvat uudelleen..." - -#~ msgid "Create Link" -#~ msgstr "Luo Linkki" - -#~ msgid "Modules" -#~ msgstr "Moduulit" - -#~ msgid "Display" -#~ msgstr "Näyttö" - -#~ msgid "Link Album" -#~ msgstr "Linkitä Albumi" - -#~ msgid "Link Photo" -#~ msgstr "Linkitä Kuva" - -#~ msgid "Link Movie" -#~ msgstr "Linkitä Video" - -#~ msgid "Link %s" -#~ msgstr "Linkitä %s" - -#~ msgid "Plugins directory does not exist." -#~ msgstr "Plugin hakemistoa ei ole olemassa." - -#~ msgid "" -#~ "Couldn't create plugins subdirectory. Make sure the webserver has write permissions in it." -#~ msgstr "" -#~ "Lisäosien (plugin) alihakemistoa ei voitu luoda. Varmista että http-palvelimella on " -#~ "kirjoitusoikeudet kohteeseen." - -#~ msgid "G2.1: Blackjack" -#~ msgstr "G2.1: Blackjack" - -#~ msgid "Format: [module.BlockName param=value] ..." -#~ msgstr "Muoto: [module.BlockName param=value] ..." - -#~ msgid "" -#~ "Invalid return URL! The requested URL %s tried to insert a redirection to %s which is not " -#~ "a part of this Gallery." -#~ msgstr "" -#~ "Epäkelpo paluu URL! Pyydetty URL %s yritti lisätä tämän Gallerian ulkopuolisen " -#~ "uudelleenohjauksen %s:ään." - -#~ msgid "Local Server Upload Paths" -#~ msgstr "Paikallisen Palvelimen Siirtohakemistot" - -#~ msgid "" -#~ "Specify the legal directories on the local server where a user can store files and then " -#~ "upload them into Gallery using the <i>Upload from Local Server</i> feature. The paths " -#~ "you enter here and all the files and directories under those paths will be available to " -#~ "any Gallery user who has upload privileges, so you should limit this to directories that " -#~ "won't contain sensitive data (eg. /tmp or /usr/ftp/incoming)" -#~ msgstr "" -#~ "Määritä hakemisto paikallisella palveimella, jonne käyttäjät voivat tallettaa " -#~ "tiedostojaan ja sitten lähettää ne Galleriaan käyttämällä <i>Lähetä paikalliselta " -#~ "palvelimelta</i> -ominaisuutta. Antamasi hakemisto ja tiedostot näkyvät kaikille " -#~ "Gallerian käyttäjille, joilla on lähetysoikeudet, joten älä laita tähän hakemistoja jotka " -#~ "sisältävät arkaluontoista materiaalia! (esim. /tmp tai /usr/ftp/incoming)" - -#~ msgid "remove" -#~ msgstr "poista" - -#~ msgid "You must enter a directory to add." -#~ msgstr "Sinun on annettava hakemisto jonka haluat lisätä." - -#~ msgid "open_basedir documentation" -#~ msgstr "open_basedir dokumentaatio" - -#~ msgid "" -#~ "Your webserver is configured to prevent you from accessing that directory. Please refer " -#~ "to the %s and consult your webserver administrator." -#~ msgstr "" -#~ "Palvelin on asetettu estämään sinua käyttämästä kyseistä hakemistoa. Ole hyvä ja katso " -#~ "hakemistoon %s ja selvitä asia palvelimen ylläpitäjän kanssa." - -#~ msgid "The webserver does not have permissions to read that directory." -#~ msgstr "Palvelimella ei ole oikeuksia lukea kyseistä hakemistoa." - -#~ msgid "The path you specified is not a valid directory." -#~ msgstr "Polku jonka annoit ei ole hakemisto." - -#~ msgid "Successfully installed and auto-configured module %s" -#~ msgstr "Asennettu ja itse-konfiguroitu moduuli %s" - -#~ msgid "Successfully installed module %s" -#~ msgstr "Moduuli %s asennettu" - -#~ msgid "Successfully configured module %s" -#~ msgstr "Moduuli %s konfiguroitu" - -#~ msgid "Successfully upgraded module %s" -#~ msgstr "Moduuli %s päivitetty" - -#~ msgid "Successfully activated module %s" -#~ msgstr "Moduuli %s otettu käyttöön" - -#~ msgid "Successfully deactivated module %s" -#~ msgstr "Moduuli %s otettu pois käytöstä" - -#~ msgid "Successfully uninstalled module %s" -#~ msgstr "Moduuli %s poistettu" - -#~ msgid "Incompatible module!" -#~ msgstr "Epäyhteensopiva moduuli!" - -#~ msgid "Module API Required: %s (available: %s)" -#~ msgstr "Tarvittava Moduulin Rajapinta: %s (käytettävissä: %s)" - -#~ msgid "Confirm module uninstall" -#~ msgstr "Vahvista moduulin poisto" - -#~ msgid "This will also remove any permissions and clean up any data created by this module." -#~ msgstr "Tämä poistaa myös kaikki oikeudet ja siivoaa moduulin luomat tilapäistiedot." - -#~ msgid "Uninstall" -#~ msgstr "Poista" - -#~ msgid "Common Tasks" -#~ msgstr "Yleiset tehtävät" - -#~ msgid "Warning: Experimental feature!" -#~ msgstr "Varoitus: Toiminto on kokeellinen!" - -#~ msgid "" -#~ "The repository features are currently experimental, and no actual repository has been set " -#~ "up yet, so none of these features will work at this time." -#~ msgstr "" -#~ "Tietovaraston (repository) toiminnot ovat vasta kokeiluasteella ja varsinaista " -#~ "tietovarastoa ei ole vielä toteutettu, joten mikään näistä toiminnoista ei toimi." - -#~ msgid "" -#~ "The Gallery repository contains the latest modules and themes extensively tested by the " -#~ "Gallery team. The repository index contains information about available plugins, such as " -#~ "the latest versions, available languages and compatibility. The index must be " -#~ "synchronized periodically with the Gallery server so you are informed about any available " -#~ "updates. No personal information is sent to the Gallery server during updating. On slower " -#~ "connections the process might take a minute or two." -#~ msgstr "" -#~ "Galleryn tietovarasto sisältää viimeisimmät modulit ja teemat, jotka on testannut Gallery-" -#~ "kehitystiimi. Tietovaraston indeksi sisältää tiedot saatavilla olevista plugineistä, " -#~ "uusimmista versioista, yhteensopivuudesta ja käännöksistä (kielet). Indeksi täytyy " -#~ "päivittää ajoittain Gallery-palvelimelta, jotta tiedot uusimmista päivityksistä olisivat " -#~ "saatavissa. Indeksiä päivitettäessä henkilötietoja ei välitetä palvelimelle. Hitaammilla " -#~ "yhteyksillä indeksin päivitys voi viedä minuutin-kaksi." - -#~ msgid "" -#~ "As of the last update on %s, the repository contains %s modules and %s themes. Its " -#~ "contents can be viewed on the Modules and Themes tabs." -#~ msgstr "" -#~ "Viimeisen päivityksen %s jälkeen tietovarastossa (repository) on %s modulia ja %s teemaa. " -#~ "Pääset katsomaan sisältöä välilehdeltä \"Modulit ja Teemat\"." - -#~ msgid "" -#~ "The index has never been updated. Click on the Update button to see what updates are " -#~ "available." -#~ msgstr "" -#~ "Indeksiä ei ole päivitetty ikinä. Paina \"Päivitä\" -painiketta nähdäksesi mitä " -#~ "päivityksiä on saatavilla." - -#~ msgid "Gallery Up-To-Date" -#~ msgstr "Galleria ajan tasalla" - -#~ msgid "" -#~ "Gallery cannot be upgraded through this interface. When a new version becomes available, " -#~ "upgrade instructions will be presented here." -#~ msgstr "" -#~ "Et voi päivittää Gallery:ä tämän käyttöliittymän kautta. Kun uusia versioita julkaistaan, " -#~ "päivitysohjeet esitetään täällä." - -#~ msgid "" -#~ "Once the repository index has been downloaded, a list of available plugins will be " -#~ "presented. It can be downloaded by clicking on the Update button on the Common Tasks tab." -#~ msgstr "" -#~ "Kun tietovaraston (repository) indeksi on ladattu, näet listan saatavilla olevista " -#~ "plugineistä. Lataa kohteet painamalla \"Päivitä\" painiketta välilehdellä \"Yleiset " -#~ "toiminnot\"." - -#~ msgid "" -#~ "The following plugins are available. Click on the action beside the plugin you're " -#~ "interested in to see what's available in the repository." -#~ msgstr "" -#~ "Seuraavat pluginit ovat saatavilla. Paina kiinnostavan pluginin vieressä olevaa toimintoa " -#~ "saadaksesi selville mitä tietovarastossa on kohteesta tarjolla." - -#~ msgid "" -#~ "The base files required for the theme to work and the English (US) translation will be " -#~ "downloaded." -#~ msgstr "Teeman tarvitsemat perustiedostot ja englanninkielinen (ENU) käännös ladataan." - -#~ msgid "Upgrade Base Files" -#~ msgstr "Päivitä perustiedostot" - -#~ msgid "You can upgrade the base module files." -#~ msgstr "Voit päivittää perusmodulien tiedostot" - -#~ msgid "Upgrade base files" -#~ msgstr "Päivitä perustiedostot" - -#~ msgid "Base Files Up-To-Date" -#~ msgstr "Perustiedosto ovat ajantasalla" - -#~ msgid "This plugin's base files are up-to-date." -#~ msgstr "Pluginien perustiedost ovat ajantasalla." - -#~ msgid "Updated Translations" -#~ msgstr "Päivitetyt käännösversiot (kielet)" - -#~ msgid "" -#~ "Below is a list of translations that have been updated since they were last downloaded. " -#~ "Select the ones you want to download." -#~ msgstr "" -#~ "Alla on lista käännöksistä, joita on päivitetty viimeisen päivityslatauksen jälkeen. " -#~ "Valitse ne jotka haluat ladata." - -#~ msgid "Additional Languages" -#~ msgstr "Muut kielet" - -#~ msgid "" -#~ "Below is a list of languages this plugin has been translated to. Select the ones you want " -#~ "included in addition to the ones already downloaded." -#~ msgstr "" -#~ "Alla on lista kieleistä, joille tämä plugin on käännetty. Jo lataamiesi lisäksi valitse " -#~ "ne, jotka haluat lisätä." - -#~ msgid "Unit Tests" -#~ msgstr "Yksikkötestit (unit tests)" - -#~ msgid "" -#~ "This plugin has unit tests available for download, which are useful for Gallery " -#~ "developers. All of the module's features are available without the tests." -#~ msgstr "" -#~ "Tälle pluginille on saatavilla yksikkötestejä (unit tests), jotka ovat hyödyllisiä " -#~ "Gallery kehittäjille. Kaikki modulin ominaisuudet ovat saatavilla ilman ko. testejä." - -#~ msgid "Gallery Repository Setup" -#~ msgstr "Gallerian tietovaraston (repository) asennus" - -#~ msgid "" -#~ "In order to download plugins from the Gallery repository, a special directory needs to be " -#~ "created where Gallery will store the data. Under your Gallery base directory, create a " -#~ "directory called '%s' and allow the web server to write into it by appropriately setting " -#~ "the permissions." -#~ msgstr "" -#~ "Ladataksesi pluginejä Gallery tietovarastosta (repository), sinun pitää luoda hakemisto, " -#~ "jonne Gallery tallentaa tiedot. Luo hakemisto '%s' Galleryn perushakemistoon ja anna http-" -#~ "palvelimelle kirjoitusoikeudet siihen." - -#~ msgid "Instructions for Unix-type platforms:" -#~ msgstr "Ohjeet Unix-tyylisille järjestelmille:" - -#~ msgid "" -#~ "Refreshing this page will take you to the Repository if the directory has been " -#~ "successfully created." -#~ msgstr "" -#~ "Päivittällä tämän sivun (esim. Shift+F5) näet tietovaraston (repository), jos hakemiston " -#~ "luonti onnistui." - -#~ msgid "All Themes" -#~ msgstr "Kaikki Teemat" - -#~ msgid "Status: Incompatible Theme (Inactive)" -#~ msgstr "Tila: Epäyhteensopiva Teema (Ei Käytössä)" - -#~ msgid "Incompatible theme!" -#~ msgstr "Epäyhteensopiva teema!" - -#~ msgid "Theme API Required: %s (available: %s)" -#~ msgstr "Vaadittu Teeman Rajapinta: %s (käytettävissä: %s)" - -#~ msgid "(default)" -#~ msgstr "(oletusarvo)" - -#~ msgid "More.." -#~ msgstr "Lisää.." - -#~ msgid "" -#~ "Transfer files that are already on your server into your Gallery. The files must already " -#~ "have been uploaded to your server some other way (like FTP) and must be placed in a " -#~ "directory where they are accessibly by any element on the server. If you're on Unix this " -#~ "means that the files and the directory the files are in should have modes of at least 755." -#~ msgstr "" -#~ "Siirrä palvelimella jo sijaitsevat tiedostot Galleriaan. Tiedostojen pitää olla jo " -#~ "siirretty palvelimelle jollain tavalla (kuten FTP) ja ne täytyy sijaita jossain " -#~ "hakemistossa minne kaikilla palvelimella on lukuoikeudet. UNIX:issa tämä tarkoittaa " -#~ "yleensä sitä, että hakemistoilla ja tiedostoilla täytyy olla käyttöoikeudet 0755." - -#~ msgid "" -#~ "For security purposes, you can't use this feature until the Gallery Site Administrator " -#~ "configures a set of legal upload directories." -#~ msgstr "" -#~ "Turvallisuussyistä et voi käyttää tätä ominaisuutta ennenkuin Gallerian ylläpitäjä " -#~ "määrittelee paikalliset kopiointihakemistot." - -#~ msgid "Server Path" -#~ msgstr "Palvelimen Polku" - -#~ msgid "You must enter a directory." -#~ msgstr "Sinun on annettava hakemisto." - -#~ msgid "" -#~ "The directory you entered is invalid. Make sure that the directory is readable by all " -#~ "users." -#~ msgstr "" -#~ "Antamasi hakemisto ei kelpaa. Tarkista, että hakemiston lukeminen onnistuu kaikilta " -#~ "käyttäjiltä." - -#~ msgid "" -#~ "The directory you entered is illegal. It must be a sub directory of one of the " -#~ "directories listed below." -#~ msgstr "Antamasi hakemisto ei käy. Sen täytyy olla allaolevien hakemistojen alahakemisto." - -#~ msgid "An item with the same name already exists." -#~ msgstr "Kohde samalla nimellä on jo olemassa." - -#~ msgid "Legal Directories" -#~ msgstr "Luvalliset Hakemistot" - -#~ msgid "Recent Directories" -#~ msgstr "Viimeaikaiset Hakemistot" - -#~ msgid "Find Files" -#~ msgstr "Etsi Tiedostoja" - -#~ msgid "Directory: %s" -#~ msgstr "Hakemisto: %s" - -#~ msgid "File name" -#~ msgstr "Tiedostonnimi" - -#~ msgid "Type" -#~ msgstr "Tyyppi" - -#~ msgid "Size" -#~ msgstr "Koko" - -#~ msgid "Use Symlink" -#~ msgstr "Käytä Symbolista Linkkiä" - -#~ msgid "%d byte" -#~ msgid_plural "%d bytes" -#~ msgstr[0] "%d tavu" -#~ msgstr[1] "%d tavua" - -#~ msgid "Parent Directory" -#~ msgstr "Ylempi Hakemisto" - -#~ msgid "Directory" -#~ msgstr "Hakemisto" - -#~ msgid "(Un)check all known types" -#~ msgstr "Valitse/Poista kaikki tunnistetut tyypit" - -#~ msgid "(Un)check symlinks" -#~ msgstr "Valitse/Poista symboliset linkit" - -#~ msgid "for selected items" -#~ msgstr "valituille kohteille" - -#~ msgid "Copy base filenames to:" -#~ msgstr "Kopioi tiedostonimet tänne:" - -#~ msgid "Add Files" -#~ msgstr "Lisää tiedostoja" - -#~ msgid "Start Over" -#~ msgstr "Aloita Alusta" - -#~ msgid "" -#~ "Import files into Gallery from another website. Enter a URL below to a web page anywhere " -#~ "on the net and Gallery will allow you to upload any media files that it finds on that " -#~ "page. Note that if you're entering a URL to a directory, you should end the URL with a " -#~ "trailing slash (eg, http://example.com/directory/). " -#~ msgstr "" -#~ "Tuo tiedostoja Galleriaan toiselta web-sivustolta. Kirjoita sivun URL ja Galleria antaa " -#~ "sinun siirtää mitä hyvänsä mediatiedostoja jotka se löytää kyseiseltä sivulta. Huomaa " -#~ "että jos annat URL:n hakemistoon, sinun tulee päättää URL kauttaviivalla (esim. http://" -#~ "example.com/hakemisto/)." - -#~ msgid "URL" -#~ msgstr "URL" - -#~ msgid "You must enter a URL to a web page" -#~ msgstr "Sinun tulee antaa URL web-sivulle" - -#~ msgid "The URL entered must begin with http://" -#~ msgstr "URL täytyy alkaa http://" - -#~ msgid "The web page you specified is unavailable" -#~ msgstr "Antamasi web-sivu ei ole saatavilla" - -#~ msgid "Nothing to add found from this URL" -#~ msgstr "Sivulta ei löytynyt mitään lisättävää" - -#~ msgid "Nothing added since no items were selected" -#~ msgstr "Mitään ei lisätty sillä yhtään kohdetta ei valittu" - -#~ msgid "Recent URLs" -#~ msgstr "Viimeaikaiset URL:t" - -#~ msgid "URL: %s" -#~ msgstr "URL: %s" - -#~ msgid "%d url found" -#~ msgid_plural "%d urls found" -#~ msgstr[0] "yksi url löytyi" -#~ msgstr[1] "%d url:aa löytyi" - -#~ msgid "(Un)check all" -#~ msgstr "Valitse/Poista kaikki" - -#~ msgid "Add URLs" -#~ msgstr "Lisää URL:ia" - -#~ msgid "Link an Item" -#~ msgstr "Linkitä Kohde" - -#~ msgid "Successfully linked %d item" -#~ msgid_plural "Successfully linked %d items" -#~ msgstr[0] "Onnistuneesti linkitetty yksi kohde." -#~ msgstr[1] "Onnistuneesti linkitetty %d kohdetta." - -#~ msgid "This album contains no items to link." -#~ msgstr "Albumissa ei ole linkitettäviä kohteita." - -#~ msgid "Choose the items you want to link" -#~ msgstr "Valitse linkitettävät kohteet" - -#~ msgid "No sources chosen" -#~ msgstr "Lähdettä ei ole valittu" - -#~ msgid "Choose a new album for the link" -#~ msgstr "Valitse linkille uusi albumi" - -#~ msgid "Link" -#~ msgstr "Linkitä" - -#~ msgid "Successfully linked" -#~ msgstr "Linkitetty" - -#~ msgid "Choose a theme for this album. (The way the album is arranged on the page)" -#~ msgstr "Valitse teema tälle albumille. (Tapa jolla albumi sommitellaan sivulle)" - -#~ msgid "Recreate thumbnails and resizes" -#~ msgstr "Luo esikatseluvat sekä skaalaukset uudelleen" - -#~ msgid "" -#~ "The thumbnail and resized image settings are for all new items. To apply these settings " -#~ "to all the items in your album, check the appropriate box." -#~ msgstr "" -#~ "Esikatselukuvien sekä skaalattujen kuvien asetukset ovat vain kaikille uusille kohteille. " -#~ "Hyväksyäksesi nämä asetukset kaikkiin jo albumissa oleviin kohteisiin, valitse " -#~ "asianmukainen ruutu." - -#~ msgid "Recreate thumbnails" -#~ msgstr "Luo esikatselukuvat uudelleen" - -#~ msgid "Recreate resized images" -#~ msgstr "Luo skaalatut kuvat uudelleen" - -#~ msgid "" -#~ "Note: to set the same theme for all subalbums, check the appropriate box in <b>Album</b> " -#~ "tab" -#~ msgstr "" -#~ "Huom: asettaaksesi saman teeman kaikille alialbumeille, rastita ko. valinta <b>Albumi</b> " -#~ "välilehdellä." Modified: trunk/gallery2/modules/register/locale/fi/LC_MESSAGES/modules_register.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/register/po/fi.po =================================================================== --- trunk/gallery2/modules/register/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/register/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Gallery: Registration 1.0.6\n" "Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 08:08-0800\n" +"POT-Creation-Date: 2006-12-21 07:20-0800\n" "PO-Revision-Date: 2006-12-20 12:21+0200\n" "Last-Translator: Erkka Hakkarainen <erk...@pp...>\n" "Language-Team: Finnish <gal...@li...>\n" @@ -44,10 +44,10 @@ msgstr "" msgid "Yes" -msgstr "" +msgstr "Kyllä" msgid "No" -msgstr "" +msgstr "Ei" msgid "Registration" msgstr "" Modified: trunk/gallery2/modules/remote/locale/fi/LC_MESSAGES/modules_remote.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/remote/po/fi.po =================================================================== --- trunk/gallery2/modules/remote/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/remote/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Remote 1.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-11 11:02+0200\n" +"Report-Msgid-Bugs-To: gal...@li...\n" +"POT-Creation-Date: 2006-12-21 07:22-0800\n" "PO-Revision-Date: 2005-12-11 11:08+0200\n" "Last-Translator: Marko Kohtala <mar...@gm...>\n" "Language-Team: Finnish <gal...@li...>\n" @@ -42,13 +42,17 @@ msgstr "Tuonti" msgid "" -"Gallery Remote is a Java application that runs on your desktop computer and " -"provides a rich interface to Gallery. With Gallery Remote you can drag and " -"drop to photos to upload them to Gallery, rotate and resize your images " -"before uploading, and even view the photos in your Gallery in a slideshow on " -"your desktop computer. You must install Gallery Remote 1.4 or newer to use " -"it with this version of Gallery." -msgstr "Gallerian Etäkäyttö on Javasovellus joka toimii omalla koneellasi ja tarjoaa monipuolisen käyttöliittymän Galleriaan. Gallerian Etäkäytöllä voit siirtää kuvia hiirellä Galleriaan, kääntää ja muuttaa kuviesi kokoa ennen siirtoa, ja jopa katsoa Gallerian kuvia diaesityksenä omalla koneellasi. Sinun tulee asentaa Gallery Remote 1.4 tai uudempi käyttääksesi sitä tämän Galleriaversion kanssa." +"Gallery Remote is a Java application that runs on your desktop computer and provides a rich " +"interface to Gallery. With Gallery Remote you can drag and drop to photos to upload them to " +"Gallery, rotate and resize your images before uploading, and even view the photos in your " +"Gallery in a slideshow on your desktop computer. You must install Gallery Remote 1.4 or " +"newer to use it with this version of Gallery." +msgstr "" +"Gallerian Etäkäyttö on Javasovellus joka toimii omalla koneellasi ja tarjoaa monipuolisen " +"käyttöliittymän Galleriaan. Gallerian Etäkäytöllä voit siirtää kuvia hiirellä Galleriaan, " +"kääntää ja muuttaa kuviesi kokoa ennen siirtoa, ja jopa katsoa Gallerian kuvia diaesityksenä " +"omalla koneellasi. Sinun tulee asentaa Gallery Remote 1.4 tai uudempi käyttääksesi sitä " +"tämän Galleriaversion kanssa." msgid "Download Gallery Remote" msgstr "Lataa Gallerian Etäkäyttö" Modified: trunk/gallery2/modules/slideshowapplet/locale/fi/LC_MESSAGES/modules_slideshowapplet.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/slideshowapplet/po/fi.po =================================================================== --- trunk/gallery2/modules/slideshowapplet/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/slideshowapplet/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: Gallery: Slideshow Applet 1.0.4\n" "Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 07:46-0800\n" +"POT-Creation-Date: 2006-12-21 07:21-0800\n" "PO-Revision-Date: 2005-12-03 12:09+0200\n" "Last-Translator: Marko Kohtala <mar...@gm...>\n" "Language-Team: Finnish <gal...@li...>\n" @@ -130,7 +130,7 @@ msgstr "" msgid "help" -msgstr "" +msgstr "ohjeet" msgid "maximum number of pictures shown in one go" msgstr "" Modified: trunk/gallery2/modules/uploadapplet/locale/fi/LC_MESSAGES/modules_uploadapplet.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/uploadapplet/po/fi.po =================================================================== --- trunk/gallery2/modules/uploadapplet/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/uploadapplet/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: Gallery: Upload Applet 1.0.4\n" "Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 07:46-0800\n" +"POT-Creation-Date: 2006-12-21 07:21-0800\n" "PO-Revision-Date: 2005-12-03 13:43+0200\n" "Last-Translator: Marko Kohtala <mar...@gm...>\n" "Language-Team: Finnish <gal...@li...>\n" @@ -130,7 +130,7 @@ msgstr "" msgid "help" -msgstr "" +msgstr "ohjeet" msgid "" "instructs the applet to resize pictures before uploading to the album; by default, resizes " Modified: trunk/gallery2/modules/useralbum/locale/fi/LC_MESSAGES/modules_useralbum.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/useralbum/po/fi.po =================================================================== --- trunk/gallery2/modules/useralbum/po/fi.po 2006-12-21 07:06:00 UTC (rev 15531) +++ trunk/gallery2/modules/useralbum/po/fi.po 2006-12-21 15:38:18 UTC (rev 15532) @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Gallery: User Albums 1.0.3\n" "Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 08:08-0800\n" +"POT-Creation-Date: 2006-12-21 07:21-0800\n" "PO-Revision-Date: 2006-12-20 12:21+0200\n" "Last-Translator: Erkka Hakkarainen <erk...@pp...>\n" "Language-Team: Finnish <gal...@li...>\n" @@ -50,10 +50,10 @@ msgstr "" msgid "Yes" -msgstr "" +msgstr "Kyllä" msgid "No" -msgstr "" +msgstr "Ei" msgid "User Albums" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ja...@us...> - 2006-12-23 06:30:38
|
Revision: 15543 http://svn.sourceforge.net/gallery/?rev=15543&view=rev Author: jablko Date: 2006-12-22 22:30:37 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Add HTTP auth logout views to try clearing the browser's authentication cache Support Gallery::Logout event listeners instructing the core logout controller to delegate to a view Add unit tests for HttpAuthModule::handleEvent Add unit test for core logout controller delegation Modified Paths: -------------- trunk/gallery2/modules/core/Logout.inc trunk/gallery2/modules/core/test/phpunit/LogoutControllerTest.class trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class Added Paths: ----------- trunk/gallery2/modules/httpauth/FinishLogout.inc trunk/gallery2/modules/httpauth/TryLogout.inc trunk/gallery2/modules/httpauth/templates/FinishLogout.tpl trunk/gallery2/modules/httpauth/templates/TryLogout.tpl Modified: trunk/gallery2/modules/core/Logout.inc =================================================================== --- trunk/gallery2/modules/core/Logout.inc 2006-12-22 22:50:32 UTC (rev 15542) +++ trunk/gallery2/modules/core/Logout.inc 2006-12-23 06:30:37 UTC (rev 15543) @@ -42,35 +42,51 @@ $event = GalleryCoreApi::newEvent('Gallery::Logout'); $event->setEntity($gallery->getActiveUser()); - list ($ret) = GalleryCoreApi::postEvent($event); + list ($ret, $eventResults) = GalleryCoreApi::postEvent($event); if ($ret) { return array($ret, null); } + $results = array(); + foreach ($eventResults as $key => $value) { + if (!empty($value['delegate'])) { + $results['delegate'] = $value['delegate']; + } + } + $session =& $gallery->getSession(); $ret = $session->reset(); if ($ret) { return array($ret, null); } - list ($ret, $anonymousUserId) = GalleryCoreApi::getAnonymousUserId(); + list ($ret, $anonymousId) = GalleryCoreApi::getAnonymousUserId(); if ($ret) { return array($ret, null); } - list ($ret, $guestUser) = GalleryCoreApi::loadEntitiesById($anonymousUserId); + list ($ret, $guestUser) = GalleryCoreApi::loadEntitiesById($anonymousId); if ($ret) { return array($ret, null); } $gallery->setActiveUser($guestUser); + if (!isset($results['status'])) { + $results['status'] = array(); + } + if (!isset($results['error'])) { + $results['error'] = array(); + } + /* - * Force return to core.ShowItem, as we don't know if the guest user - * has necessary permissions for the return page + * Force return to core.ShowItem, as we don't know if the guest user has necessary + * permissions for the return page */ - $results['redirect']['view'] = 'core.ShowItem'; - $results['status'] = array(); - $results['error'] = array(); + if (!isset($results['return']) + && !isset($results['redirect']) + && !isset($results['delegate'])) { + $results['redirect']['view'] = GALLERY_DEFAULT_VIEW; + } return array(null, $results); } Modified: trunk/gallery2/modules/core/test/phpunit/LogoutControllerTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/LogoutControllerTest.class 2006-12-22 22:50:32 UTC (rev 15542) +++ trunk/gallery2/modules/core/test/phpunit/LogoutControllerTest.class 2006-12-23 06:30:37 UTC (rev 15543) @@ -19,7 +19,7 @@ */ /** - * Logout controller tests + * Logout controller tests. * @package GalleryCore * @subpackage PHPUnit * @author Bharat Mediratta <bh...@me...> @@ -35,34 +35,34 @@ global $gallery; parent::setUp(); - list ($ret, $this->_guestId) = GalleryCoreApi::getAnonymousUserId(); + list ($ret, $this->_anonymousId) = GalleryCoreApi::getAnonymousUserId(); if ($ret) { print $ret->getAsHtml(); return $this->failWithStatus($ret); } + /* Save the session */ $this->_saveSession = $gallery->_session; - $gallery->_session = new LogoutTestSession(); + $this->_session = new LogoutControllerTestSession(); + $gallery->_session =& $this->_session; } function tearDown() { - /* Restore our session */ global $gallery; + + /* Restore the session */ $gallery->_session = $this->_saveSession; - parent::tearDown(); } function testLogout() { - global $gallery; - $results = $this->handleRequest(); - $this->assertEquals(array('redirect' => array('view' => 'core.ShowItem'), - 'status' => array(), - 'error' => array()), + $this->assertEquals(array('status' => array(), + 'error' => array(), + 'redirect' => array('view' => GALLERY_DEFAULT_VIEW)), $results); - $this->assertEquals(1, $gallery->_session->getResetCallCount(), 'reset'); - $this->assertEquals((int)$this->_guestId, $gallery->_session->getUserId(), 'userId'); + $this->assertEquals(1, $this->_session->_resetCallCount, 'reset'); + $this->assertEquals((int)$this->_anonymousId, $this->_session->getUserId(), 'userId'); } function testLogoutAlternateGuest() { @@ -70,27 +70,35 @@ $gallery->setConfig('anonymousUserId', $userId = $gallery->getActiveUserId()); $results = $this->handleRequest(); - $this->assertEquals(array('redirect' => array('view' => 'core.ShowItem'), - 'status' => array(), - 'error' => array()), + $this->assertEquals(array('status' => array(), + 'error' => array(), + 'redirect' => array('view' => GALLERY_DEFAULT_VIEW)), $results); - $this->assertEquals(1, $gallery->_session->getResetCallCount()); - $this->assertEquals($userId, $gallery->_session->getUserId(), 'userId'); + $this->assertEquals(1, $this->_session->_resetCallCount); + $this->assertEquals($userId, $this->_session->getUserId(), 'userId'); } -} -/** - * Mock session class - * - * @package GalleryCore - * @subpackage PHPUnit - */ -class LogoutTestSession { - function LogoutTestSession() { - $this->_resetCallCount = 0; - $this->_userId = null; + function testLogoutEventDelegate() { + $ret = GalleryCoreApi::registerEventListener( + 'Gallery::Logout', new LogoutControllerTestEventListener()); + if ($ret) { + return $this->failWithStatus($ret); + } + + $results = $this->handleRequest(); + $this->assertEquals(array('status' => array(), + 'error' => array(), + 'delegate' => array('view' => 'test.PhpUnit')), + $results); + $this->assertEquals(1, $this->_session->_resetCallCount); + $this->assertEquals((int)$this->_anonymousId, $this->_session->getUserId(), 'userId'); } +} +class LogoutControllerTestSession { + var $_resetCallCount = 0; + var $_userId; + function reset() { $this->_resetCallCount++; return null; @@ -100,10 +108,6 @@ return true; } - function getResetCallCount() { - return $this->_resetCallCount; - } - function setUserId($userId) { $this->_userId = $userId; } @@ -115,4 +119,11 @@ function put($key, $value) { } } + +class LogoutControllerTestEventListener /* extends GalleryEventListener */ { + + function handleEvent($event) { + return array(null, array('delegate' => array('view' => 'test.PhpUnit'))); + } +} ?> Added: trunk/gallery2/modules/httpauth/FinishLogout.inc =================================================================== --- trunk/gallery2/modules/httpauth/FinishLogout.inc (rev 0) +++ trunk/gallery2/modules/httpauth/FinishLogout.inc 2006-12-23 06:30:37 UTC (rev 15543) @@ -0,0 +1,46 @@ +<?php +/* + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2007 Bharat Mediratta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * Check that logout was successful and warn the user to close the browser window if not. + * @package HttpAuth + * @subpackage UserInterface + * @author Jack Bates <ms...@fr...> + * @version $Revision$ + */ +class FinishLogoutView extends GalleryView { + + /** + * @see GalleryView::loadTemplate + */ + function loadTemplate(&$template, &$form) { + list ($ret, $isAnonymous) = GalleryCoreApi::isAnonymousUser(); + if ($ret) { + return array($ret, null); + } + + if ($isAnonymous) { + return array(null, array('redirect' => array('view' => GALLERY_DEFAULT_VIEW))); + } + + return array(null, array('body' => 'modules/httpauth/templates/FinishLogout.tpl')); + } +} +?> Property changes on: trunk/gallery2/modules/httpauth/FinishLogout.inc ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native Added: trunk/gallery2/modules/httpauth/TryLogout.inc =================================================================== --- trunk/gallery2/modules/httpauth/TryLogout.inc (rev 0) +++ trunk/gallery2/modules/httpauth/TryLogout.inc 2006-12-23 06:30:37 UTC (rev 15543) @@ -0,0 +1,59 @@ +<?php +/* + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2007 Bharat Mediratta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * Try to clear the browser's authentication cache by as many tricks as possible and redirect to a + * view which checks that logout was successful. https://bugzilla.mozilla.org/show_bug.cgi?id=55181 + * @package HttpAuth + * @subpackage UserInterface + * @author Jack Bates <ms...@fr...> + * @version $Revision$ + */ +class TryLogoutView extends GalleryView { + + /** + * @see GalleryView::loadTemplate + */ + function loadTemplate(&$template, &$form) { + global $gallery; + $urlGenerator =& $gallery->getUrlGenerator(); + + /* Ask browser to authenticate with bogus authtype */ + GalleryUtilities::setResponseHeader('HTTP/1.0 401 Unauthorized', false); + GalleryUtilities::setResponseHeader('WWW-Authenticate: Bogus'); + + /* Redirect using random username and password */ + $TryLogout = array(); + foreach (array('scriptUrl', 'hrefUrl') as $key) { + $url = $urlGenerator->generateUrl(array('view' => 'httpauth.FinishLogout'), + array('forceFullUrl' => true, + 'htmlEntities' => $key == 'hrefUrl')); + $url = preg_replace('/(^[a-zA-Z0-9\+\.\-]+:\/\/)/', + '${1}' . rand() . ':' . rand() . '@', $url); + $TryLogout[$key] = $url; + } + + /* Render HTML body */ + $template->setVariable('TryLogout', $TryLogout); + + return array(null, array('body' => 'modules/httpauth/templates/TryLogout.tpl')); + } +} +?> Property changes on: trunk/gallery2/modules/httpauth/TryLogout.inc ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2006-12-22 22:50:32 UTC (rev 15542) +++ trunk/gallery2/modules/httpauth/module.inc 2006-12-23 06:30:37 UTC (rev 15543) @@ -31,7 +31,7 @@ $this->setId('httpauth'); $this->setName($gallery->i18n('HTTP Auth')); - $this->setVersion('0.4.0'); /* Update upgrade() too! */ + $this->setVersion('0.5.0'); /* Update upgrade() too! */ $this->setDescription($gallery->i18n('Login using HTTP authentication.')); $this->setGroup('authentication', $gallery->i18n('Authentication')); $this->setCallbacks('getSiteAdminViews|registerEventListeners'); @@ -106,6 +106,12 @@ return $ret; } + $ret = GalleryCoreApi::registerEventListener( + 'Gallery::Logout', new HttpAuthModule()); + if ($ret) { + return $ret; + } + return null; } @@ -190,6 +196,9 @@ return $ret; } + case '0.4.0': + /* Add logout view to clear browsers' authentication cache */ + case 'end of upgrade path': break; @@ -320,6 +329,18 @@ "WWW-Authenticate: Basic realm='$params[authName]'", false); return array(null, null); + + case 'Gallery::Logout': + /* + * If this request includes an HTTP username, delegate to the HTTP auth logout view + * which tries to clear the browser's authentication cache + */ + GalleryCoreApi::requireOnce('modules/httpauth/classes/HttpAuthHelper.class'); + list ($authtype, $username, $password) = HttpAuthHelper::getHttpAuth(); + $remoteUser = GalleryUtilities::getServerVar('REMOTE_USER'); + if (!empty($username) || !empty($remoteUser)) { + return array(null, array('delegate' => array('view' => 'httpauth.TryLogout'))); + } } return array(null, null); Added: trunk/gallery2/modules/httpauth/templates/FinishLogout.tpl =================================================================== --- trunk/gallery2/modules/httpauth/templates/FinishLogout.tpl (rev 0) +++ trunk/gallery2/modules/httpauth/templates/FinishLogout.tpl 2006-12-23 06:30:37 UTC (rev 15543) @@ -0,0 +1,13 @@ +{* + * $Revision$ + * If you want to customize this file, do not edit it directly since future upgrades + * may overwrite it. Instead, copy it into a new directory called "local" and edit that + * version. Gallery will look for that file first and use it if it exists. + *} +<div class="gbBlock"> + <h3 class="giWarning"> {g->text text="Logout failed"} </h3> + + <p class="giDescription"> + {g->text text="Gallery tried to logout but failed. You should close the browser window to logout successfully."} + </p> +</div> Property changes on: trunk/gallery2/modules/httpauth/templates/FinishLogout.tpl ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native Modified: trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl =================================================================== --- trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl 2006-12-22 22:50:32 UTC (rev 15542) +++ trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl 2006-12-23 06:30:37 UTC (rev 15543) @@ -41,7 +41,7 @@ <p class="giDescription"> {capture assign="adminPluginsUrl"}{g->url arg1="view=core.SiteAdmin" arg2="subView=core.AdminPlugins" return=true}{/capture} - {g->text text="PHP PathInfo rewrite doesn't support the rule to fall back on passing HTTP usernames and passwords to Gallery. You should uninstall and reinstall the URL rewrite module in the %sSite Admin Plugins option%s and choose either Apache mod_rewrite or ISAPI_Rewrite. Troubleshooting documentation is in the %sGallery Codex%s." arg1="<a href=\"$adminPluginsUrl\">" arg2="</a>" arg3="<a href=\"http://codex.gallery2.org/index.php/Gallery2:Modules:httpauth\">" arg4="</a>"} + {g->text text="PHP Path Info rewrite doesn't support the rule to fall back on passing HTTP usernames and passwords to Gallery. You should uninstall and reinstall the URL rewrite module in the %sSite Admin Plugins option%s and choose either Apache mod_rewrite or ISAPI_Rewrite. Troubleshooting documentation is in the %sGallery Codex%s." arg1="<a href=\"$adminPluginsUrl\">" arg2="</a>" arg3="<a href=\"http://codex.gallery2.org/index.php/Gallery2:Modules:httpauth\">" arg4="</a>"} </p> </div> {/if} Added: trunk/gallery2/modules/httpauth/templates/TryLogout.tpl =================================================================== --- trunk/gallery2/modules/httpauth/templates/TryLogout.tpl (rev 0) +++ trunk/gallery2/modules/httpauth/templates/TryLogout.tpl 2006-12-23 06:30:37 UTC (rev 15543) @@ -0,0 +1,25 @@ +{* + * $Revision$ + * If you want to customize this file, do not edit it directly since future upgrades + * may overwrite it. Instead, copy it into a new directory called "local" and edit that + * version. Gallery will look for that file first and use it if it exists. + *} +<script type="text/javascript"> + // <![CDATA[ + + try {ldelim} + {* http://msdn.microsoft.com/workshop/author/dhtml/reference/constants/clearauthenticationcache.asp *} + document.execCommand("ClearAuthenticationCache"); + {rdelim} catch (exception) {ldelim} + {rdelim} + + window.location = "{$TryLogout.scriptUrl}"; + + // ]]> +</script> + +<div class="gbBlock"> + <p class="giDescription"> + {g->text text="If you're not automatically redirected, %sclick here to finish logging out%s." arg1="<a href=\"`$TryLogout.hrefUrl`\">" arg2="</a>"} + </p> +</div> Property changes on: trunk/gallery2/modules/httpauth/templates/TryLogout.tpl ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2006-12-22 22:50:32 UTC (rev 15542) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2006-12-23 06:30:37 UTC (rev 15543) @@ -36,70 +36,76 @@ global $gallery; $urlGenerator =& $gallery->getUrlGenerator(); - /* Require here to avoid loading if none of our tests will be run */ - GalleryCoreApi::requireOnce('modules/core/ErrorPage.inc'); + /* Load HTTP auth module */ + list ($ret, $this->_module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + if ($ret) { + return $this->failWithStatus($ret); + } - /* Use HttpAuthModuleTestPhpVm */ - $gallery->_phpVm = new HttpAuthModuleTestPhpVm(); - - /* Clear response headers */ - $headers =& GalleryUtilities::_getResponseHeaders(); - $headers = array(); - - /* Mock disable HTTP auth rewrite rules */ - $activeRules =& HttpAuthModuleTestRewriteApi::_fetchActiveRulesForModule('httpauth'); - $activeRules = array(); + /* Mock disable HTTP auth URL rewrite rules */ + $this->_activeRules =& HttpAuthModuleTestRewriteApi::_fetchActiveRulesForModule('httpauth'); + $this->_activeRules = array(); + $this->_activateCalls =& HttpAuthModuleTestRewriteApi::_getActivateCalls(); $this->_markFactoryForCleanup(); $this->_registerFactoryImplementationForTest( 'RewriteApi', 'HttpAuthModuleTestRewriteApi', 'HttpAuthModuleTestRewriteApi', 'modules/httpauth/test/phpunit/HttpAuthModuleTest.class', 'test'); /* Define HTTP auth works request */ - $this->_httpAuthWorksRequest = 'GET ' . $urlGenerator->generateUrl( + $this->_httpAuthWorksRequest = implode("\r\n", array( + 'GET ' . $urlGenerator->generateUrl( array('view' => 'httpauth.HttpAuthWorks'), array('forceServerRelativeUrl' => true, - 'htmlEntities' => false)) . " HTTP/1.0\r\n" - . 'Authorization: AUTHTYPE ' . base64_encode('USERNAME:PASSWORD') . "\r\n" - . 'Host: ' . $urlGenerator->getHostName() . "\r\n" - . "\r\n"; + 'htmlEntities' => false)) . ' HTTP/1.0', + 'Authorization: AUTHTYPE ' . base64_encode('USERNAME:PASSWORD'), + 'Host: ' . $urlGenerator->getHostName(), + '', + '')); /* Define success and failure responses */ $this->_accessAuthorizationResponse = implode("\r\n", array( - 'HTTP/1.1 200 OK', - 'Date: Mon, 24 Nov 2003 05:40:03 GMT', - 'Server: Apache/1.3.28 (Unix)', - 'Content-Length: 26', - 'Connection: close', - 'Content-Type: text/html', - '', - '')) - . "AUTHTYPE\nUSERNAME\nPASSWORD"; + 'HTTP/1.1 200 OK', + 'Date: Mon, 24 Nov 2003 05:40:03 GMT', + 'Server: Apache/1.3.28 (Unix)', + 'Content-Length: 26', + 'Connection: close', + 'Content-Type: text/html', + '', + '')) . "AUTHTYPE\nUSERNAME\nPASSWORD"; $this->_missingAuthorizationResponse = implode("\r\n", array( - 'HTTP/1.1 200 OK', - 'Date: Mon, 24 Nov 2003 05:40:03 GMT', - 'Server: Apache/1.3.28 (Unix)', - 'Content-Length: 26', - 'Connection: close', - 'Content-Type: text/html', - '', - '')) - . "\n\n\n\n"; + 'HTTP/1.1 200 OK', + 'Date: Mon, 24 Nov 2003 05:40:03 GMT', + 'Server: Apache/1.3.28 (Unix)', + 'Content-Length: 26', + 'Connection: close', + 'Content-Type: text/html', + '', + '')) . "\n\n\n\n"; /* Use HttpAuthModuleTestPlatform */ - $platform =& new HttpAuthModuleTestPlatform(); - $platform->_messages[$this->_httpAuthWorksRequest] = $this->_accessAuthorizationResponse; - $gallery->setPlatform($platform); + $this->_platform =& new HttpAuthModuleTestPlatform(); + $this->_platform->_messages[$this->_httpAuthWorksRequest] = + $this->_accessAuthorizationResponse; + $gallery->setPlatform($this->_platform); - /* Activate HTTP auth plugin */ $ret = $this->_markPluginParametersForCleanup('module', 'httpauth'); if ($ret) { return $this->failWithStatus($ret); } + /* Activate HTTP auth plugin */ $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'httpAuthPlugin', true); if ($ret) { return $this->failWithStatus($ret); } + + /* Use HttpAuthModuleTestPhpVm */ + $this->_phpVm = new HttpAuthModuleTestPhpVm(); + $gallery->_phpVm =& $this->_phpVm; + + /* Clear response headers */ + $this->_headers =& GalleryUtilities::_getResponseHeaders(); + $this->_headers = array(); } function tearDown() { @@ -107,64 +113,103 @@ parent::tearDown(); } + function testGetRewriteRules() { + $rules = $this->_module->getRewriteRules(); + $this->assertEquals(array(), array_keys($rules)); + } + + function testGetRewriteRulesAuthorizationRuleActive() { + $this->_activeRules = array('authorization'); + + $rules = $this->_module->getRewriteRules(); + $this->assertEquals(array('authorization'), array_keys($rules)); + } + + function testGetRewriteRulesMissingAuthorization() { + $this->_platform->_messages[$this->_httpAuthWorksRequest] = + $this->_missingAuthorizationResponse; + + $rules = $this->_module->getRewriteRules(); + $this->assertEquals(array('authorization'), array_keys($rules)); + } + + function testHandleEventActivatePlugin() { + $event = GalleryCoreApi::newEvent('Gallery::ActivatePlugin'); + $event->setData(array('pluginType' => 'module', + 'pluginId' => 'rewrite')); + list ($ret, $results) = GalleryCoreApi::postEvent($event); + if ($ret) { + return $this->failWithStatus($ret); + } + + //$this->assertEquals(array(array('httpauth')), $this->_activateCalls); + } + function testHandleEventErrorPermissionDenied() { - /* Perform the request and verify that we succeeded */ - ob_start(); - ErrorPageView::errorHandler(GalleryCoreApi::error(ERROR_PERMISSION_DENIED)); - $output = ob_get_contents(); - ob_end_clean(); + $error = GalleryCoreApi::error(ERROR_PERMISSION_DENIED); + $event = GalleryCoreApi::newEvent('Gallery::Error'); + $event->setData(array('error' => $error)); + list ($ret, $results) = GalleryCoreApi::postEvent($event); + if ($ret) { + return $this->failWithStatus($ret); + } - list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'httpauth'); + list ($ret, $params) = $this->_module->fetchParameters(); if ($ret) { return $this->failWithStatus($ret); } $this->assertEquals(array('status' => 'HTTP/1.0 401 Unauthorized', 'www-authenticate' => "WWW-Authenticate: Basic realm='$params[authName]'"), - GalleryUtilities::_getResponseHeaders()); - - //$this->assertEquals('', $output); + $this->_headers); } - function testGetRewriteRules() { - list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + function testHandleEventLogoutNoUsername() { + global $gallery; + + $activeUser = $gallery->getActiveUser(); + $event = GalleryCoreApi::newEvent('Gallery::Logout'); + $event->setEntity($activeUser); + list ($ret, $results) = GalleryCoreApi::postEvent($event); if ($ret) { return $this->failWithStatus($ret); } - $rules = $module->getRewriteRules(); - - $this->assertEquals(array(), array_keys($rules)); + $this->assertEquals(array(), $results); } - function testGetRewriteRulesAuthorizationRuleActive() { - $activeRules =& HttpAuthModuleTestRewriteApi::_fetchActiveRulesForModule('httpauth'); - $activeRules = array('authorization'); + function testHandleEventLogoutWithHttpUsername() { + global $gallery; - list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + $activeUser = $gallery->getActiveUser(); + $_SERVER['PHP_AUTH_USER'] = $activeUser->getUserName(); + + $event = GalleryCoreApi::newEvent('Gallery::Logout'); + $event->setEntity($activeUser); + list ($ret, $results) = GalleryCoreApi::postEvent($event); if ($ret) { return $this->failWithStatus($ret); } - $rules = $module->getRewriteRules(); - - $this->assertEquals(array('authorization'), array_keys($rules)); + $this->assertEquals(array(array('delegate' => array('view' => 'httpauth.TryLogout'))), + $results); } - function testGetRewriteRulesMissingAuthorization() { + function testHandleEventLogoutWithRemoteUser() { global $gallery; - $platform =& $gallery->getPlatform(); - $platform->_messages[$this->_httpAuthWorksRequest] = $this->_missingAuthorizationResponse; + $activeUser = $gallery->getActiveUser(); + $_SERVER['REMOTE_USER'] = $activeUser->getUserName(); - list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + $event = GalleryCoreApi::newEvent('Gallery::Logout'); + $event->setEntity($activeUser); + list ($ret, $results) = GalleryCoreApi::postEvent($event); if ($ret) { return $this->failWithStatus($ret); } - $rules = $module->getRewriteRules(); - - $this->assertEquals(array('authorization'), array_keys($rules)); + $this->assertEquals(array(array('delegate' => array('view' => 'httpauth.TryLogout'))), + $results); } } @@ -183,6 +228,11 @@ return $activeRules; } + function &_getActivateCalls() { + static $activateCalls; + return $activateCalls; + } + function isCompatibleWithApi($version) { return array(null, true); } @@ -190,6 +240,11 @@ function fetchActiveRulesForModule($moduleId) { return array(null, HttpAuthModuleTestRewriteApi::_fetchActiveRulesForModule($moduleId)); } + + function activateRewriteRulesForModule($moduleId) { + $activateCalls =& HttpAuthModuleTestRewriteApi::_getActivateCalls(); + $activateCalls[] = array($moduleId); + } } class HttpAuthModuleTestPlatform extends GalleryPlatform { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2006-12-28 04:25:50
|
Revision: 15577 http://svn.sourceforge.net/gallery/?rev=15577&view=rev Author: mindless Date: 2006-12-27 20:25:49 -0800 (Wed, 27 Dec 2006) Log Message: ----------- Version bumps for plugins that need it before 2.2 RC-1 Modified Paths: -------------- trunk/gallery2/modules/captcha/module.inc trunk/gallery2/modules/cart/module.inc trunk/gallery2/modules/colorpack/module.inc trunk/gallery2/modules/dcraw/module.inc trunk/gallery2/modules/fotokasten/module.inc trunk/gallery2/modules/hidden/module.inc trunk/gallery2/modules/icons/module.inc trunk/gallery2/modules/imageframe/module.inc trunk/gallery2/modules/members/module.inc trunk/gallery2/modules/nokiaupload/module.inc trunk/gallery2/modules/password/module.inc trunk/gallery2/modules/photoaccess/module.inc trunk/gallery2/modules/randomhighlight/module.inc trunk/gallery2/modules/rearrange/module.inc trunk/gallery2/modules/register/module.inc trunk/gallery2/modules/reupload/module.inc trunk/gallery2/modules/search/module.inc trunk/gallery2/modules/sizelimit/module.inc trunk/gallery2/modules/slideshowapplet/module.inc trunk/gallery2/modules/squarethumb/module.inc trunk/gallery2/modules/thumbpage/module.inc trunk/gallery2/modules/uploadapplet/module.inc trunk/gallery2/modules/useralbum/module.inc trunk/gallery2/modules/webcam/module.inc trunk/gallery2/modules/zipcart/module.inc Modified: trunk/gallery2/modules/captcha/module.inc =================================================================== --- trunk/gallery2/modules/captcha/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/captcha/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -34,7 +34,7 @@ $this->setName($gallery->i18n('Captcha')); $this->setDescription($gallery->i18n('Prevents abuse by deterring automated bots with ' . 'input that requires visual comprehension')); - $this->setVersion('1.1.2'); /* Update upgrade() function below too */ + $this->setVersion('1.1.3'); /* Update upgrade() function below too */ $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); @@ -95,6 +95,7 @@ /* Updated GalleryValidationPlugin API */ case '1.1.0': case '1.1.1': + case '1.1.2': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/cart/module.inc =================================================================== --- trunk/gallery2/modules/cart/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/cart/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -33,7 +33,7 @@ $this->setId('cart'); $this->setName($gallery->i18n('Cart')); $this->setDescription($gallery->i18n('Shopping Cart Module')); - $this->setVersion('1.0.4'); /* Update upgrade() function below too */ + $this->setVersion('1.0.5'); /* Update upgrade() function below too */ $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getItemLinks'); $this->setRequiredCoreApi(array(7, 4)); @@ -121,6 +121,7 @@ case '1.0.1': case '1.0.2': case '1.0.3': + case '1.0.4': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/colorpack/module.inc =================================================================== --- trunk/gallery2/modules/colorpack/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/colorpack/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('colorpack'); $this->setName($gallery->i18n('Color Packs')); $this->setDescription($gallery->i18n('Select different color palettes for themes')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks(''); $this->setRequiredCoreApi(array(7, 10)); Modified: trunk/gallery2/modules/dcraw/module.inc =================================================================== --- trunk/gallery2/modules/dcraw/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/dcraw/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -36,7 +36,7 @@ $this->setName($gallery->i18n('Dcraw')); $this->setDescription( $gallery->i18n('Graphics toolkit for processing images in raw format')); - $this->setVersion('1.0.5'); + $this->setVersion('1.0.6'); $this->setGroup('toolkits', $gallery->i18n('Graphics Toolkits')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/fotokasten/module.inc =================================================================== --- trunk/gallery2/modules/fotokasten/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/fotokasten/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -36,7 +36,7 @@ $this->setId('fotokasten'); $this->setName($gallery->i18n('Fotokasten')); $this->setDescription($gallery->i18n('Fotokasten Photo Printing Module')); - $this->setVersion('1.0.4'); + $this->setVersion('1.0.5'); $this->setGroup('commerce', $this->translate('Commerce')); $this->setCallbacks('getSiteAdminViews|getItemLinks'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/hidden/module.inc =================================================================== --- trunk/gallery2/modules/hidden/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/hidden/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -38,7 +38,7 @@ $this->setName($gallery->i18n('Hidden Items')); $this->setDescription($gallery->i18n('Hide items/albums from guests until directly ' . 'accessed with the right URL')); - $this->setVersion('1.0.2'); + $this->setVersion('1.0.3'); $this->setGroup('display', $this->translate('Display')); $this->setCallbacks('registerEventListeners'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/icons/module.inc =================================================================== --- trunk/gallery2/modules/icons/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/icons/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('icons'); $this->setName($gallery->i18n('Icons')); $this->setDescription($gallery->i18n('Display icons for links')); - $this->setVersion('1.1.0'); /* Update upgrade() function below too */ + $this->setVersion('1.1.1'); /* Update upgrade() function below too */ $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); @@ -85,6 +85,7 @@ case '1.0.0': case '1.0.1': case '1.0.2': + case '1.1.0': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/imageframe/module.inc =================================================================== --- trunk/gallery2/modules/imageframe/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/imageframe/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('imageframe'); $this->setName($gallery->i18n('ImageFrame')); $this->setDescription($gallery->i18n('Render frames around images')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks(''); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/members/module.inc =================================================================== --- trunk/gallery2/modules/members/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/members/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('members'); $this->setName($gallery->i18n('Members')); $this->setDescription($gallery->i18n('Members List and Profiles')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/nokiaupload/module.inc =================================================================== --- trunk/gallery2/modules/nokiaupload/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/nokiaupload/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -37,7 +37,7 @@ $this->setName($gallery->i18n('Nokia Image Upload')); $this->setDescription( $gallery->i18n('Implementation of Nokia Image Upload Server API v1.1')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('import', $gallery->i18n('Import')); $this->setCallbacks(''); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/password/module.inc =================================================================== --- trunk/gallery2/modules/password/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/password/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -38,7 +38,7 @@ $this->setName($gallery->i18n('Password Items')); $this->setDescription( $gallery->i18n('Assign passwords for viewing particular albums or items')); - $this->setVersion('1.0.2'); + $this->setVersion('1.0.3'); $this->setGroup('display', $this->translate('Display')); $this->setCallbacks('registerEventListeners'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/photoaccess/module.inc =================================================================== --- trunk/gallery2/modules/photoaccess/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/photoaccess/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -33,7 +33,7 @@ $this->setId('photoaccess'); $this->setName($gallery->i18n('PhotoWorks')); $this->setDescription($gallery->i18n('PhotoWorks Photo Printing Module')); - $this->setVersion('1.0.4'); /* Update upgrade() too */ + $this->setVersion('1.0.5'); /* Update upgrade() too */ $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getItemLinks'); $this->setRequiredCoreApi(array(7, 4)); @@ -89,6 +89,7 @@ case '1.0.1': case '1.0.2': case '1.0.3': + case '1.0.4': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/randomhighlight/module.inc =================================================================== --- trunk/gallery2/modules/randomhighlight/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/randomhighlight/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -31,7 +31,7 @@ $this->setId('randomhighlight'); $this->setName($gallery->i18n('Random Highlight')); $this->setDescription($gallery->i18n('Periodically change the album highlight')); - $this->setVersion('1.0.3'); /* Update upgrade() function below too */ + $this->setVersion('1.0.4'); /* Update upgrade() function below too */ $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); @@ -106,6 +106,7 @@ case '1.0.0': case '1.0.1': case '1.0.2': + case '1.0.3': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/rearrange/module.inc =================================================================== --- trunk/gallery2/modules/rearrange/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/rearrange/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('rearrange'); $this->setName($gallery->i18n('Rearrange')); $this->setDescription($gallery->i18n('Rearrange the order of album items all at once')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getItemLinks|getItemAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/register/module.inc =================================================================== --- trunk/gallery2/modules/register/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/register/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -33,7 +33,7 @@ $this->setId('register'); $this->setName($gallery->i18n('Registration')); $this->setDescription($gallery->i18n('New User Registration')); - $this->setVersion('1.0.6'); + $this->setVersion('1.0.7'); $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getSystemLinks|getUserAdminViews|getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 5)); Modified: trunk/gallery2/modules/reupload/module.inc =================================================================== --- trunk/gallery2/modules/reupload/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/reupload/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('reupload'); $this->setName($gallery->i18n('Reupload')); $this->setDescription($gallery->i18n('Allows reupload of pictures.')); - $this->setVersion('1.0.2'); + $this->setVersion('1.0.3'); $this->setGroup('data', $gallery->i18n('Extra Data')); $this->setCallbacks(''); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/search/module.inc =================================================================== --- trunk/gallery2/modules/search/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/search/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -35,7 +35,7 @@ $this->setId('search'); $this->setName($gallery->i18n('Search')); $this->setDescription($gallery->i18n('Search your Gallery')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks(''); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/sizelimit/module.inc =================================================================== --- trunk/gallery2/modules/sizelimit/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/sizelimit/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -33,7 +33,7 @@ $this->setId('sizelimit'); $this->setName($gallery->i18n('Size Limit')); $this->setDescription($gallery->i18n('Define picture size limit')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('registerEventListeners'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/slideshowapplet/module.inc =================================================================== --- trunk/gallery2/modules/slideshowapplet/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/slideshowapplet/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -30,7 +30,7 @@ $this->setId('slideshowapplet'); $this->setName($gallery->i18n('Slideshow Applet')); $this->setDescription($gallery->i18n('Fullscreen slideshow using a Java applet')); - $this->setVersion('1.0.4'); + $this->setVersion('1.0.5'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('getItemLinks|getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/squarethumb/module.inc =================================================================== --- trunk/gallery2/modules/squarethumb/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/squarethumb/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -36,7 +36,7 @@ $this->setId('squarethumb'); $this->setName($gallery->i18n('Square Thumbnails')); $this->setDescription($gallery->i18n('Build all thumbnails so they are square')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('registerEventListeners|getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/thumbpage/module.inc =================================================================== --- trunk/gallery2/modules/thumbpage/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/thumbpage/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -34,7 +34,7 @@ $this->setName($gallery->i18n('Thumbnail Page')); $this->setDescription( $gallery->i18n('Select page/frame from a multipage file or movie for the thumbnail')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('display', $gallery->i18n('Display')); $this->setCallbacks('registerEventListeners'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/uploadapplet/module.inc =================================================================== --- trunk/gallery2/modules/uploadapplet/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/uploadapplet/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -30,7 +30,7 @@ $this->setId('uploadapplet'); $this->setName($gallery->i18n('Upload Applet')); $this->setDescription($gallery->i18n('Easy to use upload applet for media')); - $this->setVersion('1.0.4'); + $this->setVersion('1.0.5'); $this->setGroup('import', $gallery->i18n('Import')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/useralbum/module.inc =================================================================== --- trunk/gallery2/modules/useralbum/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/useralbum/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -32,7 +32,7 @@ $this->setId('useralbum'); $this->setName($gallery->i18n('User Albums')); $this->setDescription($gallery->i18n('Create an album for each new user')); - $this->setVersion('1.0.3'); + $this->setVersion('1.0.4'); $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('registerEventListeners|getSiteAdminViews|getSystemLinks'); $this->setRequiredCoreApi(array(7, 4)); Modified: trunk/gallery2/modules/webcam/module.inc =================================================================== --- trunk/gallery2/modules/webcam/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/webcam/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -30,7 +30,7 @@ $this->setId('webcam'); $this->setName($gallery->i18n('WebCam')); $this->setDescription($gallery->i18n('Support periodically updated images like a webcam')); - $this->setVersion('1.0.3'); /* Update upgrade() function below too */ + $this->setVersion('1.0.4'); /* Update upgrade() function below too */ $this->setGroup('import', $gallery->i18n('Import')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); @@ -103,6 +103,7 @@ case '1.0.0': case '1.0.1': case '1.0.2': + case '1.0.3': case 'end of upgrade path': break; Modified: trunk/gallery2/modules/zipcart/module.inc =================================================================== --- trunk/gallery2/modules/zipcart/module.inc 2006-12-28 03:57:31 UTC (rev 15576) +++ trunk/gallery2/modules/zipcart/module.inc 2006-12-28 04:25:49 UTC (rev 15577) @@ -33,7 +33,7 @@ $this->setId('zipcart'); $this->setName($gallery->i18n('Zip Download')); $this->setDescription($gallery->i18n('Download cart items in a zip file')); - $this->setVersion('1.0.5'); + $this->setVersion('1.0.6'); $this->setGroup('commerce', $gallery->i18n('Commerce')); $this->setCallbacks('getSiteAdminViews'); $this->setRequiredCoreApi(array(7, 4)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2006-12-28 17:13:13
|
Revision: 15581 http://svn.sourceforge.net/gallery/?rev=15581&view=rev Author: mindless Date: 2006-12-28 09:13:13 -0800 (Thu, 28 Dec 2006) Log Message: ----------- Language update: pl --> 100% Modified Paths: -------------- trunk/gallery2/modules/httpauth/locale/pl/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/pl.po trunk/gallery2/modules/publishxp/locale/pl/LC_MESSAGES/modules_publishxp.mo trunk/gallery2/modules/publishxp/po/pl.po trunk/gallery2/modules/remote/locale/pl/LC_MESSAGES/modules_remote.mo trunk/gallery2/modules/remote/po/pl.po trunk/gallery2/modules/webdav/locale/pl/LC_MESSAGES/modules_webdav.mo trunk/gallery2/modules/webdav/po/pl.po Modified: trunk/gallery2/modules/httpauth/locale/pl/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/pl.po =================================================================== --- trunk/gallery2/modules/httpauth/po/pl.po 2006-12-28 16:44:54 UTC (rev 15580) +++ trunk/gallery2/modules/httpauth/po/pl.po 2006-12-28 17:13:13 UTC (rev 15581) @@ -22,9 +22,9 @@ "Project-Id-Version: Gallery: HTTP Auth 0.5.0\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-11-16 00:56+0100\n" -"PO-Revision-Date: 2006-12-27 16:35+0100\n" +"PO-Revision-Date: 2006-12-28 09:11+0100\n" "Last-Translator: Kappana <ka...@gn...>\n" -"Language-Team: German <gal...@li...>\n" +"Language-Team: Polish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -49,12 +49,14 @@ msgstr "Nagłówek autoryzacji." msgid "Logout failed" -msgstr "" +msgstr "Nieudane wylogowanie się" msgid "" "Gallery tried to logout but failed. You should close the browser window to logout " "successfully." msgstr "" +"Galeria próbowała wylogować się, ale nie było to możliwe. Proszę zamknąć okno przeglądarki, " +"aby wylogować się całkowicie." msgid "HTTP Auth Settings" msgstr "Ustawienia autentykacji HTTP" @@ -93,18 +95,18 @@ msgid "Bad URL rewrite configuration" msgstr "Nieprawidłowa konfiguracja modułu tworzenia krótkich adresów URL" -#, fuzzy, c-format +#, c-format msgid "" "PHP Path Info rewrite doesn't support the rule to fall back on passing HTTP usernames and " "passwords to Gallery. You should uninstall and reinstall the URL rewrite module in the %" "sSite Admin Plugins option%s and choose either Apache mod_rewrite or ISAPI_Rewrite. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"Moduł tworzenia krótkich adresów URL skonfigurowany na PHP PathInfo nie wspiera reguły " -"zwracania nazw użytkowników i haseł HTTP do galerii. Zalecane jest odinstalowanie modułu " -"tworzenia krótkich adresów URL w %spanelu administracyjnym modułów%s i wybranie jednej z " -"dwóch konfiguracji modułu tworzenia krótkich adresów URL: Apache mod_rewrite lub " -"ISAPI_Rewrite. Więcej informacji na ten temat znajduje się na stronach %sGallery Codex%s." +"PHP PathInfo w module tworzenia krótkich adresów URL nie wspiera reguły zwracania nazw " +"użytkowników i haseł HTTP do galerii. Zalecane jest odinstalowanie modułu tworzenia " +"krótkich adresów URL w %spanelu administracyjnym modułów%s i wybranie jednej z dwóch " +"konfiguracji modułu tworzenia krótkich adresów URL: Apache mod_rewrite lub ISAPI_Rewrite. " +"Więcej informacji na ten temat znajduje się na stronach %sGallery Codex%s." msgid "'Authorization Header' rule disabled" msgstr "Reguła 'Nagłówka autoryzacji' wyłączona" @@ -216,3 +218,5 @@ #, c-format msgid "If you're not automatically redirected, %sclick here to finish logging out%s." msgstr "" +"Jeśli nie zostaniesz automatycznie przeniesiony, %skliknij tutaj aby zakończyć wylogowywanie%" +"s." Modified: trunk/gallery2/modules/publishxp/locale/pl/LC_MESSAGES/modules_publishxp.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/publishxp/po/pl.po =================================================================== --- trunk/gallery2/modules/publishxp/po/pl.po 2006-12-28 16:44:54 UTC (rev 15580) +++ trunk/gallery2/modules/publishxp/po/pl.po 2006-12-28 17:13:13 UTC (rev 15581) @@ -20,9 +20,9 @@ msgstr "" "Project-Id-Version: Gallery: Publish XP 1.0.5\n" "POT-Creation-Date: 2006-02-23 10:15+0100\n" -"PO-Revision-Date: 2006-12-27 16:36+0100\n" +"PO-Revision-Date: 2006-12-28 09:11+0100\n" "Last-Translator: Kappana <ka...@gn...>\n" -"Language-Team: Polish <gal...@li...>\n" +"Language-Team: Polish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,7 +38,7 @@ msgstr "Publikacja XP" msgid "Publish photos to Gallery directly from Windows XP" -msgstr "" +msgstr "Publikuje zdjęcia do galerii bezpośrednio z Windows XP" msgid "Import" msgstr "Import" @@ -197,6 +197,3 @@ msgid "You must select an album" msgstr "Proszę wybrać album" - -#~ msgid "Implementation for direct publishing from XP" -#~ msgstr "Implementacja bezpośredniego publikowania plików z XP" Modified: trunk/gallery2/modules/remote/locale/pl/LC_MESSAGES/modules_remote.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/remote/po/pl.po =================================================================== --- trunk/gallery2/modules/remote/po/pl.po 2006-12-28 16:44:54 UTC (rev 15580) +++ trunk/gallery2/modules/remote/po/pl.po 2006-12-28 17:13:13 UTC (rev 15581) @@ -20,9 +20,9 @@ msgstr "" "Project-Id-Version: Gallery: Remote 1.0.8\n" "POT-Creation-Date: 2006-02-23 10:15+0100\n" -"PO-Revision-Date: 2006-12-27 16:36+0100\n" +"PO-Revision-Date: 2006-12-28 09:11+0100\n" "Last-Translator: Kappana <ka...@gn...>\n" -"Language-Team: Polish <gal...@li...>\n" +"Language-Team: Polish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +41,7 @@ msgstr "Implementacja protokołu dostępu zdalnego" msgid "Remote Interfaces" -msgstr "" +msgstr "Zdalne interfejsy" msgid "" "Gallery Remote is a Java application that runs on your desktop computer and provides a rich " @@ -74,6 +74,3 @@ msgid "Reset" msgstr "Przywróć ustawienia domyślne" - -#~ msgid "Import" -#~ msgstr "Import" Modified: trunk/gallery2/modules/webdav/locale/pl/LC_MESSAGES/modules_webdav.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/webdav/po/pl.po =================================================================== --- trunk/gallery2/modules/webdav/po/pl.po 2006-12-28 16:44:54 UTC (rev 15580) +++ trunk/gallery2/modules/webdav/po/pl.po 2006-12-28 17:13:13 UTC (rev 15581) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: WebDAV 0.7.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-11-16 01:37+0100\n" -"PO-Revision-Date: 2006-12-27 16:37+0100\n" +"PO-Revision-Date: 2006-12-28 09:11+0100\n" "Last-Translator: Kappana <ka...@gn...>\n" "Language-Team: Polish <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -75,8 +75,8 @@ "Codex%s." msgstr "" "Możesz zmapować galerię na pulpicie używając klienta WebDAV, a następnie dodawać elementy do " -"galerii na zasadzie 'Przeciągnij i Upuść'. Dokumentacja na temat montowania galerii z " -"WebDAV znajduje się na stronach %sGallery Codex%s." +"galerii na zasadzie \"przeciąg i upuść\" (ang. drag'n'drop). Dokumentacja na temat " +"montowania galerii z WebDAV znajduje się na stronach %sGallery Codex%s." msgid "This album's WebDAV URL is:" msgstr "Adres WebDAV URL tego albumu to:" @@ -99,16 +99,15 @@ msgstr "Adres URL połączenia do galerii z WebDAV to:" msgid "PHP has no XML support" -msgstr "" +msgstr "PHP nie wspiera obsługi XML" -#, fuzzy, c-format +#, c-format msgid "" "You can't connect with WebDAV because PHP has no XML support on this server. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"Niektórzy klienci WebDAV np. Mac OS X WebDAVFS nie połączą się, ponieważ brak jest " -"odpowiedzi OPCJI w nagłówkach DAV. Więcej informacji na ten temat znajduje się na stronach %" -"sGallery Codex%s." +"Nie można połączyć się z WebDAV ponieważ PHP na tym serwerze nie wspiera obsługi XML. " +"Więcej informacji na ten temat znajduje się na stronach %sGallery Codex%s." msgid "HTTP auth module disabled" msgstr "Moduł autoryzacji HTTP wyłaczony" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-01-02 23:22:06
|
Revision: 15636 http://svn.sourceforge.net/gallery/?rev=15636&view=rev Author: andy_st Date: 2007-01-02 15:22:04 -0800 (Tue, 02 Jan 2007) Log Message: ----------- Disable event listeners of httpauth and webdav module during tests and uncomment 2 tests that have been disabled before due to the shortcomings of the now obsolete TestEventListener. Modified Paths: -------------- trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class trunk/gallery2/modules/webdav/WebDav.inc trunk/gallery2/modules/webdav/module.inc trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/httpauth/module.inc 2007-01-02 23:22:04 UTC (rev 15636) @@ -94,20 +94,18 @@ * @see GalleryModule::registerEventListeners */ function registerEventListeners() { - $ret = GalleryCoreApi::registerEventListener( - 'Gallery::ActivatePlugin', new HttpAuthModule()); + $listener = new HttpAuthModule(); + $ret = GalleryCoreApi::registerEventListener('Gallery::ActivatePlugin', $listener, true); if ($ret) { return $ret; } - $ret = GalleryCoreApi::registerEventListener( - 'Gallery::Error', new HttpAuthModule()); + $ret = GalleryCoreApi::registerEventListener('Gallery::Error', $listener, true); if ($ret) { return $ret; } - $ret = GalleryCoreApi::registerEventListener( - 'Gallery::Logout', new HttpAuthModule()); + $ret = GalleryCoreApi::registerEventListener('Gallery::Logout', $listener, true); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-02 23:22:04 UTC (rev 15636) @@ -112,6 +112,10 @@ unset($_SERVER['PHP_AUTH_PW']); unset($_SERVER['REMOTE_USER']); GalleryUtilities::removeRequestVariable('authorization'); + + $this->_registerTestEventListener('Gallery::ActivatePlugin', $this->_module); + $this->_registerTestEventListener('Gallery::Error', $this->_module); + $this->_registerTestEventListener('Gallery::Logout', $this->_module); } function tearDown() { @@ -148,7 +152,7 @@ return $this->failWithStatus($ret); } - //$this->assertEquals(array(array('httpauth')), $this->_activateCalls); + $this->assertEquals(array(array('httpauth')), $this->_activateCalls); } function testHandleEventErrorPermissionDenied() { Modified: trunk/gallery2/modules/webdav/WebDav.inc =================================================================== --- trunk/gallery2/modules/webdav/WebDav.inc 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/webdav/WebDav.inc 2007-01-02 23:22:04 UTC (rev 15636) @@ -43,7 +43,7 @@ * registered for this request. Since this is the WebDAV controller, we know it is a WebDAV * request. */ - $ret = GalleryCoreApi::registerEventListener('Gallery::Error', new WebDavModule()); + $ret = GalleryCoreApi::registerEventListener('Gallery::Error', new WebDavModule(), true); if ($ret) { return array($ret, null); } Modified: trunk/gallery2/modules/webdav/module.inc =================================================================== --- trunk/gallery2/modules/webdav/module.inc 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/webdav/module.inc 2007-01-02 23:22:04 UTC (rev 15636) @@ -56,7 +56,7 @@ */ function registerEventListeners() { return GalleryCoreApi::registerEventListener( - 'Gallery::ActivatePlugin', new WebDavModule()); + 'Gallery::ActivatePlugin', new WebDavModule(), true); } /** Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-02 23:22:04 UTC (rev 15636) @@ -119,6 +119,8 @@ $this->_platform->_messages[$this->_optionsRequest] = $this->_includesDavHeadersResponse; $gallery->setPlatform($this->_platform); + + $this->_registerTestEventListener('Gallery::ActivatePlugin', $this->_module); } function tearDown() { @@ -230,14 +232,11 @@ return $this->failWithStatus($ret); } - //$this->assertEquals(array(array('webdav')), $this->_activateCalls); + $this->assertEquals(array(array('webdav')), $this->_activateCalls); } function testHandleEventError() { - $ret = GalleryCoreApi::registerEventListener('Gallery::Error', $this->_module); - if ($ret) { - return $this->failWithStatus($ret); - } + $this->_registerTestEventListener('Gallery::Error', $this->_module); $error = GalleryCoreApi::error(GALLERY_ERROR); $event = GalleryCoreApi::newEvent('Gallery::Error'); Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class 2007-01-02 22:32:28 UTC (rev 15635) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class 2007-01-02 23:22:04 UTC (rev 15636) @@ -106,6 +106,8 @@ return $this->failWithStatus($ret); } $gallery->setUrlGenerator($this->_urlGenerator); + + $this->_registerTestEventListener('Gallery::Error', new WebDavModule()); } function tearDown() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bh...@us...> - 2007-01-15 12:38:47
|
Revision: 15693 http://svn.sourceforge.net/gallery/?rev=15693&view=rev Author: bharat Date: 2007-01-13 20:16:53 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Raise the expected fsockopen() timeout from 1 second to 5 seconds to match the change in r15675. We really need to get better test isolation :-(. Modified Paths: -------------- trunk/gallery2/modules/core/test/phpunit/RepositoryUtilitiesTest.class trunk/gallery2/modules/photoaccess/test/phpunit/PhotoAccessCartPluginTest.class trunk/gallery2/modules/photoaccess/test/phpunit/PrintPhotoControllerTest.class Modified: trunk/gallery2/modules/core/test/phpunit/RepositoryUtilitiesTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/RepositoryUtilitiesTest.class 2007-01-13 16:57:11 UTC (rev 15692) +++ trunk/gallery2/modules/core/test/phpunit/RepositoryUtilitiesTest.class 2007-01-14 04:16:53 UTC (rev 15693) @@ -363,7 +363,7 @@ * instead of mocking the platform. */ $platform = new UnitTestPlatform(); - $platform->setReply('fsockopen', array('example.com', 80, null, null, 1), 'fd'); + $platform->setReply('fsockopen', array('example.com', 80, null, null, 5), 'fd'); $platform->setReply( 'fwrite', array('fd', "GET /repository/index HTTP/1.0\r\nHost: example.com\r\n\r\n", null), @@ -394,7 +394,7 @@ * instead of mocking the platform. */ $platform = new UnitTestPlatform(); - $platform->setReply('fsockopen', array('example.com', 80, null, null, 1), 'fd'); + $platform->setReply('fsockopen', array('example.com', 80, null, null, 5), 'fd'); $platform->setReply( 'fwrite', array('fd', "GET /repository/index.gz HTTP/1.0\r\nHost: example.com\r\n\r\n", null), @@ -425,7 +425,7 @@ * instead of mocking the platform. */ $platform = new UnitTestPlatform(); - $platform->setReply('fsockopen', array('example.com', 80, null, null, 1), 'fd'); + $platform->setReply('fsockopen', array('example.com', 80, null, null, 5), 'fd'); $platform->setReply( 'fwrite', array('fd', "GET /repository/index HTTP/1.0\r\nHost: example.com\r\n\r\n", null), Modified: trunk/gallery2/modules/photoaccess/test/phpunit/PhotoAccessCartPluginTest.class =================================================================== --- trunk/gallery2/modules/photoaccess/test/phpunit/PhotoAccessCartPluginTest.class 2007-01-13 16:57:11 UTC (rev 15692) +++ trunk/gallery2/modules/photoaccess/test/phpunit/PhotoAccessCartPluginTest.class 2007-01-14 04:16:53 UTC (rev 15693) @@ -175,7 +175,7 @@ } $platform = new UnitTestPlatform(); - $platform->setReply('fsockopen', array('www.photoworks.com', 80, '', '', 1), 'testFd'); + $platform->setReply('fsockopen', array('www.photoworks.com', 80, '', '', 5), 'testFd'); $platform->setReply('fwrite', array('testFd', 'fuzzy' => '{POST /sbo/anonCartXML.jsp HTTP/1\.0.*xml_request.*return-url.*ViewCart' /* First image/url/thumb use new sessionid */ Modified: trunk/gallery2/modules/photoaccess/test/phpunit/PrintPhotoControllerTest.class =================================================================== --- trunk/gallery2/modules/photoaccess/test/phpunit/PrintPhotoControllerTest.class 2007-01-13 16:57:11 UTC (rev 15692) +++ trunk/gallery2/modules/photoaccess/test/phpunit/PrintPhotoControllerTest.class 2007-01-14 04:16:53 UTC (rev 15693) @@ -145,7 +145,7 @@ function &_getTestPlatform($fragment, $requestUrl, $redirectUrl) { $platform = new UnitTestPlatform(); - $platform->setReply('fsockopen', array('www.photoworks.com', 80, '', '', 1), 'testFd'); + $platform->setReply('fsockopen', array('www.photoworks.com', 80, '', '', 5), 'testFd'); $platform->setReply('fwrite', array('testFd', 'fuzzy' => "{POST /sbo/$fragment HTTP/1\.0}", ''), 100); $platform->setReply('fflush', array('testFd'), true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2007-01-21 18:58:02
|
Revision: 15717 http://svn.sourceforge.net/gallery/?rev=15717&view=rev Author: mindless Date: 2007-01-21 10:58:01 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Language update: fr 96.3->99.8% Also updated LocalizationAuditTest to look for translations that don't remove translator hints (<!-- .. -->), fixed 4 po files it found. Modified Paths: -------------- trunk/gallery2/modules/core/locale/fr/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/locale/it/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/locale/ko/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/locale/sk/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/fr.po trunk/gallery2/modules/core/po/it.po trunk/gallery2/modules/core/po/ko.po trunk/gallery2/modules/core/po/sk.po trunk/gallery2/modules/core/po/strings.raw trunk/gallery2/modules/core/test/phpunit/LocalizationAuditTest.class trunk/gallery2/modules/httpauth/locale/fr/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/fr.po trunk/gallery2/modules/webdav/locale/fr/LC_MESSAGES/modules_webdav.mo trunk/gallery2/modules/webdav/po/fr.po trunk/gallery2/modules/webdav/po/strings.raw Modified: trunk/gallery2/modules/core/locale/fr/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/locale/it/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/locale/ko/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/locale/sk/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/fr.po =================================================================== --- trunk/gallery2/modules/core/po/fr.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/po/fr.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -19,9 +19,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Core 1.1.26\n" +"Project-Id-Version: Gallery: Core 1.1.29\n" "POT-Creation-Date: 2003-08-10 04:27+0200\n" -"PO-Revision-Date: 2006-09-30 00:00+0100\n" +"PO-Revision-Date: 2007-01-20 00:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -95,39 +95,34 @@ msgid "Themes" msgstr "Thèmes" -#, fuzzy msgid "Updating Repository Index" -msgstr "Mise à jour de l'index" +msgstr "Mise à jour de l'index de l'entrepôt" msgid "Scanning plugins" -msgstr "" +msgstr "Recherche et analyse des composants" -#, fuzzy msgid "Update Plugin List" -msgstr "Mettre à jour tous les composants" +msgstr "Mettre à jour la liste des composants" msgid "Done." msgstr "Effectué." -#, fuzzy msgid "Updating Packages" -msgstr "Mise à jour des éléments \"panoramas\"" +msgstr "Mise à jour des packages" #, c-format msgid "Downloading %s" msgstr "Téléchargement de %s" -#, fuzzy, c-format +#, c-format msgid "Activating %s" -msgstr "Opérations" +msgstr "Activation de %s" -#, fuzzy msgid "Deleting Language Packs" -msgstr "Langue par défaut" +msgstr "Suppression des packages de langue" -#, fuzzy msgid "Update complete." -msgstr "Téléchargement terminé" +msgstr "Mise à jour terminée" msgid "install" msgstr "installer" @@ -235,22 +230,28 @@ msgid "Upgrading permissions (%d items complete, %d remaining)" msgstr "Mise à jour des permissions en cours (%d éléments traités, %d à faire)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" -msgstr "Détection des images dérivées corrompues, chargement " +msgstr "" +"Détection des images dérivées corrompues, chargement (%d images dérivées vérifiées, %d " +"restantes)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives (%d derivatives checked, %d remaining)" -msgstr "Détection des images dérivées corrompues, sauvegarde " +msgstr "Détection des images dérivées corrompues (%d images dérivées vérifiées, %d restantes)" -#, fuzzy, c-format +#, c-format msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" -msgstr "Détection des images dérivées corrompues, sauvegarde " +msgstr "" +"Détection des images dérivées corrompues, sauvegarde (%d images dérivées vérifiées, %d " +"restantes)" -#, fuzzy, c-format +#, c-format msgid "" "Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" -msgstr "Mise à jour des permissions en cours (%d éléments traités, %d à faire)" +msgstr "" +"Détection des images dérivées corrompues, sauvegarde de l'élément %d de %d (%d images " +"dérivées traitées, %d restantes)" #, c-format msgid "Deleting old session files (iteration %d)" @@ -328,15 +329,14 @@ msgid "Settings saved successfully." msgstr "Paramètres sauvegardés avec succès." -#, fuzzy msgid "Apply resized image settings" -msgstr "Paramètres du thème restaurés" +msgstr "Appliquer les paramètres d'images redimensionnées" msgid "Preparing..." msgstr "Préparation en cours..." msgid "Apply thumbnail settings" -msgstr "" +msgstr "Appliquer les paramètres de vignette" msgid "Rebuilding thumbnails..." msgstr "Regénération des vignettes..." @@ -420,9 +420,8 @@ msgid "Modify Photo" msgstr "Modifier l'image" -#, fuzzy msgid "Successfully changed theme" -msgstr "Thème %s activé avec succès" +msgstr "Thème modifié avec succès" msgid "« default theme »" msgstr "« thème par défaut »" @@ -598,9 +597,8 @@ msgid "%d items failed" msgstr "%d éléments ont échoué" -#, fuzzy msgid "Convert MySQL database to UTF8" -msgstr "Conversion en cours des données MySQL en UTF8" +msgstr "Convertir la base de données MySQL en UTF8" msgid "" "If you created your database with MySQL 3.x and you upgrade to MySQL 4.x, you will " @@ -609,13 +607,18 @@ "After using this, you should run the 'Delete database cache' task to get rid of any " "corruption in your cache." msgstr "" +"Si vous avez créé votre base de donnée avec MySQL 3.x et effectué une mise à jour vers MySQL " +"4.x, vous pouvez rencontrer des problèmes de caractères incohérents tant que vous n'aurez " +"pas converti votre base de données pour utiliser UTF8. Cette opération est sans rique si " +"votre base de données est déjà en UTF8, vous pouvez donc essayer cette opération sans " +"crainte. Après avoir exécuté cette opération, vous devrez également exécuter l'opération " +"'Effacer le cache de la base de données' pour éviter toute corruption dans votre cache." -#, fuzzy msgid "Database successfully converted to UTF8" -msgstr "Élément supprimé avec succès" +msgstr "Base de données convertie en UTF8 avec succès" msgid "No conversion required" -msgstr "" +msgstr "Aucune conversion requise" msgid "Delete user sessions" msgstr "Supprimer les sessions des utilisateurs" @@ -626,9 +629,9 @@ "Supprimer toutes les sessions persistantes des utilisateurs en fonction de vos paramètres " "d'expiration des sessions." -#, fuzzy, c-format +#, c-format msgid "Deleted %d sessions." -msgstr "Supprimer les sessions des utilisateurs" +msgstr "%d sessions supprimées" msgid "Delete database cache" msgstr "Effacer le cache de la base de données" @@ -744,15 +747,13 @@ "des droits d'écriture dans ce répertoire." msgid "Official Release Repository" -msgstr "" +msgstr "Entrepôt des versions officielles" -#, fuzzy msgid "Experimental Repository" -msgstr "Répertoire" +msgstr "Entrepôt expérimental" -#, fuzzy msgid "Community Repository" -msgstr "Répertoire" +msgstr "Entrepôt de la communauté" #, c-format msgid "Error downloading index from '%s'." @@ -814,11 +815,11 @@ msgstr "Faire un don pour le projet Gallery" msgid "G2.2: Double Double" -msgstr "" +msgstr "G2.2 : Double Double" #, c-format msgid "Powered by Gallery v%s" -msgstr "" +msgstr "Powered by Gallery v%s" #, c-format msgid "Estimated time remaining: %d:%02d" @@ -861,19 +862,17 @@ msgid "Blocks to show on photo pages" msgstr "Blocs à afficher dans les pages de photo" -#, fuzzy msgid "Thumbnail links in dynamic albums" -msgstr "Utiliser cette taille de vignette pour tous les sous-albums" +msgstr "Liens des vignettes dans les albums dynamiques" -#, fuzzy msgid "Browse dynamic album" -msgstr "album dynamique" +msgstr "Parcourir l'album dynamique" msgid "Jump to original album" -msgstr "" +msgstr "Aller à l'album initial" msgid "Separate link to original album" -msgstr "" +msgstr "Lien séparé vers l'album initial" msgid "View Samples" msgstr "Afficher les exemples" @@ -895,6 +894,8 @@ msgid "Error reading block settings. Clear your browser cache and try again." msgstr "" +"Erreur à la lecture des paramètres des blocs. Veuillez vider le cache de votre navigateur et " +"réessayer." #, c-format msgid "%dx%d" @@ -1044,7 +1045,7 @@ #, c-format msgid "Rows in %s table = %d" -msgstr "" +msgstr "Lignes dans la table %s = %d" msgid "Successfully saved theme settings" msgstr "Paramètres du thème sauvegardés avec succès" @@ -1560,23 +1561,25 @@ msgid "Options" msgstr "Options" -#, fuzzy msgid "Lock user." -msgstr "Système de vérouillage" +msgstr "Vérouiller l'utilisateur." msgid "" "Locked users are unable to edit their own account information. (Password, Name, Email, etc.)" msgstr "" +"Les utilisateurs vérouillés ne peuvent pas éditer les informations liées à leur compte (mot " +"de passe, nom, adresse de courrier électronique, etc.)" -#, fuzzy msgid "Reset failed login count." -msgstr "Réinitialiser les compteurs de vues" +msgstr "Réinitialiser les compteurs de tentatives d'authentification." #, c-format msgid "%d failed login attempt since the last successful login." msgid_plural "%d failed login attempts since the last successful login." msgstr[0] "" +"%d tentative d'authentification en échec depuis votre dernière authentification réussie." msgstr[1] "" +"%d tentatives d'authentification en échec depuis votre dernière authentification réussie." msgid "Group Management" msgstr "Gestion des groupes" @@ -1785,63 +1788,56 @@ msgid "__PLUGIN__ needs configuration" msgstr "__PLUGIN__ a besoin d'être configuré" -#, fuzzy msgid "__PLUGIN__ deleted" -msgstr "__PLUGIN__ désactivé" +msgstr "__PLUGIN__ supprimé" -#, fuzzy msgid "Warning!" -msgstr "Attention :" +msgstr "Attention !" -#, fuzzy msgid "Do you really want to uninstall __PLUGIN__?" -msgstr "Voulez-vous vraiment supprimer le module %s ?" +msgstr "Voulez-vous vraiment désinstaller __PLUGIN__ ?" msgid "" "This plugin will be uninstalled, but its files will be kept so that you can reinstall it." msgstr "" +"Ce composant sera désinstallé, mais ses fichiers seront gardés afin que vous puissiez le " +"réinstaller." msgid "Yes" -msgstr "" +msgstr "Oui" msgid "No" -msgstr "" +msgstr "Non" -#, fuzzy msgid "Do you really want to delete __PLUGIN__?" -msgstr "Voulez-vous vraiment supprimer le module %s ?" +msgstr "Voulez-vous vraiment supprimer __PLUGIN__ ?" msgid "This plugin will be uninstalled and its files will be deleted." -msgstr "" +msgstr "Ce composant sera désinstallé et tous ses fichiers seront supprimés." msgid "disabled(__COUNT__)" -msgstr "" +msgstr "désactivé(__COUNT__)" -#, fuzzy msgid "up to date(__COUNT__)" -msgstr "à jour" +msgstr "à jour(__COUNT__)" -#, fuzzy msgid "not installed(__COUNT__)" -msgstr "non installé" +msgstr "non installé(__COUNT__)" -#, fuzzy msgid "upgrade required(__COUNT__)" -msgstr "mise à jour requise" +msgstr "mise à jour requise(__COUNT__)" -#, fuzzy msgid "incompatible(__COUNT__)" -msgstr "incompatible" +msgstr "incompatible(__COUNT__)" msgid "Failed to completely delete __PLUGIN__" -msgstr "" +msgstr "Impossible de supprimer complètement __PLUGIN__" msgid "Gallery Plugins" msgstr "Composants de Gallery" -#, fuzzy msgid "Get More Plugins" -msgstr "Composants de Gallery" +msgstr "Obtenir d'autres composants" msgid "" "Gallery features come as separate plugins. You can download and install plugins to add more " @@ -1853,7 +1849,7 @@ "télécharger et installer d'autres composants pour ajouter de nouvelles fonctionnalités. Vous " "pouvez également désactiver les fonctionnalités que vous ne souhaitez pas utiliser. Pour " "utiliser une fonctionnalité, vous devez installer, configurer (si nécessaire) et activer le " -"composant. Pour ne plus l'utiliser, vous pouvez simplement le désactiver." +"composant adéquat. Pour ne plus l'utiliser, vous pouvez simplement le désactiver." msgid "Plugin Name" msgstr "Nom du composant" @@ -1868,11 +1864,11 @@ msgstr "Opérations" msgid "help" -msgstr "" +msgstr "aide" #, c-format msgid "Screenshot for %s" -msgstr "" +msgstr "Copie d'écran pour %s" msgid "Incompatible plugin!" msgstr "Composant incompatible !" @@ -1901,7 +1897,7 @@ msgstr "incompatible" msgid "Repository" -msgstr "Répertoire" +msgstr "Entrepôt" msgid "Please make sure that your internet connection is set up properly or try again later." msgstr "" @@ -1910,6 +1906,11 @@ #, c-format msgid "Failed to scan status from plugin: %s." +msgstr "Impossible d'obtenir le statut du composant : %s" + +msgid "" +"Your local copy of the repository was broken and has been fixed. Please download the plugin " +"list again." msgstr "" msgid "The repository index has been successfully updated." @@ -1920,18 +1921,20 @@ #, c-format msgid "%s plugin updated." -msgstr "" +msgstr "Composant %s mis à jour." #, c-format msgid "%d language pack deleted." msgid_plural "%d language packs deleted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d package de langue supprimé." +msgstr[1] "%d packages de langue supprimés." msgid "" "No personal information about you or your Gallery installation is sent to the Gallery server " "at any time." msgstr "" +"Aucune information personnelle à votre sujet ou au sujet de votre installation de Gallery " +"n'est jamais transmise au serveur de Gallery." #, c-format msgid "" @@ -1941,58 +1944,67 @@ "chosen, you must periodically download the latest plugin list to find out about available " "updates. %s On slower connections the process might take a minute or two." msgstr "" +"Télécharger et installer de nouveaux composants est simple et rapide. Si vous décidez qu'un " +"composant ne vous convient pas, vous pouvez le supprimer de votre installation de Gallery. " +"Il existe différents entrepôts de composants, vous pouvez choisir lesquels utiliser (il est " +"possible de tous les utiliser). Une fois sélectionnés, vous devez les mettre régulièrement à " +"jour afin de trouver les mises à jour de vos composants. %s Sur les connexions lentes, le " +"processus peut nécessiter une minute ou deux." #, c-format msgid "Officially Released Gallery Project plugins (%srecommended%s)" -msgstr "" +msgstr "Composants officiels du projet Gallery (%srecommandés%s)" #, c-format msgid "last updated on %s" -msgstr "" +msgstr "dernière mise à jour le %s" #, c-format msgid "Experimental Gallery Project plugins (%scool new features, might be buggy%s)" msgstr "" +"Composants expérimentaux du projet Gallery (%snouvelles fonctionnalités mais potentiellement " +"bugguées%s)" #, c-format msgid "Community plugins (%suse at your own risk!%s)" -msgstr "" +msgstr "Composants de la communauté (%sà utiliser à vos risques !%s)" -#, fuzzy msgid "Repository Error" -msgstr "Répertoire" +msgstr "Erreur sur l'entrepôt" -#, fuzzy msgid "You must select at least one repository." -msgstr "Vous devez sélectionner un utilisateur à supprimer." +msgstr "Vous devez sélectionner au moins un entrepôt." msgid "Ok" -msgstr "" +msgstr "OK" msgid "Configure your Gallery" -msgstr "" +msgstr "Configurer votre installation de Gallery" msgid "" "Before you can proceed, you have to change some permissions so that Gallery can install " "plugins for you. It's easy. Just execute the following in a shell or via your ftp client:" msgstr "" +"Avant de continuer, vous devez modifier certaines permissions afin que Gallery puisse " +"installer des composants pour vous. C'est simple, vous n'avez qu'à exécuter les commandes " +"suivantes dans un shell ou via votre client FTP :" msgid "" "If you have trouble changing permissions, ask your system administrator for assistance. " "When you've fixed the permissions, click the Continue button to proceed." msgstr "" +"Si vous rencontrez des difficultés pour modifier ces permissions, veuillez demander " +"assistance à votre administrateur système. Lorsque les permissions seront correctes, appuyez " +"sur le bouton 'Continuer' pour passer à la suite." -#, fuzzy msgid "Continue" -msgstr "Continuer..." +msgstr "Continuer" -#, fuzzy msgid "Download Plugin List" -msgstr "Tests unitaires de téléchargement" +msgstr "Télécharger la liste des composants" -#, fuzzy msgid "Show Repository List" -msgstr "Répertoire" +msgstr "Afficher la liste des entrepôts" msgid "Upgrade Gallery" msgstr "Mettre à jour Gallery" @@ -2032,12 +2044,11 @@ "consulter la %sliste complète%s des composants, y compris ceux qui sont incompatibles et qui " "sont marqués d'une icone rouge." -#, fuzzy msgid "upgrade available" -msgstr "Mettre à jour Gallery" +msgstr "mise à jour disponible" msgid "locked" -msgstr "" +msgstr "vérouillé" msgid "Theme Name" msgstr "Nom du thème" @@ -2048,22 +2059,20 @@ msgid "Latest" msgstr "Dernière" -#, fuzzy msgid "Locked Plugin" -msgstr "Composants" +msgstr "Composant vérouillé" msgid "Incompatible Plugin" msgstr "Composant incompatible" -#, fuzzy msgid "Upgrade Available" -msgstr "Mettre tout à jour" +msgstr "Mise à jour disponible" msgid "download" msgstr "télécharger" msgid "modify" -msgstr "" +msgstr "modifier" msgid "Upgrade All Plugins" msgstr "Mettre à jour tous les composants" @@ -2078,9 +2087,9 @@ msgid "Upgrade All" msgstr "Mettre tout à jour" -#, fuzzy, c-format +#, c-format msgid "Download %s" -msgstr "Téléchargement de %s" +msgstr "Télécharger %s" msgid "No packages have been selected." msgstr "Aucun package n'a été sélectionné." @@ -2090,52 +2099,53 @@ "of the package to download. Language packages are optional, You only need to download the " "ones that you want to use on your site." msgstr "" +"Téléchargez un package pour pouvoir utiliser ce composant. Vous pouvez mettre à jour en " +"choisissant une version plus récente du package à télécharger. Les packages de langue sont " +"optionnels, vous n'avez besoin de télécharger que ceux que vous utilisez pour votre site." -#, fuzzy msgid "Base Packages" -msgstr "Fichiers de base" +msgstr "Packages de base" #, c-format msgid "%s: version %s (build %s)" -msgstr "" +msgstr "%s : version %s (build %s)" #, c-format msgid "%s: version %s (build %s) %sdowngrading is not supported!%s" -msgstr "" +msgstr "%s : version %s (build %s) %sDescendre de version n'est pas supporté !%s" #, c-format msgid "%sCurrently Installed%s: version %s (build %s)" -msgstr "" +msgstr "%sAcutellement installé%s : version %s (build %s)" -#, fuzzy msgid "Language Packages" -msgstr "Paramètres de langue" +msgstr "Packages de langue" #, c-format msgid "(%sselect all%s%sselect none%s)" -msgstr "" +msgstr "(%stout sélectionner%s%sne rien sélectionner%s)" #, c-format msgid "%s version %s (upgrading from %s)" -msgstr "" +msgstr "%s version %s (mise à jour depuis %s)" -#, fuzzy, c-format +#, c-format msgid "%s version %s" -msgstr "PHP version" +msgstr "%s version %s" #, c-format msgid "%s version %s (%snewer version %s is installed%s)" -msgstr "" +msgstr "%s version %s (%sversion plus récente %s est installée%s)" #, c-format msgid "%s version %s (currently installed)" -msgstr "" +msgstr "%s version %s (actuellement installé)" msgid "No compatible language packages available" -msgstr "" +msgstr "Aucun package de langue compatible n'a été trouvé" msgid "You must select a base package before choosing language packs." -msgstr "" +msgstr "Vous devez sélectionne un package de base avant de choisir des packages de langue." msgid "Update" msgstr "Mettre à jour" @@ -2188,11 +2198,9 @@ msgid "New albums" msgstr "Nouveaux albums" -#, fuzzy msgid "Save Defaults" -msgstr "Valeurs par défaut" +msgstr "Sauvegarder les valeurs par défaut" -# c-format #, c-format msgid "%s Theme Settings" msgstr "Paramètres du thème %s" @@ -2230,10 +2238,8 @@ msgid "There are no settings for this theme" msgstr "Il n'y a pas de paramètre pour ce thème" -# c-format -#, fuzzy msgid "Save Theme Settings" -msgstr "Paramètres du thème %s" +msgstr "Sauvegarder les paramètres du thème" msgid "" "The toolkits shown below have some overlap in supported operations and mime types. Rank the " @@ -2288,13 +2294,11 @@ msgid "Edit User (by list)" msgstr "Éditer un utilisateur (par liste)" -#, fuzzy msgid "Locked" -msgstr "Langage" +msgstr "Vérouillé" -#, fuzzy msgid "Failed Logins" -msgstr "Échec" +msgstr "Tentatives d'authentification en échec" msgid "Thumbnails" msgstr "Vignettes" @@ -2320,7 +2324,7 @@ msgstr "Éditer le conflit !" msgid "Security Violation" -msgstr "Violation de scurité" +msgstr "Violation de sécurité" msgid "Database Error" msgstr "Erreur de la base de données" @@ -2328,9 +2332,8 @@ msgid "Platform Error" msgstr "Erreur de la plate-forme" -#, fuzzy msgid "Authentication Failure" -msgstr "Autorisation confirmée" +msgstr "Échec de l'authentification" msgid "Error" msgstr "Erreur" @@ -2352,10 +2355,11 @@ "If this problem happens repeatedly, it may be because of corruption in your cache. Site " "Administrators can clear out this cache." msgstr "" +"Si le problème se répète, il peut être du à une corruption de votre cache. Les " +"administrateurs de Gallery peuvent vider ce cache." -#, fuzzy msgid "Clear the cache" -msgstr "Effacer les pages sauvegardées" +msgstr "Effacer le cache" msgid "Alternatively, you can return to the main Gallery page and resume browsing." msgstr "" @@ -2369,6 +2373,9 @@ "Your change cannot be completed due to a loss of session data. Please try again. If it still " "doesn't work, try logging out and logging back in." msgstr "" +"Votre modification n'a pas pu être traitée en raison d'une perte des données de session. " +"Veuillez réessayer. Si le problème persiste, essayez de vous déconnecter de Gallery et " +"reconnectez vous." msgid "An error has occurred while interacting with the database." msgstr "Une erreur est survenue en accédant à la base de données." @@ -2520,7 +2527,7 @@ "votre administrateur d'autoriser des téléchargements plus volumineux." msgid "More Upload Boxes..." -msgstr "" +msgstr "Plus de champs de téléchargement..." msgid "Set item titles from:" msgstr "Spécifier les titres des éléments à l'aide de :" @@ -2653,9 +2660,8 @@ msgid "Use these target sizes in all subalbums" msgstr "Utiliser ces tailles cibles dans tous les sous-albums" -#, fuzzy msgid "Apply settings to existing items" -msgstr "Appliquer aux sous-éléments" +msgstr "Appliquer les paramètres aux élément existants" msgid "" "The thumbnail and resized image settings are for all new items. To apply these settings to " @@ -2664,24 +2670,28 @@ "Building images now makes this operation take longer, but saves the time to build and cache " "each file when it is first viewed." msgstr "" +"Les paramètres pour les vignettes et les images redimensionnées s'appliquent pour tous les " +"nouveaux éléments. Pour appliquer ces paramètres à tous les éléments de cet album, veuillez " +"cocher les cases appropriées. Inclure les sous-albums impliquera que les paramètres propres " +"aux sous-albums seront appliqués à leurs vignettes et images redimensionnées, paramètres qui " +"ne correspondent pas nécessairement aux paramètres ci-dessus. Générer les images " +"redimensionnées et le vignettes rend l'opération plus longue, mais permet d'économiser le " +"tempts de création et de mise en cache de ces images à leur premier accès." msgid "Apply album setting to thumbnails" -msgstr "" +msgstr "Appliquer les paramètres aux vignettes" -#, fuzzy msgid "... and for all subalbums" msgstr "Appliquer à tous les sous-albums" -#, fuzzy msgid "Build thumbnails too" -msgstr "Regénération des vignettes..." +msgstr "Générer également les vignettes" -#, fuzzy msgid "Apply album setting to resized images" -msgstr "Regénération des images redimensionnées" +msgstr "Appliquer les paramètres aux images redimensionnées" msgid "Build resizes too" -msgstr "" +msgstr "Générer également les images redimensionnées" msgid "" "In order for Gallery to properly display this animation, it has to know the animation's " @@ -2967,33 +2977,31 @@ msgid "Restore original" msgstr "Restaurer l'original" -#, fuzzy msgid "Choose a theme" -msgstr "Choisissez un bloc" +msgstr "Choix du thème" #, c-format msgid "" "Themes control the look and feel of the album. You can choose a different theme for each " "album. If you don't choose a theme, we'll use the %s theme by default." msgstr "" +"Les thèmes contrôlent l'apparence de l'album. Vous pouvez choisir différents thèmes pour " +"chacun des albums. Si vous ne choisissez pas de thème, le thème par défaut %s sera utilisé." msgid "Use this theme in all subalbums" msgstr "Utiliser ce thème pour tous les sous-albums" msgid "Choose Theme" -msgstr "" +msgstr "Choisir le thème" -#, fuzzy, c-format +#, c-format msgid "Configure the %s theme" -msgstr "Thème de tests unitaires" +msgstr "Configurer le thème %s" -#, fuzzy msgid "These settings only apply to the theme for this album." -msgstr "" -"Cet album est configuré pour utiliser le thème <b>%s</b>. Ces paramètres ne s'appliquent " -"qu'au thème de cet album." +msgstr "Ces paramètres ne s'appliquent qu'au thème de cet album." -#, fuzzy, c-format +#, c-format msgid "Use these settings in all subalbums that use the %s theme" msgstr "Utiliser ces paramètres dans tous les sous-albums qui utilisent le thème %s" @@ -3172,9 +3180,7 @@ msgstr "Le groupe que vous avez saisi est invalide" msgid "Group already has this permission (check sub-permissions)" -msgstr "" -"Le groupe a déjà cette permission (elle est peut être incluse dans une des permissions que " -"le groupe a déjà)" +msgstr "Le groupe a déjà cette permission (vérifiez les sous-permissions)" msgid "User Permissions" msgstr "Permissions des utilisateurs" @@ -3186,8 +3192,7 @@ msgstr "Nouvelle permission d'utilisateur" msgid "The user already has this permission (check sub-permissions)" -msgstr "" -"L'utilisateur a déjà cette permission (peut-être incluse dans une des sous-permissions)" +msgstr "L'utilisateur a déjà cette permission (vérifiez les sous-permissions)" msgid "Reorder Album" msgstr "Réorganiser l'album" @@ -3226,6 +3231,9 @@ "is either disabled or not supported by your browser. Please enable JavaScript by changing " "your browser options, then try again." msgstr "" +"JavaScript doit être activé pour que cette page s'affiche correctement. Cependant, il semble " +"que JavaScript est soit désactivé, soit non supporté par votre navigateur. Veuillez activer " +"JavaScript et réessayer." msgid "Site is temporarily down for maintenance." msgstr "Ce site est temporairement hors service pour maintenance." @@ -3243,10 +3251,10 @@ msgstr "Saisir l'URL d'une image" msgid "B <!-- Button label for Bold -->" -msgstr "gras" +msgstr "G" msgid "i <!-- Button label for italic -->" -msgstr "italique" +msgstr "i" msgid "list" msgstr "liste" @@ -3260,13 +3268,14 @@ msgid "image" msgstr "image" -#, fuzzy msgid "color" -msgstr "noyau" +msgstr "couleur" #, c-format msgid "You can also use the <a href=\"%s\" target=\"_new\">color name</a> for example: %s" msgstr "" +"Vous pouvez également utiliser le <a href=\"%s\" target=\"_new\">nom de couleur</a> par " +"exemple : %s " msgid "Configuration Error: Missing Theme" msgstr "Erreur de configuration : thème manquant" @@ -3371,11 +3380,15 @@ "This account is not allowed to modify account settings. Please contact your Gallery " "administrator" msgstr "" +"Ce compte n'est pas autorisé pour modifier les paramètres de comptes. Veuillez contacter " +"l'administrateur de Gallery" msgid "" "Your administrator has locked this account, preventing changes from being made to the " "account information." msgstr "" +"L'administrateur de Gallery a vérouillé ce compte, empêchant ainsi toute modification d'y " +"être apportée." msgid "Login to your account" msgstr "Identifiant de connexion à votre compte" @@ -3389,6 +3402,9 @@ "for access to be restored, or use the <a href=\"%s\">recover password</a> page to re-enable " "this account." msgstr "" +"Ce compte est temporairement bloqué compte tenu d'un trop grand nombre de tentatives " +"d'authentification en échec. Veuillez attendre que l'accès soit rétabli ou utiliser la page " +"de <a href=\"%s\">restauration de mot de passe</a> pour réactiver ce compte." msgid "Your login information is incorrect. Please try again." msgstr "Vos informations de connexion sont incorrectes. Merci de réessayer." @@ -3698,266 +3714,3 @@ msgid "Links to album/photo peers" msgstr "Liens vers les éléments voisins" - -#~ msgid "Performing Maintenance Tasks" -#~ msgstr "Maintenance du système en cours" - -#~ msgid "Upgrade" -#~ msgstr "Mettre à jour" - -#~ msgid "Download" -#~ msgstr "Télécharger" - -#~ msgid "Detecting broken derivatives " -#~ msgstr "Détection des images dérivées corrompues " - -#~ msgid "Detecting broken derivatives, " -#~ msgstr "Détection des images dérivées corrompues, " - -#~ msgid "Rebuilding resized images..." -#~ msgstr "Regénération des images redimensionnées..." - -#~ msgid "Plugins directory does not exist." -#~ msgstr "Le répertoire des composants n'existe pas." - -#~ msgid "" -#~ "Couldn't create plugins subdirectory. Make sure the webserver has write permissions in it." -#~ msgstr "" -#~ "Impossible de créer le répertoire des composants. Assurez-vous que votre serveur Web " -#~ "dispose des droits d'écriture sur ce répertoire." - -#~ msgid "G2.1: Blackjack" -#~ msgstr "G2.1 : Blackjack" - -#~ msgid "Format: [module.BlockName param=value] ..." -#~ msgstr "Format : [module.NomDeBloc param=valeur] ..." - -#~ msgid "" -#~ "Invalid return URL! The requested URL %s tried to insert a redirection to %s which is not " -#~ "a part of this Gallery." -#~ msgstr "" -#~ "URL de retour invalide ! L'URL demandée %s a essayé d'insérer une redirection vers %" -#~ "s qui ne fait pas partie de cette installation de Gallery." - -#~ msgid "Status: Incompatible Module (Inactive)" -#~ msgstr "Statut : Module incompatible (inactif)" - -#~ msgid "Gallery Modules" -#~ msgstr "Modules de Gallery" - -#~ msgid "" -#~ "Gallery features come as separate modules. You can download and install modules to add " -#~ "more features to your Gallery, or you can disable features if you don't want to use " -#~ "them. In order to use a feature, you must install, configure (if necessary) and activate " -#~ "it. If you don't wish to use a feature, you can deactivate it." -#~ msgstr "" -#~ "Les fonctionnalités de Gallery sont réparties dans différents modules. Vous pouvez " -#~ "télécharger et installer d'autres modules pour ajouter de nouvelles fonctionnalités. Vous " -#~ "pouvez également désactiver ces fonctionnalités si vous ne souhaitez pas les utiliser. " -#~ "Pour utiliser une fonctionnalité, vous devez installer, configurer (si nécessaire) et " -#~ "activer le module. Pour ne plus l'utiliser, vous pouvez simplement le désactiver." - -#~ msgid "Incompatible module!" -#~ msgstr "Module incompatible !" - -#~ msgid "Module API Required: %s (available: %s)" -#~ msgstr "API Module requise : %s (disponible : %s)" - -#~ msgid "Confirm module uninstall" -#~ msgstr "Confirmer la désinstallation du module" - -#~ msgid "This will also remove any permissions and clean up any data created by this module." -#~ msgstr "" -#~ "Cette opération va également supprimer toutes les permissions et toutes les données crées " -#~ "par ce module." - -#~ msgid "Uninstall" -#~ msgstr "Désinstaller" - -#~ msgid "Common Tasks" -#~ msgstr "Tâches communes" - -#~ msgid "Modules" -#~ msgstr "Modules" - -#~ msgid "Warning: Experimental feature!" -#~ msgstr "Attention : fonctionnalité expérimentale !" - -#~ msgid "" -#~ "The repository features are currently experimental, and no actual repository has been set " -#~ "up yet, so none of these features will work at this time." -#~ msgstr "" -#~ "Les fonctionnalités de l'entrepôt sont actuellement en cours d'expérimentation, et aucun " -#~ "entrepôt n'a été rendu public. Ainsi donc, aucune de ces fonctionnalités ne fonctionne " -#~ "actuellement." - -#~ msgid "" -#~ "The Gallery repository contains the latest modules and themes extensively tested by the " -#~ "Gallery team. The repository index contains information about available plugins, such as " -#~ "the latest versions, available languages and compatibility. The index must be " -#~ "synchronized periodically with the Gallery server so you are informed about any available " -#~ "updates. No personal information is sent to the Gallery server during updating. On slower " -#~ "connections the process might take a minute or two." -#~ msgstr "" -#~ "L'entrepôt de Gallery contient les derniers modules et thèmes longuement testés par " -#~ "l'équipe Gallery. L'index de ce répertoire contient les informations relatives aux " -#~ "composants disponibles (dernières versions, les langues disponibles et la compatibilité). " -#~ "Cet index doit être synchronisé régulièrement avec le serveur de Gallery afin que vous " -#~ "soyez informés des mises à jour disponibles. Aucune donnée personnelle n'est transmise à " -#~ "Gallery durant la mise à jour. Sur des connexions bas débit, cette mise à jour peut " -#~ "prendre quelques minutes." - -#~ msgid "" -#~ "As of the last update on %s, the repository contains %s modules and %s themes. Its " -#~ "contents can be viewed on the Modules and Themes tabs." -#~ msgstr "" -#~ "Depuis la dernière mise à jour le %s, l'entrepôt contient %s modules et %s thèmes. Son " -#~ "contenu peut être consulté dans les onglets 'Modules' et 'Thèmes'." - -#~ msgid "" -#~ "The index has never been updated. Click on the Update button to see what updates are " -#~ "available." -#~ msgstr "" -#~ "L'index n'a jamais été mis à jour. Cliquez sur le bouton 'Mettre à jour' pour déterminer " -#~ "quelles mises à jour sont disponibles." - -#~ msgid "Gallery Up-To-Date" -#~ msgstr "Gallery est à jour" - -#~ msgid "" -#~ "Gallery cannot be upgraded through this interface. When a new version becomes available, " -#~ "upgrade instructions will be presented here." -#~ msgstr "" -#~ "Gallery ne peut pas être mis à jour via cette interface. Quand une nouvelle version est " -#~ "disponible, les instructions de mise à jour seront présentées ici." - -#~ msgid "" -#~ "Once the repository index has been downloaded, a list of available plugins will be " -#~ "presented. It can be downloaded by clicking on the Update button on the Common Tasks tab." -#~ msgstr "" -#~ "Une fois l'index de l'entrepôt téléchargé, une liste des composants disponibles sera " -#~ "présentée. L'index peut être téléchargé en cliquant sur le bouton 'Mettre à jour' dans " -#~ "l'onglet 'Tâches communes'." - -#~ msgid "" -#~ "The following plugins are available. Click on the action beside the plugin you're " -#~ "interested in to see what's available in the repository." -#~ msgstr "" -#~ "Les composants suivants sont disponibles. Cliquez sur l'action à coté du composant qui " -#~ "vous intéresse pour voir ce qui est disponible dans l'entrepôt." - -#~ msgid "" -#~ "The base files required for the theme to work and the English (US) translation will be " -#~ "downloaded." -#~ msgstr "" -#~ "Les fichiers de base nécessaires pour le thème ainsi que la traduction en anglais (US) " -#~ "seront téléchargés." - -#~ msgid "Upgrade Base Files" -#~ msgstr "Mettre à jour les fichiers de base" - -#~ msgid "You can upgrade the base module files." -#~ msgstr "Vous pouvez mettre à jour les fichiers de base des modules." - -#~ msgid "Upgrade base files" -#~ msgstr "Mettre à jour les fichiers de base" - -#~ msgid "Base Files Up-To-Date" -#~ msgstr "Les fichiers de base sont à jour" - -#~ msgid "This plugin's base files are up-to-date." -#~ msgstr "Les fichiers de base de ce composant sont à jour." - -#~ msgid "Updated Translations" -#~ msgstr "Traductions mises à jour" - -#~ msgid "" -#~ "Below is a list of translations that have been updated since they were last downloaded. " -#~ "Select the ones you want to download." -#~ msgstr "" -#~ "Ci-dessous se trouve une liste des traductions qui ont été mises à jour depuis qu'elles " -#~ "ont été téléchargées. Sélectionnez celles que vous souhaitez télécharger." - -#~ msgid "Additional Languages" -#~ msgstr "Langues supplémentaires" - -#~ msgid "" -#~ "Below is a list of languages this plugin has been translated to. Select the ones you want " -#~ "included in addition to the ones already downloaded." -#~ msgstr "" -#~ "Ci-dessous se trouve la liste des langues dans lesquels le plugin a été traduit. " -#~ "Sélectionnez ceux que vous souhaitez inclure en plus de ceux déjà téléchargés." - -#~ msgid "Unit Tests" -#~ msgstr "Tests unitaires" - -#~ msgid "" -#~ "This plugin has unit tests available for download, which are useful for Gallery " -#~ "developers. All of the module's features are available without the tests." -#~ msgstr "" -#~ "Ce composant dispose de tests unitaires que vous pouvez télécharger ; ceux-ci sont " -#~ "utiles aux développeurs. Toutes les fonctionnalités d'un composant sont accessibles sans " -#~ "qu'il soit nécessaire de télécharger les tests unitaires." - -#~ msgid "Gallery Repository Setup" -#~ msgstr "Gallery version" - -#~ msgid "" -#~ "In order to download plugins from the Gallery repository, a special directory needs to be " -#~ "created where Gallery will store the data. Under your Gallery base directory, create a " -#~ "directory called '%s' and allow the web server to write into it by appropriately setting " -#~ "the permissions." -#~ msgstr "" -#~ "Afin de télécharger des composants depuis l'entrepôt de Gallery, un répertoire spécial " -#~ "doit être créé pour que Gallery y stocke les données. Dans votre répertoire de base de " -#~ "Gallery, créez un répertoire nommé '%s' et autorisez le serveur Web à y écrire en lui " -#~ "accordant les permissions nécessaires." - -#~ msgid "Instructions for Unix-type platforms:" -#~ msgstr "Instructions pour les plates-formes de type Unix :" - -#~ msgid "" -#~ "Refreshing this page will take you to the Repository if the directory has been " -#~ "successfully created." -#~ msgstr "" -#~ "Raffraîchir cette page vous conduira à l'entrepôt des composants si ce répertoire a été " -#~ "correctement créé." - -#~ msgid "More.." -#~ msgstr "Plus..." - -#~ msgid "Choose a theme for this album. (The way the album is arranged on the page)" -#~ msgstr "Choisir un thème pour cet album. (l'organisation de l'album dans la page)" - -#~ msgid "Recreate thumbnails and resizes" -#~ msgstr "Recréer les vignettes et les images redimensionnées" - -#~ msgid "" -#~ "The thumbnail and resized image settings are for all new items. To apply these settings " -#~ "to all the items in your album, check the appropriate box." -#~ msgstr "" -#~ "Les paramètres pour les vignettes et les images redimensionnées affectent tous les " -#~ "nouveaux éléments. Pour appliquer ces paramètres à tous les éléments de votre album, " -#~ "veuillez cocher l'option appropriée." - -#~ msgid "Recreate thumbnails" -#~ msgstr "Recréer les vignettes" - -#~ msgid "Recreate resized images" -#~ msgstr "Recréer les images redimensionnées" - -#~ msgid "" -#~ "Note: to set the same theme for all subalbums, check the appropriate box in <b>Album</b> " -#~ "tab" -#~ msgstr "" -#~ "Note : pour appliquer le même thèmes à tous les sous-albums, cochez la case à cocher " -#~ "appropriée dans l'onglet <b>Album</b>." - -#~ msgid "Unit test module" -#~ msgstr "Module de tests unitaires" - -#~ msgid "[test] A permission" -#~ msgstr "[test] Une permission" - -#~ msgid "[test] A second permission" -#~ msgstr "[test] Une seconde permission" Modified: trunk/gallery2/modules/core/po/it.po =================================================================== --- trunk/gallery2/modules/core/po/it.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/po/it.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -3220,10 +3220,10 @@ msgstr "Inserisci l'URL di un'immagine" msgid "B <!-- Button label for Bold -->" -msgstr "B <!-- Button label for Bold -->" +msgstr "B" msgid "i <!-- Button label for italic -->" -msgstr "i <!-- Button label for italic -->" +msgstr "i" msgid "list" msgstr "lista" Modified: trunk/gallery2/modules/core/po/ko.po =================================================================== --- trunk/gallery2/modules/core/po/ko.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/po/ko.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -3081,10 +3081,10 @@ msgstr "이미지 주소를 입력하세요" msgid "B <!-- Button label for Bold -->" -msgstr "B <!-- 글씨 굵게 표현 -->" +msgstr "B" msgid "i <!-- Button label for italic -->" -msgstr "i <!-- 글씨 기울여 표현 -->" +msgstr "i" msgid "list" msgstr "목록" Modified: trunk/gallery2/modules/core/po/sk.po =================================================================== --- trunk/gallery2/modules/core/po/sk.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/po/sk.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -3080,10 +3080,10 @@ msgstr "Zadajte URL obrázka" msgid "B <!-- Button label for Bold -->" -msgstr "T <!-- Button label for Bold -->" +msgstr "T" msgid "i <!-- Button label for italic -->" -msgstr "k <!-- Button label for italic -->" +msgstr "k" msgid "list" msgstr "zoznam" Modified: trunk/gallery2/modules/core/po/strings.raw =================================================================== --- trunk/gallery2/modules/core/po/strings.raw 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/po/strings.raw 2007-01-21 18:58:01 UTC (rev 15717) @@ -669,6 +669,7 @@ gettext("Repository") gettext("Please make sure that your internet connection is set up properly or try again later.") gettext("Failed to scan status from plugin: %s.") +gettext("Your local copy of the repository was broken and has been fixed. Please download the plugin list again.") gettext("The repository index has been successfully updated.") gettext("All plugins are already up-to-date.") gettext("%s plugin updated.") Modified: trunk/gallery2/modules/core/test/phpunit/LocalizationAuditTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/LocalizationAuditTest.class 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/core/test/phpunit/LocalizationAuditTest.class 2007-01-21 18:58:01 UTC (rev 15717) @@ -52,6 +52,7 @@ * 2. Check first msgid doesn't have #,fuzzy before it * 3. Check that the first line is "Id" svn keyword * 4. Check charset header is UTF-8 + * 5. Make sure translator hints and __TOKEN__ things aren't translated */ function checkFile($fileName, $buffer) { $path = substr($fileName, strlen(dirname(dirname(dirname(dirname($fileName))))) + 1); @@ -83,6 +84,11 @@ $this->_errorCount++; } + /* Make sure translator hints aren't in translations */ + if (preg_match('/^msgstr "(?:.(?!^msgid))*?<!--/ms', $buffer)) { + $this->assert(false, $path . ': translator hint should be removed in translation'); + } + /* Make sure __TOKEN__ things aren't translated */ preg_match_all( '/(?<!^#, fuzzy\n)^msgid ("(?:.(?!^msgstr))*__[A-Z]+__.*)^msgstr (.*)(?:^$|\z)/Ums', Modified: trunk/gallery2/modules/httpauth/locale/fr/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/fr.po =================================================================== --- trunk/gallery2/modules/httpauth/po/fr.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/httpauth/po/fr.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: HTTP Auth 0.5.0\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-31 15:39+0100\n" -"PO-Revision-Date: 2006-12-31 16:00+0100\n" +"PO-Revision-Date: 2007-01-20 12:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -30,9 +30,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#, fuzzy msgid "HTTP Auth" -msgstr "Paramètres de l'authentification HTTP" +msgstr "Authentification HTTP" msgid "Login using HTTP authentication." msgstr "Connexion à l'aide de l'authentification HTTP" @@ -44,7 +43,7 @@ msgstr "Entête d'autorisation" msgid "Pass the Authorization header to Gallery in a request variable." -msgstr "Passer l'entête d'autorisation à Gallery dans une varaible de requête." +msgstr "Passer l'entête d'autorisation à Gallery dans une variable de requête." msgid "Authorization header." msgstr "Entête d'autorisation" @@ -66,13 +65,16 @@ msgstr "Paramètres sauvegardés avec succès" msgid "Missing HTTP Authorization" -msgstr "" +msgstr "Autorisation HTTP manquante" #, c-format msgid "" "Gallery can't access HTTP usernames and passwords. You can still use your web server's " "authentication. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"Gallery ne peut pas accéder aux noms d'utilisateurs et mots de passe HTTP. Cenpendant, Vous " +"pouvez toujours utiliser l'authentification HTTP de votre serveur web. Une documentation " +"d'aide à l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." msgid "URL rewrite module disabled" msgstr "Le composant \"Réécriture d'URL\" est désactivé" @@ -84,9 +86,14 @@ "Plugins option%s and choose either Apache mod_rewrite or ISAPI_Rewrite. Troubleshooting " "documentation is in the %sGallery Codex%s." msgstr "" +"Gallery ne peut pas accéder par défaut aux noms d'utilisateurs et mots de passe HTTP car le " +"module de réécriture d'URL est désactivé. Vous devez activer le module de réécriture d'URL " +"dans la section %sComposants de la page d'administration%s et sélectionner au choix Apache " +"mod_rewrite ou ISAPI_Rewrite. Une documentation d'aide à l'analyse d'incidents est " +"disponible dans le %sCodex de Gallery%s." msgid "Bad URL rewrite configuration" -msgstr "" +msgstr "Mauvaise configuration de réécriture d'URL" #, c-format msgid "" @@ -95,9 +102,14 @@ "sSite Admin Plugins option%s and choose either Apache mod_rewrite or ISAPI_Rewrite. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"La réécriture PHP Path Info ne supporte pas la règle pour passer par défaut les noms " +"d'utilisateur et les mots de passe HTTP. Vous devez désinstaller et réinstaller le module " +"Réécriture d'URL dans la section %sComposants de la page d'administration%s et sélectionner " +"au choix Apache mod_rewrite ou ISAPI_Rewrite. Une documentation d'aide à l'analyse " +"d'incidents est disponible dans le %sCodex de Gallery%s." msgid "'Authorization Header' rule disabled" -msgstr "" +msgstr "Règle 'Entête d'autorisation' désactivée" #, c-format msgid "" @@ -105,18 +117,26 @@ "disabled. You should activate the HTTP auth 'Authorization Header' rule in the %sSite Admin " "URL Rewrite option%s. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"La règle de réécriture pour retourner par défaut les noms d'utilisateurs et mots de passe à " +"Gallery est actuellement désactivée. Vous devez activer la règle 'Entête d'autorisation' de " +"la partie Authentification HTTP dans la section %sOptions de réécriture d'URL de " +"l'administration de Gallery%s. Une documentation d'aide à l'analyse d'incidents est " +"disponible dans le %sCodex de Gallery%s." msgid "Unknown Cause" -msgstr "" +msgstr "Raison inconnue" #, c-format msgid "" "Gallery can't access HTTP usernames and passwords and automated checks failed to find a " "cause. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"Gallery ne peut pas accéder aux noms d'utilisateurs et aux mots de passe HTTP et les tests " +"automatique n'ont pas permis d'en détecter la cause. Une documentation d'aide à l'analyse " +"d'incidents est disponible dans le %sCodex de Gallery%s." msgid "Gallery can handle HTTP Basic authentication directly." -msgstr "Gallery peut gérer l'authentification HTTP Basic directement." +msgstr "Gallery peut gérer nativement l'authentification HTTP Basic." msgid "Use HTTP Authentication:" msgstr "Utiliser l'authentification HTTP :" @@ -126,6 +146,9 @@ "authentication sends your client a realm to which your username belongs. It's safe to leave " "the realm blank." msgstr "" +"Gallery vous invitera à vous authentifier avec l'authentification HTTP quand une demande " +"d'accès vous sera refusée. L'authentification HTTP envoie à votre navigateur un royaume dans " +"lequel votre nom d'utilisateur appartient. Vous pouvez laisser le royaume vide." msgid "HTTP Authentication Realm:" msgstr "Royaune (Realm) d'authentification HTTP :" @@ -135,9 +158,13 @@ "configured your web server to authenticate requests to Gallery, you may choose to trust the " "username it reports in the REMOTE_USER environment variable." msgstr "" +"Votre serveur web peut vous offrir des méthodes d'authentification plus variées et " +"potentiellement plus sûres. Si vous avez configuré votre serveur web pour prendre en charge " +"les authentifications pour Gallery, vous pouvez choisir de faire confiance au nom " +"d'utilisateur retourné dans la variable HTTP REMOTE_USER." msgid "Use Web Server Authentication:" -msgstr "Utiliser l'authentification du servuer HTTP :" +msgstr "Utiliser l'authentification du serveur HTTP :" #, c-format msgid "" @@ -146,6 +173,12 @@ "if using %s authentication, the REMOTE_USER environment variable may be username@REALM.TLD. " "In these cases, you may use regular expressions to filter authentication types and usernames." msgstr "" +"Vous pouvez souhaiter ne faire confiance qu'à certaines méthodes d'authentification ou qu'à " +"certains noms d'utilisateur HTTP qui correspondent avec des expressions régulères ; ou " +"les noms d'utilisateur HTTP peuvent ne pas correspondre aux noms d'utilisateur dans " +"Gallery, par exemple, en utilisant l'authentification %s, la variable HTTP peut contenir " +"username@REALM.TLD. Dans ces cas, vous pouvez utiliser les expressions régulières pour " +"filtrer les types d'authentification et les noms d'utilisateur." msgid "Use Regular Expressions:" msgstr "Utiliser les expressions régulières :" @@ -154,12 +187,14 @@ "Specify here a regular expression which the authentication type must match for " "authentication to proceed; for instance /Negotiate/" msgstr "" +"Veuillez indiquer ici une expression régulière avec laquelle le type d'authentification doit " +"correspondre afin que l'authentification ait lieu ; par exemple /Negociate/" msgid "Authentication Type Pattern:" -msgstr "" +msgstr "Motif de type d'authentification :" msgid "You must enter a valid regular expression" -msgstr "" +msgstr "Vous devez saisir une expression régulière valide" #, c-format msgid "" @@ -167,12 +202,15 @@ "proceed and a string with which to replace it. See PHP %s documentation for more " "information." msgstr "" +"Veuillez indiquer ici une expression régulière avec laquelle le nom de l'utilisateur doit " +"correspondre et une chaîne avec laquelle le remplacer. Veuillez consulter la documentation " +"PHP %s pour de plus amples informations." msgid "Username Pattern:" -msgstr "" +msgstr "Motif de nom d'utilisateur :" msgid "Username Replacement:" -msgstr "" +msgstr "Remplacement du nom d'utilisateur :" msgid "Save" msgstr "Sauver" @@ -183,3 +221,4 @@ #, c-format msgid "If you're not automatically redirected, %sclick here to finish logging out%s." msgstr "" +"Si vous n'êtes pas automatiquement redirigés, %scliquez ici pour finir la déconnexion%s." Modified: trunk/gallery2/modules/webdav/locale/fr/LC_MESSAGES/modules_webdav.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/webdav/po/fr.po =================================================================== --- trunk/gallery2/modules/webdav/po/fr.po 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/webdav/po/fr.po 2007-01-21 18:58:01 UTC (rev 15717) @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: WebDAV 0.7.1\n" +"Project-Id-Version: Gallery: WebDAV 0.7.2\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-31 15:39+0100\n" -"PO-Revision-Date: 2006-12-31 16:00+0100\n" +"PO-Revision-Date: 2007-01-20 12:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -33,14 +33,17 @@ msgid "WebDAV" msgstr "WebDAV" +msgid "Mount with WebDAV" +msgstr "Monter avec WebDAV" + msgid "Mount Gallery on your desktop." -msgstr "Accès à Gallery depuis votre bureau" +msgstr "Accès à Gallery depuis votre bureau avec le protocole WebDAV" msgid "Remote Interfaces" msgstr "Interfaces distantes" msgid "Connect to WebDAV" -msgstr "Se connecter à WebDAV" +msgstr "Se connecter en WebDAV" msgid "" "Use short URL because most WebDAV clients don't support query strings. The Windows WebDAV " @@ -60,23 +63,25 @@ msgstr "Donnez aux ressources WebDAV l'extension correcte." msgid "OPTIONS Requests" -msgstr "" +msgstr "Requêtes OPTIONS" msgid "Redirect OPTIONS requests so we can set DAV headers." msgstr "" +"Rediriger les requêtes OPTIONS de telle sorte que Gallery puisse positionner les entêtes DAV" -msgid "Mount with WebDAV" -msgstr "Monter avec WebDAV" +msgid "WebDAV Mount Instructions" +msgstr "Instructions de montage WebDAV" #, c-format msgid "" -"You can mount Gallery on your desktop with a WebDAV client. You can then add items to " -"Gallery by drag and drop. Documentation on mounting Gallery with WebDAV is in the %sGallery " -"Codex%s." +"%sClick here%s to mount Gallery on your desktop with a WebDAV client. Documentation on " +"mounting Gallery with WebDAV is in the %sGallery Codex%s." msgstr "" +"%sCliquez ici%s pour monter Gallery sur votre bureau avec un client WebDAV. La documentation " +"pour accéder à Gallery par WebDAC est disponible sur le %sCodex de Gallery%s." -msgid "This album's WebDAV URL is:" -msgstr "L'URL WebDAV de cet album est :" +msgid "Alternatively, you can enter the following URL in your WebDAV client:" +msgstr "Vous pouvez également saisir l'URL suivante dans votre client WebDAV :" msgid "WebDAV Settings" msgstr "Paramètres de WebDAV" @@ -104,9 +109,21 @@ "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -msgid "HTTP auth module disabled" +msgid "WebDAV requests not handled" msgstr "" +#, fuzzy, c-format +msgid "" +"You can't connect with WebDAV because this server doesn't pass WebDAV requests to Gallery. " +"Troubleshooting documentation is in the %sGallery Codex%s." +msgstr "" +"Certains clients WebDAV (par exemple Mac OS X WebDAVFS) ne pourront pas se connecter car les " +"réponses aux requêtes OPTIONS ne contiennent pas d'entêtes WebDAV. Une documentation d'aide " +"à l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." + +msgid "HTTP auth module disabled" +msgstr "Le module d'authentification HTTP est désactivé" + #, c-format msgid "" "You can connect with WebDAV anonymously, but you can't do anything which requires you to " @@ -114,9 +131,14 @@ "the %sSite Admin Plugins option%s. Troubleshooting documentation is in the %sGallery Codex%" "s." msgstr "" +"Vous pouvez vous connecter de manière anonyme en WebDAV, mais vous ne pourrez pas réaliser " +"la moindre opération qui requiert une authentification de votre part car le module " +"d'Authentification HTTP est désactivé. Vous devriez activer le module d'Authentification " +"HTTP dans la section %sComposants de la page d'administration%s. Une documentation d'aide à " +"l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." msgid "'Connect to WebDAV' rule disabled" -msgstr "" +msgstr "La règle 'Se connecter en WebDAV' est désactivée" #, c-format msgid "" @@ -124,15 +146,22 @@ "WebDAV URLs is disabled. You should activate the 'Connect to WebDAV' rule in the %sSite " "Admin URL Rewrite option%s. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"La plupart des clients WebDAV ne parviendront pas à se connecter car la règle de réécriture " +"des URL permettant d'avoir des URL courtes est désactivée. Vous devriez activer la règle 'Se " +"connecter en WebDAV' dans %sOptions de réécriture d'URL de l'administration de Gallery%s. " +"Une documentation d'aide à l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." msgid "Missing DAV headers" -msgstr "" +msgstr "Entêtes DAV manquantes" #, c-format msgid "" "Some WebDAV clients, e.g. Mac OS X WebDAVFS, will fail to connect because OPTIONS responses " "are missing DAV headers. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"Certains clients WebDAV (par exemple Mac OS X WebDAVFS) ne pourront pas se connecter car les " +"réponses aux requêtes OPTIONS ne contiennent pas d'entêtes WebDAV. Une documentation d'aide " +"à l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." msgid "Alternative URL missing DAV headers" msgstr "" @@ -145,7 +174,7 @@ msgstr "" msgid "URL rewrite module disabled" -msgstr "" +msgstr "Le module de réécriture d'URL est désactivé" #, c-format msgid "" @@ -156,7 +185,7 @@ msgstr "" msgid "Bad URL rewrite configuration" -msgstr "" +msgstr "Mauvaise configuration de réécriture d'URL" #, c-format msgid "" @@ -167,7 +196,7 @@ msgstr "" msgid "'OPTIONS Requests' rule disabled" -msgstr "" +msgstr "La règle ''Requêtes OPTIONS' est désactivée" #, c-format msgid "" @@ -177,19 +206,16 @@ msgstr "" msgid "Unknown Cause" -msgstr "" +msgstr "Raison inconnue" #, c-format msgid "" "Some WebDAV clients, e.g. Mac OS X WebDAVFS, will fail to connect and automated checks " "failed to find a cause. Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"Certains clients WebDAV (par exemple Mac OS X WebDAVFS) ne pourront pas se connecter et les " +"tests automatiques ne parviendront pas à établir la cause. Une documentation d'aide à " +"l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." msgid "WebDAV URL" msgstr "URL de WebDAV" - -#, c-format -msgid "" -"You can mount Gallery on your desktop with a WebDAV client. Documentation on mounting " -"Gallery with WebDAV is in the %sGallery Codex%s." -msgstr "" Modified: trunk/gallery2/modules/webdav/po/strings.raw =================================================================== --- trunk/gallery2/modules/webdav/po/strings.raw 2007-01-21 17:17:23 UTC (rev 15716) +++ trunk/gallery2/modules/webdav/po/strings.raw 2007-01-21 18:58:01 UTC (rev 15717) @@ -3,6 +3,9 @@ /* ItemAddWebDav.inc */ gettext("WebDAV") /* also in: module.inc */ +/* WebDavMount.inc */ +gettext("Mount with WebDAV") /* also in: module.inc */ + /* module.inc */ gettext("Mount Gallery on your desktop.") gettext("Remote Interfaces") @@ -13,11 +16,11 @@ gettext("Give davmount resources the correct extension.") gettext("OPTIONS Requests") gettext("Redirect OPTIONS requests so we can set DAV headers.") -gettext("Mount with WebDAV") -/* templates/ItemAddWebDav.tpl */ -gettext... [truncated message content] |
From: <an...@us...> - 2007-01-25 22:53:37
|
Revision: 15721 http://svn.sourceforge.net/gallery/?rev=15721&view=rev Author: andy_st Date: 2007-01-25 14:53:35 -0800 (Thu, 25 Jan 2007) Log Message: ----------- Fix for bug 1619042 "HTTPauth interfering / inconsistencies". See review 56. Introducing a HttpAuthInterface that can be used to check and set the httpauth configuration and to trigger a HTTP authentication popup. Not handling the inconsistency in ShowItem yet since that should be handled when introducing a design for auth-plugins for active authentication. Modified Paths: -------------- trunk/gallery2/modules/httpauth/HttpAuthSiteAdmin.inc trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class trunk/gallery2/modules/webdav/classes/WebDavHelper.class trunk/gallery2/modules/webdav/module.inc trunk/gallery2/modules/webdav/templates/WebDavSiteAdmin.tpl trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class Added Paths: ----------- trunk/gallery2/modules/httpauth/classes/HttpAuthInterface_1_0.class Modified: trunk/gallery2/modules/httpauth/HttpAuthSiteAdmin.inc =================================================================== --- trunk/gallery2/modules/httpauth/HttpAuthSiteAdmin.inc 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/HttpAuthSiteAdmin.inc 2007-01-25 22:53:35 UTC (rev 15721) @@ -66,8 +66,8 @@ return array($ret, null); } - foreach (array('httpAuthPlugin', 'authName', 'serverAuthPlugin', 'regexAuthPlugin', - 'authtypePattern', 'usernamePattern', 'usernameReplace') as $key) { + foreach (array('httpAuthPlugin', 'useGlobally', 'serverAuthPlugin', 'regexAuthPlugin', + 'authtypePattern', 'usernamePattern', 'usernameReplace', 'authName') as $key) { if (isset($form[$key])) { $ret = $module->setParameter($key, $form[$key]); if ($ret) { @@ -95,9 +95,9 @@ } return array(null, array('redirect' => array('view' => 'core.SiteAdmin', - 'subView' => 'httpauth.HttpAuthSiteAdmin'), - 'error' => $error, - 'status' => $status)); + 'subView' => 'httpauth.HttpAuthSiteAdmin'), + 'error' => $error, + 'status' => $status)); } } @@ -130,8 +130,8 @@ /* Load our default values if we didn't just come from this form */ if ($form['formName'] != 'HttpAuthSiteAdmin') { $form['formName'] = 'HttpAuthSiteAdmin'; - foreach (array('httpAuthPlugin', 'authName', 'serverAuthPlugin', 'regexAuthPlugin', - 'authtypePattern', 'usernamePattern', 'usernameReplace') as $key) { + foreach (array('httpAuthPlugin', 'useGlobally', 'serverAuthPlugin', 'regexAuthPlugin', + 'authtypePattern', 'usernamePattern', 'usernameReplace', 'authName') as $key) { if (!empty($params[$key])) { $form[$key] = $params[$key]; } Modified: trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -33,7 +33,7 @@ * @version $Revision$ * @static */ -class HttpAuthHelper { +class HttpAuthHelper /* extends HttpAuthInterface_1_0 */ { /** * Check this module's configuration. @@ -234,6 +234,72 @@ } /** + * @see HttpAuthInterface_1_0::getConfiguration + */ + function getConfiguration() { + list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'httpauth'); + if ($ret) { + return array($ret, null, null, null); + } + return array(null, !empty($params['httpAuthPlugin']), !empty($params['serverAuthPlugin']), + !empty($params['useGlobally'])); + } + + /** + * @see HttpAuthInterface_1_0::setConfiguration + */ + function setConfiguration($enableHttpAuth, $enableServerAuth=false, $useGlobally=false) { + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + if ($ret) { + return $ret; + } + + foreach (array('httpAuthPlugin' => $enableHttpAuth, + 'serverAuthPlugin' => $enableServerAuth, + 'useGlobally' => $useGlobally) as $key => $value) { + $ret = $module->setParameter($key, $value); + if ($ret) { + return $ret; + } + } + + $ret = GalleryCoreApi::unregisterFactoryImplementationsByModuleId('httpauth'); + if ($ret) { + return $ret; + } + $ret = $module->performFactoryRegistrations(); + if ($ret) { + return $ret; + } + + return null; + } + + /** + * @see HttpAuthInterface_1_0::requestAuthentication + */ + function requestAuthentication($ignoreUseGloballyFlag=true) { + list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'httpauth'); + if ($ret) { + return $ret; + } + + if (empty($params['httpAuthPlugin'])) { + return null; + } + + if (!$ignoreUseGloballyFlag && empty($params['useGlobally'])) { + return null; + } + + GalleryUtilities::setResponseHeader('HTTP/1.0 401 Unauthorized', false); + GalleryUtilities::setResponseHeader("WWW-Authenticate: Basic realm='$params[authName]'", + false); + + return null; + } + + /** * Build a URL from its components. * @param array $components URL components in the format of parse_url * @access private Added: trunk/gallery2/modules/httpauth/classes/HttpAuthInterface_1_0.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthInterface_1_0.class (rev 0) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthInterface_1_0.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -0,0 +1,68 @@ +<?php +/* + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2007 Bharat Mediratta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * This is an interface for the httpauth module. Modules that wish to opt-in for HTTPauth can + * utilize an implementation of this interface. + * + * @see HttpAuthPlugin + * @see ServerAuthPlugin + * @package HttpAuth + * @subpackage Classes + * @author Andy Staudacher <as...@gm...> + * @version $Revision: 15513 $ + * @abstract + */ +class HttpAuthInterface_1_0 { + + /** + * Checks if HTTP authentication is enabled. + * @return array object GalleryStatus a status code, + * bool true if HTTPAuth is enabled, + * bool true if ServerAuth is enabled + * bool true if it is enabled globally or + * false if it is only enabled for specific modules + */ + function getConfiguration() { + return array(GalleryCoreApi::error(ERROR_UNIMPLEMENTED), null, null, null); + } + + /** + * Registers the HTTP authentication Gallery authentication plugin. + * @param bool $enableHttpAuth Set to true to activate HTTP auth, false to deactivate. + * @param bool $enableServerAuth (optional) Set to true to activate Server auth, false to + * deactivate (defaults to false). + * @param bool $useGlobally (optional) Set to true to activate auth for all modules, false to + * require modules to opt-in for HTTP auth (default), + * @return object GalleryStatus a status code + */ + function setConfiguration($enableHttpAuth, $enableServerAuth=false, $useGlobally=false) { + return GalleryCoreApi::error(ERROR_UNIMPLEMENTED); + } + + /** + * Prompt the user via HTTP authentication for username / password. + * @return object GalleryStatus a status code + */ + function requestAuthentication() { + return GalleryCoreApi::error(ERROR_UNIMPLEMENTED); + } +} +?> Modified: trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -22,6 +22,10 @@ /** * Get active user from username and password in HTTP headers. + * + * HTTP authentication is handled between the user-agent and Gallery. Gallery is responsible to + * authenticate a user-supplied username / password pair. + * * @package HttpAuth * @subpackage Classes * @author Jack Bates <ms...@fr...> Modified: trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -22,6 +22,12 @@ /** * Get active user from username authenticated by web server. + * + * With server authentication Gallery delegates authentication to the web server and Gallery trusts + * the given username in 'REMOTE_USER' from the $_SERVER variable without doing any authentication + * on its own (same as in GalleryEmbed). It's the web server's responsibility to do the + * authentication in some way. + * * @package HttpAuth * @subpackage Classes * @author Jack Bates <ms...@fr...> Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/module.inc 2007-01-25 22:53:35 UTC (rev 15721) @@ -31,7 +31,7 @@ $this->setId('httpauth'); $this->setName($gallery->i18n('HTTP Auth')); - $this->setVersion('0.5.0'); /* Update upgrade() too! */ + $this->setVersion('0.5.1'); /* Update upgrade() too! */ $this->setDescription($gallery->i18n('Login using HTTP authentication.')); $this->setGroup('authentication', $gallery->i18n('Authentication')); $this->setCallbacks('getSiteAdminViews|registerEventListeners'); @@ -88,6 +88,13 @@ return $ret; } } + + $ret = GalleryCoreApi::registerFactoryImplementation( + 'HttpAuthInterface_1_0', 'HttpAuthHelper', 'HttpAuthInterface', + 'modules/httpauth/classes/HttpAuthHelper.class', $this->getId(), null); + if ($ret) { + return $ret; + } } /** @@ -124,7 +131,8 @@ 'authName' => 'Gallery', 'authtypePattern' => '//', 'usernamePattern' => '/^(.+\\\\)?([^\\\\@]+)(@.+)?$/', - 'usernameReplace' => '$2') as $key => $value) { + 'usernameReplace' => '$2', + 'useGlobally' => false) as $key => $value) { $ret = $this->setParameter($key, $value); if ($ret) { return $ret; @@ -197,6 +205,13 @@ case '0.4.0': /* Add logout view to clear browsers' authentication cache */ + case '0.5.0': + /* Adding HttpAuthInterface and new site admin option */ + $ret = $this->setParameter('useGlobally', false); + if ($ret) { + return $ret; + } + case 'end of upgrade path': break; @@ -313,19 +328,12 @@ return array(null, null); } - list ($ret, $params) = $this->fetchParameters(); + GalleryCoreApi::requireOnce('modules/httpauth/classes/HttpAuthHelper.class'); + $ret = HttpAuthHelper::requestAuthentication(false); if ($ret) { return array($ret, null); } - if (empty($params['httpAuthPlugin'])) { - return array(null, null); - } - - GalleryUtilities::setResponseHeader('HTTP/1.0 401 Unauthorized', false); - GalleryUtilities::setResponseHeader( - "WWW-Authenticate: Basic realm='$params[authName]'", false); - return array(null, null); case 'Gallery::Logout': Modified: trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl =================================================================== --- trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/templates/HttpAuthSiteAdmin.tpl 2007-01-25 22:53:35 UTC (rev 15721) @@ -95,6 +95,15 @@ <div class="gbBlock"> <p class="giDescription"> + {g->text text="By default HTTP authentication is only enabled for specific modules."} + </p> + + <label for="cbUseGlobally"> {g->text text="Use the authentication plugins for all modules:"} </label> + <input id="cbUseGlobally" name="{g->formVar var="form[useGlobally]"}" type="checkbox"{if !empty($form.useGlobally)} checked="checked"{/if}/> +</div> + +<div class="gbBlock"> + <p class="giDescription"> {g->text text="You may wish to trust only HTTP authentication types or HTTP usernames which match specified regular expressions - or HTTP usernames may not match your Gallery usernames; for instance if using %s authentication, the REMOTE_USER environment variable may be username@REALM.TLD. In these cases, you may use regular expressions to filter authentication types and usernames." arg1="<a href=\"http://modauthkerb.sourceforge.net/\"> Kerberos </a>"} </p> Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -57,8 +57,8 @@ array('view' => 'httpauth.HttpAuthWorks'), array('forceServerRelativeUrl' => true, 'htmlEntities' => false)) . " HTTP/1.0\r\n" + . 'Host: ' . $urlGenerator->getHostName() . "\r\n" . 'Authorization: AUTHTYPE ' . base64_encode('USERNAME:PASSWORD') . "\r\n" - . 'Host: ' . $urlGenerator->getHostName() . "\r\n" . "\r\n"; /* Define success and failure responses */ @@ -94,49 +94,61 @@ return $this->failWithStatus($ret); } - /* Activate HTTP auth plugin */ - $ret = GalleryCoreApi::setPluginParameter( - 'module', 'httpauth', 'httpAuthPlugin', true); - if ($ret) { - return $this->failWithStatus($ret); + /* Configure plugin */ + foreach (array('httpAuthPlugin' => true, 'regexAuthPlugin' => true, + 'authtypePattern' => '//', 'usernameReplace' => '$2', + 'usernamePattern' => '/^(.+\\\\)?([^\\\\@]+)(@.+)?$/', + 'serverAuthPlugin' => false, 'useGlobally' => true, + 'authName' => 'TEST_AUTH_NAME') as $key => $value) { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', $key, $value); + if ($ret) { + return $this->failWithStatus($ret); + } } - /* Activate regex auth plugin */ - $ret = GalleryCoreApi::setPluginParameter( - 'module', 'httpauth', 'regexAuthPlugin', true); + /* Create test user */ + list ($ret, $this->_user) = $this->_createRandomUser(); if ($ret) { return $this->failWithStatus($ret); } + $this->_markForCleanup($this->_user); - $ret = GalleryCoreApi::setPluginParameter( - 'module', 'httpauth', 'authtypePattern', '//'); + list ($ret, $this->_authInterface) = + GalleryCoreApi::newFactoryInstance('HttpAuthInterface_1_0'); if ($ret) { return $this->failWithStatus($ret); } + $this->assert(!empty($this->_authInterface), 'Could not instantiate auth interface.'); - $ret = GalleryCoreApi::setPluginParameter( - 'module', 'httpauth', 'usernamePattern', '/^(.+\\\\)?([^\\\\@]+)(@.+)?$/'); - if ($ret) { - return $this->failWithStatus($ret); - } + /* Use HttpAuthModuleTestPhpVm */ + $this->_phpVm = new HttpAuthHelperTestPhpVm(); + $gallery->_phpVm =& $this->_phpVm; - $ret = GalleryCoreApi::setPluginParameter( - 'module', 'httpauth', 'usernameReplace', '$2'); - if ($ret) { - return $this->failWithStatus($ret); - } - - /* Create test user */ - list ($ret, $this->_user) = $this->_createRandomUser(); - if ($ret) { - return $this->failWithStatus($ret); - } - $this->_markForCleanup($this->_user); + /* Clear response headers */ + $this->_headers =& GalleryUtilities::_getResponseHeaders(); + $this->_headers = array(); } function tearDown() { GalleryDataCache::reset(); parent::tearDown(); + + if (!empty($this->_resetFactory)) { + /* After the plugin parameters have been reset, reset the factory as well */ + list ($ret, $module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); + if ($ret) { + $this->failWithStatus($ret); + } else { + $ret = GalleryCoreApi::unregisterFactoryImplementationsByModuleId('httpauth'); + if ($ret) { + $this->failWithStatus($ret); + } + $ret = $module->performFactoryRegistrations(); + if ($ret) { + $this->failWithStatus($ret); + } + } + } } function testCheckConfiguration() { @@ -354,6 +366,19 @@ $this->assertEquals($this->_user, $user); } + function testGetUserIgnoresUseGloballyFlag() { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'useGlobally', false); + if ($ret) { + return $this->failWithStatus($ret); + } + + list ($ret, $user) = HttpAuthHelper::getUser('Test', $this->_user->getUserName()); + if ($ret) { + return $this->failWithStatus($ret); + } + $this->assertEquals($this->_user, $user); + } + function testAddHttpAuthToUrl() { $url = 'http://www.example.com/gallery2/main.php?foo=bar&view=baz#some'; $this->assertEquals('http://FAKEUSER:FAK...@ww.../gallery2/' . @@ -395,6 +420,117 @@ HttpAuthHelper::stripHttpAuthFromUrl($url), 'URL without HTML entities, anchor, other protocol'); } + + function testGetConfiguration() { + list ($ret, $authPluginEnabled, $serverPluginEnabled, $usedGlobally) = + $this->_authInterface->getConfiguration(); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array(true, false, true), + array($authPluginEnabled, $serverPluginEnabled, $usedGlobally)); + } + + function testSetConfiguration() { + $this->_resetFactory = true; + $ret = $this->_authInterface->setConfiguration(false, true, false); + if ($ret) { + return $this->failWithStatus($ret); + } + + list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'httpauth'); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert(!(bool)$params['httpAuthPlugin'], 'wrong httpAuthPlugin value'); + $this->assert((bool)$params['serverAuthPlugin'], 'wrong serverAuthPlugin value'); + $this->assert(!(bool)$params['useGlobally'], 'wrong useGlobally value'); + list ($ret, $authPlugins) = + GalleryCoreApi::getAllFactoryImplementationIds('GalleryAuthPlugin'); + if ($ret) { + return $this->failWithStatus($ret); + } + $this->assert(!isset($authPlugins['HttpAuthPlugin']), 'HttpAuthPlugin still registerd'); + $this->assert(isset($authPlugins['ServerAuthPlugin']), 'ServerAuthPlugin not registered'); + } + + function testSetConfigurationDefaults() { + $this->_resetFactory = true; + $ret = $this->_authInterface->setConfiguration(true); + if ($ret) { + return $this->failWithStatus($ret); + } + + list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'httpauth'); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert((bool)$params['httpAuthPlugin'], 'wrong httpAuthPlugin value'); + $this->assert(!(bool)$params['serverAuthPlugin'], 'wrong serverAuthPlugin value'); + $this->assert(!(bool)$params['useGlobally'], 'wrong useGlobally value'); + } + + function testRequestAuthentication() { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'useGlobally', false); + if ($ret) { + return $this->failWithStatus($ret); + } + + $ret = $this->_authInterface->requestAuthentication(); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array('status' => 'HTTP/1.0 401 Unauthorized', + 'www-authenticate' => "WWW-Authenticate: Basic realm='TEST_AUTH_NAME'"), + $this->_headers); + } + + function testRequestAuthenticationDoNotIgnoreUseGloballyFlag() { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'useGlobally', false); + if ($ret) { + return $this->failWithStatus($ret); + } + + $ret = HttpAuthHelper::requestAuthentication(false); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array(), $this->_headers); + } + + function testRequestAuthenticationIgnoredIfHttpAuthNotEnabled() { + foreach (array('httpAuthPlugin' => false, 'serverAuthPlugin' => true) as $key => $value) { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', $key, $value); + if ($ret) { + return $this->failWithStatus($ret); + } + } + + $ret = HttpAuthHelper::requestAuthentication(); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array(), $this->_headers); + } + + function testRequestAuthenticationAlsoSentWhenAlreadyLoggedIn() { + $this->_becomeGuestUser(); + + $ret = HttpAuthHelper::requestAuthentication(); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array('status' => 'HTTP/1.0 401 Unauthorized', + 'www-authenticate' => "WWW-Authenticate: Basic realm='TEST_AUTH_NAME'"), + $this->_headers); + } } class HttpAuthHelperTestRewriteApi { @@ -474,4 +610,9 @@ return true; } } +class HttpAuthHelperTestPhpVm extends GalleryPhpVm { + function header($header, $replace=null) { + /* Avoid modifying actual header information */ + } +} ?> Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -57,8 +57,8 @@ array('view' => 'httpauth.HttpAuthWorks'), array('forceServerRelativeUrl' => true, 'htmlEntities' => false)) . ' HTTP/1.0', + 'Host: ' . $urlGenerator->getHostName(), 'Authorization: AUTHTYPE ' . base64_encode('USERNAME:PASSWORD'), - 'Host: ' . $urlGenerator->getHostName(), '', '')); @@ -93,10 +93,11 @@ return $this->failWithStatus($ret); } - /* Activate HTTP auth plugin */ - $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'httpAuthPlugin', true); - if ($ret) { - return $this->failWithStatus($ret); + foreach (array('httpAuthPlugin' => true, 'useGlobally' => true) as $key => $value) { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', $key, $value); + if ($ret) { + return $this->failWithStatus($ret); + } } /* Use HttpAuthModuleTestPhpVm */ @@ -174,6 +175,23 @@ $this->_headers); } + function testHandleEventErrorPermissionDeniedIgnoredIfUseGloballyDisabled() { + $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', 'useGlobally', false); + if ($ret) { + return $this->failWithStatus($ret); + } + + $error = GalleryCoreApi::error(ERROR_PERMISSION_DENIED); + $event = GalleryCoreApi::newEvent('Gallery::Error'); + $event->setData(array('error' => $error)); + list ($ret, $results) = GalleryCoreApi::postEvent($event); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array(), $this->_headers); + } + function testHandleEventLogoutNoUsername() { global $gallery; Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -51,7 +51,7 @@ function tearDown() { $ret = GalleryCoreApi::removeAllMapEntries('FailedLoginsMap'); if ($ret) { - return $this->failWithStatus($ret); + $this->failWithStatus($ret); } parent::tearDown(); Modified: trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -51,7 +51,7 @@ function tearDown() { $ret = GalleryCoreApi::removeAllMapEntries('FailedLoginsMap'); if ($ret) { - return $this->failWithStatus($ret); + $this->failWithStatus($ret); } parent::tearDown(); Modified: trunk/gallery2/modules/webdav/classes/WebDavHelper.class =================================================================== --- trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -30,6 +30,7 @@ define('WEBDAV_STATUS_ALTERNATIVE_URL_HEADERS', 0x00000080); define('WEBDAV_STATUS_BAD_REWRITE_PARSER', 0x00000100); define('WEBDAV_STATUS_OPTIONS_RULE_DISABLED', 0x00000200); +define('WEBDAV_STATUS_HTTPAUTH_AUTH_PLUGINS_DISABLED', 0x00000400); define('WEBDAV_STATUS_ERROR_UNKNOWN', 0x80000000); /* Gallery property namespace - RFC2518 18 */ @@ -146,6 +147,23 @@ */ if (empty($moduleStatus['httpauth']['active'])) { $code |= WEBDAV_STATUS_HTTPAUTH_MODULE_DISABLED; + } else { + /* Ensure HTTP auth is enabled */ + list ($ret, $httpAuthInterface) = + GalleryCoreApi::newFactoryInstance('HttpAuthInterface_1_0'); + if ($ret) { + return array($ret, null); + } + if (!empty($httpAuthInterface)) { + list ($ret, $httpAuthPluginEnabled, $serverAuthPluginEnabled) = + $httpAuthInterface->getConfiguration(); + if ($ret) { + return array($ret, null); + } + if (!$httpAuthPluginEnabled && !$serverAuthPluginEnabled) { + $code |= WEBDAV_STATUS_HTTPAUTH_AUTH_PLUGINS_DISABLED; + } + } } /* Modified: trunk/gallery2/modules/webdav/module.inc =================================================================== --- trunk/gallery2/modules/webdav/module.inc 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/webdav/module.inc 2007-01-25 22:53:35 UTC (rev 15721) @@ -31,7 +31,7 @@ $this->setId('webdav'); $this->setName($gallery->i18n('WebDAV')); - $this->setVersion('0.7.2'); /* Update upgrade() too! */ + $this->setVersion('0.7.3'); /* Update upgrade() too! */ $this->setDescription($gallery->i18n('Mount Gallery on your desktop.')); $this->setGroup('interfaces', $gallery->i18n('Remote Interfaces')); $this->setCallbacks('getItemLinks|getSiteAdminViews|registerEventListeners'); @@ -131,6 +131,8 @@ /* Add whitelist for external interface */ case '0.7.1': /* Rename WebDavMount to DownloadDavMount */ + case '0.7.2': + /* Add HttpAuth check through interface */ case 'end of upgrade path': break; @@ -315,6 +317,22 @@ return array(null, null); case 'Gallery::Error': + $data = $event->getData(); + if (($data['error']->getErrorCode() & ERROR_PERMISSION_DENIED)) { + /* Prompt for authentication */ + list ($ret, $httpAuthInterface) = + GalleryCoreApi::newFactoryInstance('HttpAuthInterface_1_0'); + if ($ret) { + return array($ret, null); + } + if (!empty($httpAuthInterface)) { + $ret = $httpAuthInterface->requestAuthentication(); + if ($ret) { + return array($ret, null); + } + } + } + /* Suppress generating HTML error pages for WebDAV clients */ return array(null, array('suppressBody' => true)); } Modified: trunk/gallery2/modules/webdav/templates/WebDavSiteAdmin.tpl =================================================================== --- trunk/gallery2/modules/webdav/templates/WebDavSiteAdmin.tpl 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/webdav/templates/WebDavSiteAdmin.tpl 2007-01-25 22:53:35 UTC (rev 15721) @@ -51,6 +51,15 @@ {g->text text="You can connect with WebDAV anonymously, but you can't do anything which requires you to login because the HTTP auth module is disabled. You should activate the HTTP auth module in the %sSite Admin Plugins option%s. Troubleshooting documentation is in the %sGallery Codex%s." arg1="<a href=\"$adminPluginsUrl\">" arg2="</a>" arg3="<a href=\"http://codex.gallery2.org/index.php/Gallery2:Modules:webdav:admin\">" arg4="</a>"} </p> </div> +{elseif $WebDavSiteAdmin.code & WEBDAV_STATUS_HTTPAUTH_AUTH_PLUGINS_DISABLED} + <div class="gbBlock"> + <h3 class="giWarning"> {g->text text="HTTP auth plugin disabled"} </h3> + + <p class="giDescription"> + {g->text text="You can connect with WebDAV anonymously, but you can't do anything which requires you to login because neither HTTP authentication nor server authentication are enabled in the HTTP auth module. You should activate HTTP authentication in the settings of the HTTP auth module."} + </p> + </div> + {/if} {if $WebDavSiteAdmin.code & WEBDAV_STATUS_CONNECT_RULE_DISABLED} Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -65,6 +65,12 @@ 'RewriteApi', 'WebDavHelperTestRewriteApi', 'WebDavHelperTestRewriteApi', 'modules/webdav/test/phpunit/WebDavHelperTest.class', 'test'); + $this->_registerFactoryImplementationForTest( + 'HttpAuthInterface_1_0', 'WebDavHelperTestHttpAuthInterface', + 'WebDavHelperTestHttpAuthInterface', + 'modules/webdav/test/phpunit/WebDavHelperTest.class', 'test'); + WebDavHelperTestHttpAuthInterface::_getConfiguration(true); + /* Define requests */ $this->_optionsRequest = implode("\r\n", array( 'OPTIONS ' . $this->_urlGenerator->generateUrl( @@ -164,7 +170,7 @@ return $this->failWithStatus($ret); } - $this->assert(!$code); + $this->assertEquals(0, $code, 'error code'); } function testCheckConfigurationNoXmlParser() { @@ -202,6 +208,17 @@ $this->assertEquals(WEBDAV_STATUS_HTTPAUTH_MODULE_DISABLED, $code); } + function testCheckConfigurationHttpAuthPluginDisabled() { + WebDavHelperTestHttpAuthInterface::_getConfiguration(false); + /* Even when the httpauth module is active, none of its auth plugins could be active. */ + list ($ret, $code) = WebDavHelper::checkConfiguration(); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(WEBDAV_STATUS_HTTPAUTH_AUTH_PLUGINS_DISABLED, $code, 'error code'); + } + function testCheckConfigurationRewriteModuleDisabled() { $moduleStatus = array('httpauth' => array('active' => true)); GalleryDataCache::put('GalleryPluginHelper::fetchPluginList(module)', $moduleStatus); @@ -623,4 +640,18 @@ return true; } } + +class WebDavHelperTestHttpAuthInterface /* extends HttpAuthInterface_1_0 */ { + function _getConfiguration($initPluginsEnabled=null) { + static $pluginsEnabled; + if (isset($initPluginsEnabled)) { + $pluginsEnabled = $initPluginsEnabled; + } + return array(null, $pluginsEnabled, $pluginsEnabled, false); + } + + function getConfiguration() { + return WebDavHelperTestHttpAuthInterface::_getConfiguration(); + } +} ?> Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-24 21:46:39 UTC (rev 15720) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-25 22:53:35 UTC (rev 15721) @@ -79,6 +79,12 @@ return $this->failWithStatus($ret); } + $this->_registerFactoryImplementationForTest( + 'HttpAuthInterface_1_0', 'WebDavModuleTestHttpAuthInterface', + 'WebDavModuleTestHttpAuthInterface', + 'modules/webdav/test/phpunit/WebDavModuleTest.class', 'test'); + WebDavModuleTestHttpAuthInterface::_requestAuthenticationCalls('reset'); + /* Define OPTIONS request */ $this->_optionsRequest = implode("\r\n", array( 'OPTIONS ' . $urlGenerator->generateUrl( @@ -199,6 +205,8 @@ } function testHandleEventError() { + GalleryUtilities::removeRequestVariable('controller'); + GalleryUtilities::putRequestVariable('view', 'webdav.WebDav'); $this->_registerTestEventListener('Gallery::Error', $this->_module); $error = GalleryCoreApi::error(GALLERY_ERROR); @@ -210,7 +218,29 @@ } $this->assertEquals(array(array('suppressBody' => 1)), $results); + $this->assertEquals(0, + WebDavModuleTestHttpAuthInterface::_requestAuthenticationCalls('read'), + 'httpauth should only be called for ERROR_PERMISSION_DENIED'); } + + function testHandleEventErrorPermissionDenied() { + GalleryUtilities::removeRequestVariable('controller'); + GalleryUtilities::putRequestVariable('view', 'webdav.WebDav'); + $this->_registerTestEventListener('Gallery::Error', $this->_module); + + $error = GalleryCoreApi::error(ERROR_PERMISSION_DENIED); + $event = GalleryCoreApi::newEvent('Gallery::Error'); + $event->setData(array('error' => $error)); + list ($ret, $results) = GalleryCoreApi::postEvent($event); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assertEquals(array(array('suppressBody' => 1)), $results); + $this->assertEquals(1, + WebDavModuleTestHttpAuthInterface::_requestAuthenticationCalls('read'), + 'httpauth has not been called'); + } } class WebDavModuleTestRewriteApi { @@ -289,4 +319,22 @@ return true; } } + +class WebDavModuleTestHttpAuthInterface /* extends HttpAuthInterface_1_0 */ { + function _requestAuthenticationCalls($mode=false) { + static $calls = 0; + if ($mode == 'reset') { + $calls = 0; + } else if ($mode == 'read') { + return $calls; + } else { + $calls++; + } + } + + function requestAuthentication() { + WebDavModuleTestHttpAuthInterface::_requestAuthenticationCalls(); + return null; + } +} ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-01-26 00:09:20
|
Revision: 15723 http://svn.sourceforge.net/gallery/?rev=15723&view=rev Author: andy_st Date: 2007-01-25 16:09:18 -0800 (Thu, 25 Jan 2007) Log Message: ----------- Test cleanup, adding print $ret->getAsHtml(); in setUp(). Modified Paths: -------------- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -102,6 +102,7 @@ 'authName' => 'TEST_AUTH_NAME') as $key => $value) { $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', $key, $value); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } } @@ -109,6 +110,7 @@ /* Create test user */ list ($ret, $this->_user) = $this->_createRandomUser(); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->_markForCleanup($this->_user); @@ -116,6 +118,7 @@ list ($ret, $this->_authInterface) = GalleryCoreApi::newFactoryInstance('HttpAuthInterface_1_0'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->assert(!empty($this->_authInterface), 'Could not instantiate auth interface.'); Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthModuleTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -39,6 +39,7 @@ /* Load HTTP auth module */ list ($ret, $this->_module) = GalleryCoreApi::loadPlugin('module', 'httpauth'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } @@ -90,12 +91,14 @@ $ret = $this->_markPluginParametersForCleanup('module', 'httpauth'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } foreach (array('httpAuthPlugin' => true, 'useGlobally' => true) as $key => $value) { $ret = GalleryCoreApi::setPluginParameter('module', 'httpauth', $key, $value); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } } Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -40,6 +40,7 @@ /* Create test user */ list ($ret, $this->_user) = $this->_createRandomUser(null, 'password'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->_markForCleanup($this->_user); Modified: trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -40,6 +40,7 @@ /* Create test user */ list ($ret, $this->_user) = $this->_createRandomUser(); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->_markForCleanup($this->_user); Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavHelperTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -41,6 +41,7 @@ $this->_urlGenerator = new GalleryUrlGenerator(); $ret = $this->_urlGenerator->init('http://example.com/gallery2/main.php'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $gallery->setUrlGenerator($this->_urlGenerator); Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavModuleTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -39,6 +39,7 @@ $urlGenerator = new GalleryUrlGenerator(); $ret = $urlGenerator->init('http://example.com/gallery2/main.php'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $gallery->setUrlGenerator($urlGenerator); @@ -46,6 +47,7 @@ /* Create test items */ list ($ret, $this->_album) = $this->_createRandomAlbum($this->_getRootId()); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->_markForCleanup($this->_album); @@ -53,17 +55,20 @@ list ($ret, $this->_item) = $this->_createRandomDataItem($this->_album->getId(), 'test/file'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } list ($ret, $this->_subAlbum) = $this->_createRandomAlbum($this->_album->getId()); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } /* Load WebDAV module */ list ($ret, $this->_module) = GalleryCoreApi::loadPlugin('module', 'webdav'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } @@ -76,6 +81,7 @@ 'RewriteApi', 'WebDavModuleTestRewriteApi', 'WebDavModuleTestRewriteApi', 'modules/webdav/test/phpunit/WebDavModuleTest.class', 'test'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } Modified: trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class =================================================================== --- trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class 2007-01-25 23:06:12 UTC (rev 15722) +++ trunk/gallery2/modules/webdav/test/phpunit/WebDavTest.class 2007-01-26 00:09:18 UTC (rev 15723) @@ -61,6 +61,7 @@ /* Create test items */ list ($ret, $this->_album) = $this->_createRandomAlbum($this->_getRootId()); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $this->_markForCleanup($this->_album); @@ -68,11 +69,13 @@ list ($ret, $this->_item) = $this->_createRandomDataItem($this->_album->getId(), 'test/file'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } list ($ret, $this->_subAlbum) = $this->_createRandomAlbum($this->_album->getId()); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } @@ -83,6 +86,7 @@ $storage =& $gallery->getStorage(); $ret = $storage->checkPoint(); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } @@ -93,6 +97,7 @@ list ($ret, $this->_urlGenerator) = GalleryCoreApi::newFactoryInstance('GalleryUrlGenerator'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } if (!isset($this->_urlGenerator)) { @@ -102,6 +107,7 @@ $ret = $this->_urlGenerator->init('http://example.com/gallery2/main.php'); if ($ret) { + print $ret->getAsHtml(); return $this->failWithStatus($ret); } $gallery->setUrlGenerator($this->_urlGenerator); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2007-01-26 23:13:40
|
Revision: 15727 http://svn.sourceforge.net/gallery/?rev=15727&view=rev Author: mindless Date: 2007-01-26 15:13:39 -0800 (Fri, 26 Jan 2007) Log Message: ----------- Language update: Catalan 48.5->52.3% Modified Paths: -------------- trunk/gallery2/modules/albumselect/locale/ca/LC_MESSAGES/modules_albumselect.mo trunk/gallery2/modules/albumselect/po/ca.po trunk/gallery2/modules/captcha/locale/ca/LC_MESSAGES/modules_captcha.mo trunk/gallery2/modules/captcha/po/ca.po trunk/gallery2/modules/cart/locale/ca/LC_MESSAGES/modules_cart.mo trunk/gallery2/modules/cart/po/ca.po trunk/gallery2/modules/comment/locale/ca/LC_MESSAGES/modules_comment.mo trunk/gallery2/modules/comment/po/ca.po trunk/gallery2/modules/core/locale/ca/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/ca.po trunk/gallery2/modules/customfield/locale/ca/LC_MESSAGES/modules_customfield.mo trunk/gallery2/modules/customfield/po/ca.po trunk/gallery2/modules/dcraw/locale/ca/LC_MESSAGES/modules_dcraw.mo trunk/gallery2/modules/dcraw/po/ca.po trunk/gallery2/modules/debug/locale/ca/LC_MESSAGES/modules_debug.mo trunk/gallery2/modules/debug/po/ca.po trunk/gallery2/modules/gd/locale/ca/LC_MESSAGES/modules_gd.mo trunk/gallery2/modules/gd/po/ca.po trunk/gallery2/modules/httpauth/locale/ca/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/ca.po trunk/gallery2/modules/httpauth/po/strings.raw trunk/gallery2/modules/imagemagick/locale/ca/LC_MESSAGES/modules_imagemagick.mo trunk/gallery2/modules/imagemagick/po/ca.po trunk/gallery2/modules/members/locale/ca/LC_MESSAGES/modules_members.mo trunk/gallery2/modules/members/po/ca.po trunk/gallery2/modules/mime/locale/ca/LC_MESSAGES/modules_mime.mo trunk/gallery2/modules/mime/po/ca.po trunk/gallery2/modules/multilang/locale/ca/LC_MESSAGES/modules_multilang.mo trunk/gallery2/modules/multilang/po/ca.po trunk/gallery2/modules/newitems/locale/ca/LC_MESSAGES/modules_newitems.mo trunk/gallery2/modules/newitems/po/ca.po trunk/gallery2/modules/picasa/locale/ca/LC_MESSAGES/modules_picasa.mo trunk/gallery2/modules/picasa/po/ca.po trunk/gallery2/modules/randomhighlight/locale/ca/LC_MESSAGES/modules_randomhighlight.mo trunk/gallery2/modules/randomhighlight/po/ca.po trunk/gallery2/modules/rearrange/locale/ca/LC_MESSAGES/modules_rearrange.mo trunk/gallery2/modules/rearrange/po/ca.po trunk/gallery2/modules/register/locale/ca/LC_MESSAGES/modules_register.mo trunk/gallery2/modules/register/po/ca.po trunk/gallery2/modules/sizelimit/locale/ca/LC_MESSAGES/modules_sizelimit.mo trunk/gallery2/modules/sizelimit/po/ca.po trunk/gallery2/modules/uploadapplet/locale/ca/LC_MESSAGES/modules_uploadapplet.mo trunk/gallery2/modules/uploadapplet/po/ca.po trunk/gallery2/modules/useralbum/locale/ca/LC_MESSAGES/modules_useralbum.mo trunk/gallery2/modules/useralbum/po/ca.po trunk/gallery2/modules/watermark/locale/ca/LC_MESSAGES/modules_watermark.mo trunk/gallery2/modules/watermark/po/ca.po trunk/gallery2/modules/zipcart/locale/ca/LC_MESSAGES/modules_zipcart.mo trunk/gallery2/modules/zipcart/po/ca.po Modified: trunk/gallery2/modules/albumselect/locale/ca/LC_MESSAGES/modules_albumselect.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/albumselect/po/ca.po =================================================================== --- trunk/gallery2/modules/albumselect/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/albumselect/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Album Select 1.0.5\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 09:40-0800\n" +"Report-Msgid-Bugs-To: <gal...@li...>\n" +"POT-Creation-Date: 2005-11-13 14:15+0100\n" "PO-Revision-Date: 2006-06-13 15:12+0100\n" "Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" "Language-Team: Spanish <gal...@li...>\n" Modified: trunk/gallery2/modules/captcha/locale/ca/LC_MESSAGES/modules_captcha.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/captcha/po/ca.po =================================================================== --- trunk/gallery2/modules/captcha/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/captcha/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,10 +23,10 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Captcha 1.1.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 08:11-0700\n" -"PO-Revision-Date: 2006-06-15 16:05+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" +"Report-Msgid-Bugs-To: <gal...@li...>\n" +"POT-Creation-Date: 2005-11-19 12:53+0100\n" +"PO-Revision-Date: 2006-12-14 19:53+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" "Language-Team: Spanish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,15 +43,17 @@ msgstr "Gallery" msgid "Reset captcha failure counts" -msgstr "" +msgstr "Reinicialitza els contadors d'errors de captcha" msgid "" "Captcha records failure counts in the database when configured for medium security level. " "Run this task to clear all counters." msgstr "" +"Captcha emmagatzema els contadors d'errors a la base de dades quan es configura a nivell mig " +"de seguretat. Executa aquesta tasca per a borrar tots els contadors." msgid "Successfully reset failure counts" -msgstr "" +msgstr "S'han reinicialitzat els contadors d'errors amb èxit" msgid "Captcha plugin configuration test" msgstr "Prova de configuració del plugin de Captcha" @@ -123,27 +125,33 @@ "failures in the session. This provides some protection against casual password guessers, " "but no protection against automated attacks." msgstr "" +"El nivell mig de seguretat conta els errors per a un valor clau, com el nom d'usuari " +"utilitzat en un intent d'entrada. Això significa que després de molts errors relacionats a " +"un nom d'usuari qualsevol, fins i tot l'autèntic usuari, ha d'utilitzar la validació de " +"captcha el proper cop que entri. El nivel baix de seguretat conta els errors en una sessió. " +"Això proporciona protecció contra intents d'encert del mot de pas, però no contra atacs " +"automatitzats." msgid "Configure validation policy for modules using captcha:" -msgstr "" +msgstr "Configura el sistema de validació per als mòduls que usen captcha:" msgid "High" -msgstr "" +msgstr "Alt" msgid "Medium" -msgstr "" +msgstr "Mig" msgid "Low" -msgstr "" +msgstr "Baix" msgid "Off" -msgstr "" +msgstr "Apagat" msgid "Save" -msgstr "Guardar" +msgstr "Desa" msgid "Reset" -msgstr "Reiniciar" +msgstr "Posa a zero" msgid "Type the word appearing in the picture." msgstr "Escriu la paraula que apareix a l'imatge." Modified: trunk/gallery2/modules/cart/locale/ca/LC_MESSAGES/modules_cart.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/cart/po/ca.po =================================================================== --- trunk/gallery2/modules/cart/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/cart/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Cart 1.0.5\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 09:40-0800\n" +"Report-Msgid-Bugs-To: <gal...@li...>\n" +"POT-Creation-Date: 2005-10-31 00:27+0100\n" "PO-Revision-Date: 2006-06-15 15:11+0100\n" "Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" "Language-Team: Spanish <gal...@li...>\n" Modified: trunk/gallery2/modules/comment/locale/ca/LC_MESSAGES/modules_comment.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/comment/po/ca.po =================================================================== --- trunk/gallery2/modules/comment/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/comment/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,10 +23,10 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Comments 1.1.2\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-19 11:56-0800\n" -"PO-Revision-Date: 2006-06-15 15:40+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" +"Report-Msgid-Bugs-To: <gal...@li...>\n" +"POT-Creation-Date: 2005-10-31 01:28+0100\n" +"PO-Revision-Date: 2006-12-14 20:57+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" "Language-Team: Spanish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,14 +93,15 @@ msgid "Commenter" msgstr "Autor" +#, fuzzy msgid "guest" -msgstr "Invitat" +msgstr "Reinicialitza" msgid "Comment Preview" msgstr "Previsualitzar Comentari" msgid "Name" -msgstr "Nom" +msgstr "" msgid "Posted by" msgstr "Enviat per" @@ -166,7 +167,7 @@ #, c-format msgid "Back to %s" -msgstr "Tornar a %s" +msgstr "" msgid "Comments Settings" msgstr "Comentaris" @@ -175,16 +176,16 @@ msgstr "Comentaris agregat amb èxit" msgid "Show link for Latest Comments:" -msgstr "" +msgstr "Mostra un enllaç per als Últims Comentaris:" msgid "Number of comments on Latest Comments page:" -msgstr "" +msgstr "Número de comentaris en la pàgina d' Últims Comentaris:" msgid "Invalid value" -msgstr "" +msgstr "El valor no és vàlid" msgid "Reset" -msgstr "Reiniciar" +msgstr "Reinicialitza" msgid "Delete this comment?" msgstr "¿Borrar aquest comentari?" @@ -271,6 +272,9 @@ msgid "Show a text box that expands into the full form" msgstr "" +#~ msgid "You must enter a subject!" +#~ msgstr "¡Has d'escriure un assumpte!" + #~ msgid "Date" #~ msgstr "Data" @@ -280,8 +284,5 @@ #~ msgid "You must enter a date" #~ msgstr "Has d'introducïr una data" -#~ msgid "You must enter a subject!" -#~ msgstr "¡Has d'escriure un assumpte!" - #~ msgid "You must enter a subject" #~ msgstr "Has d'escriure un assumpte" Modified: trunk/gallery2/modules/core/locale/ca/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/ca.po =================================================================== --- trunk/gallery2/modules/core/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/core/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -22,12 +22,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Core 1.1.25\n" +"Project-Id-Version: Gallery: Core 1.1.29\n" "Report-Msgid-Bugs-To: <gal...@li...>\n" "POT-Creation-Date: 2005-10-25 17:54+0200\n" -"PO-Revision-Date: 2006-06-16 15:39+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" -"Language-Team: Spanish <gal...@li...>\n" +"PO-Revision-Date: 2007-01-10 03:19+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" +"Language-Team: Catalan <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,10 +40,10 @@ msgstr "per sempre" msgid "High Priority (Me first!)" -msgstr "" +msgstr "Prioritat Alta (jo primer!)" msgid "Low Priority (I want to share!)" -msgstr "" +msgstr "Prioritat baixa (vull compartir!)" msgid "No Markup" msgstr "Sense format" @@ -70,7 +70,7 @@ msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" -msgstr[1] "%d horas" +msgstr[1] "%d hores" #, c-format msgid "%d day" @@ -99,15 +99,16 @@ msgid "Themes" msgstr "Temes" +#, fuzzy msgid "Updating Repository Index" -msgstr "" +msgstr "Actualitza l'índex" msgid "Scanning plugins" msgstr "" #, fuzzy msgid "Update Plugin List" -msgstr "Mòduls de Gallery" +msgstr "Millora tots els plugins" msgid "Done." msgstr "Fet" @@ -231,11 +232,11 @@ msgstr "Aquesta és la pàgina principal de la teva Galeria" msgid "Converting MySQL data to UTF8" -msgstr "" +msgstr "Convertint dades de MySQL a UTF8" #, c-format msgid "Upgrading permissions (%d items complete, %d remaining)" -msgstr "" +msgstr "Permissos de millora (%d items completats, %d pendents)" #, fuzzy, c-format msgid "Detecting broken derivatives, loading (%d derivatives checked, %d remaining)" @@ -249,10 +250,10 @@ msgid "Detecting broken derivatives, saving (%d derivatives checked, %d remaining)" msgstr "Detectant derivades trencades, guardant" -#, c-format +#, fuzzy, c-format msgid "" "Detecting broken derivatives, saving item %d of %d (%d derivatives complete, %d remaining)" -msgstr "" +msgstr "Permissos de millora (%d items completats, %d pendents)" #, c-format msgid "Deleting old session files (iteration %d)" @@ -547,7 +548,7 @@ msgstr "Grups" msgid "Performance" -msgstr "" +msgstr "Rendiment" msgid "Toolkit Priority" msgstr "Prioritat de las Eines" @@ -601,8 +602,9 @@ msgid "%d items failed" msgstr "%d elements que han fallat" +#, fuzzy msgid "Convert MySQL database to UTF8" -msgstr "" +msgstr "Convertint dades de MySQL a UTF8" msgid "" "If you created your database with MySQL 3.x and you upgrade to MySQL 4.x, you will " @@ -625,6 +627,8 @@ msgid "" "Delete all persistent user sessions according to your current session expiration settings." msgstr "" +"Elimina totes les sessions d'usuaris persistents d'acord a la vostra configuració " +"d'expiració de sessió." #, fuzzy, c-format msgid "Deleted %d sessions." @@ -736,31 +740,35 @@ msgstr "foto" msgid "Couldn't create repository cache path." -msgstr "" +msgstr "No s'ha pogut crear el cache de magatzems" msgid "" "Couldn't create cache subdirectory. Make sure the web server has write permissions in it." msgstr "" +"No s'ha pogut crear el subdirectori de cache. Assegureu-vos que el servidor web hi té permís " +"d'escriptura." msgid "Official Release Repository" msgstr "" +#, fuzzy msgid "Experimental Repository" -msgstr "" +msgstr "Magatzem" +#, fuzzy msgid "Community Repository" -msgstr "" +msgstr "Magatzem" #, c-format msgid "Error downloading index from '%s'." -msgstr "" +msgstr "S'ha produït un error descarregar l'índex desde '%s'." #, c-format msgid "Error downloading index hash from '%s'." -msgstr "" +msgstr "S'ha produït un error mentre es descarregavà l'índex de \"hash\" desde '%s'." msgid "Index integrity check failed." -msgstr "" +msgstr "S'ha produït un error en comprovar l'integritat de l'índex" msgid "« default sort order »" msgstr "« ordre de col·locació per defecte »" @@ -835,10 +843,10 @@ msgstr "Número d'elements per pàgina" msgid "Row height (pixels)" -msgstr "" +msgstr "Alçada de la fila (en píxels)" msgid "Column width (pixels)" -msgstr "" +msgstr "Amplada de la columna (en píxels)" msgid "Show image owners" msgstr "Mostrar propietaris de les imatges" @@ -858,12 +866,13 @@ msgid "Blocks to show on photo pages" msgstr "Blocs per mostrar en las pàgines de les fotos" +#, fuzzy msgid "Thumbnail links in dynamic albums" -msgstr "" +msgstr "Utilitza aquestes mides de miniatura per a tots els subàlbums" #, fuzzy msgid "Browse dynamic album" -msgstr "Editar Àlbum" +msgstr "Elegeix un àlbum de destí" msgid "Jump to original album" msgstr "" @@ -1034,9 +1043,8 @@ msgid "disabled" msgstr "%d elements que han fallat" -#, fuzzy msgid "Locale" -msgstr "Escalar" +msgstr "Locale" msgid "Browser" msgstr "Buscador" @@ -1085,7 +1093,7 @@ msgstr "Idioma per defecte" msgid "Check Browser Preference" -msgstr "" +msgstr "Comprova la preferència del navegador" #, c-format msgid "" @@ -1307,7 +1315,7 @@ msgstr "Sistema de bloqueig" msgid "Helper Processes" -msgstr "" +msgstr "Processos d'ajuda" msgid "" "Some Gallery modules will use programs on your server to do image processing, archiving and " @@ -1316,6 +1324,12 @@ "priority so that they play nice. If you're in a shared hosting environment and your web " "host is complaining, try setting your priority low." msgstr "" +"Alguns mòduls de Gallery utilitzen programes del servidor per al processament d'imatges, " +"emmagatzemament i altres operacions. Aquests programes poden comportàr fortes càrregues " +"computacinals i impactar en el rendiment global d'un servidor web compartit. Podeu executar " +"aquests programes en un nivell més baix de prioritat per a que funcionin correctament. Si us " +"trobeu en un sistema d'allotjament compartit i rebeu queixes, proveu de baixar la vostra " +"prioritat." msgid "Priority" msgstr "Prioritat de les Eines" @@ -1655,7 +1669,7 @@ msgstr "Detalls de l'última execució" msgid "Performance Tuning" -msgstr "" +msgstr "Ajust de rendiment" msgid "Updated performance settings successfully" msgstr "Prova d'enviament de correu conclosa amb èxit" @@ -1670,9 +1684,15 @@ "you can always get the most recent version of the page by forcing a refresh in your browser " "(typically by holding down the shift key and clicking the reload button)." msgstr "" +"Milloreu el rendiment del vostre Gallery emmagatzemant pàgines web senceres a la base de " +"dades. Això pot reduir considerablement la quantitat de recursos del servidor web i la base " +"de dades que es requereixen per a mostrar una pàgina web. El punt en contra és que la pàgina " +"web que veureu pot estar lleugerament desfasada, tot i que sempre podeu tenir la versió més " +"recent de la pàgina forçant un refresc en el navegador (normalment mantenint apretat la " +"tecla shift i clicant el botó de recàrrega)." msgid "Partial Acceleration" -msgstr "" +msgstr "Acceleració parcial" #, no-c-format msgid "" @@ -1680,9 +1700,13 @@ "dynamic data (like view counts) will not get updated right away. All content that appears " "in blocks (like the random image block, any sidebar blocks, etc) will always be updated." msgstr "" +"L'acceleració parcial incrementa entre un 10-25% el rendiment, però algunes dades dinàmiques " +"(comptadors de vistes, etc) no s'actualitzaran correctament. Tot el contigut que apareix en " +"blocs (com el bloc d'imatge aleatoria, qualsevol bloc de la barra lateral, etc) sempre " +"estarà actualitzat." msgid "Full Acceleration" -msgstr "" +msgstr "Acceleració completa" #, no-c-format msgid "" @@ -1690,6 +1714,9 @@ "image block, other sidebar blocks, number of items in your shopping cart, view counts, etc) " "will get updated until the saved page expires." msgstr "" +"L'acceleració completa incrementa en quasi un 90% el rendiment, però les dades dinàmiques " +"(bloc d'imatge aleatòria, altres blocs de la barra lateral, número d'items a la cistella de " +"la compra, comptadors de vistes, etc) no s'actualitzaran fins que la pàgina salvada expiri." msgid "" "You can additionally specify when saved pages expire. Setting a longer expiration time will " @@ -1697,24 +1724,28 @@ "Lower expiration times mean that users will see more current data, but they will place a " "higher load on your server." msgstr "" +"Podeu especificar addicionalment quan expiren les pàgines desades. Un temps d'expiració més " +"gran reduirà la càrrega del servidor, però incrementarà l'interval abans que els usuaris " +"vegin canvis. Un temps d'expiració més petit significa que els usuaris veuran les dades més " +"actuals, però implica una càrrega major per al servidor." msgid "Here are some standard acceleration profiles:" -msgstr "" +msgstr "Aquí hi ha alguns perfils d'acceleració estàndard:" msgid "Medium acceleration" msgstr "Acceleració Mitja" msgid "High acceleration" -msgstr "" +msgstr "Acceleració alta" msgid "Guest Users" msgstr "Usuaris Registrats" msgid "Expires after:" -msgstr "" +msgstr "Expira després de:" msgid "Clear Saved Pages" -msgstr "" +msgstr "Borra les pàgines desades" msgid "Status: Inactive" msgstr "Estat: Inactiu" @@ -1748,12 +1779,12 @@ msgid "__PLUGIN__ needs configuration" msgstr "" -#, fuzzy msgid "__PLUGIN__ deleted" -msgstr "desactivar" +msgstr "" +#, fuzzy msgid "Warning!" -msgstr "" +msgstr "Avís:" #, fuzzy msgid "Do you really want to uninstall __PLUGIN__?" @@ -1779,21 +1810,17 @@ msgid "disabled(__COUNT__)" msgstr "" -#, fuzzy msgid "up to date(__COUNT__)" -msgstr "Data" +msgstr "" -#, fuzzy msgid "not installed(__COUNT__)" -msgstr "desinstal·lar" +msgstr "" -#, fuzzy msgid "upgrade required(__COUNT__)" -msgstr "(requerit)" +msgstr "" -#, fuzzy msgid "incompatible(__COUNT__)" -msgstr "¡Mòdul Incompatible" +msgstr "" msgid "Failed to completely delete __PLUGIN__" msgstr "" @@ -1802,9 +1829,8 @@ msgid "Gallery Plugins" msgstr "Mòduls de Gallery" -#, fuzzy msgid "Get More Plugins" -msgstr "Mòduls de Gallery" +msgstr "" #, fuzzy msgid "" @@ -1870,20 +1896,27 @@ msgstr "¡Mòdul Incompatible" msgid "Repository" -msgstr "" +msgstr "Magatzem" msgid "Please make sure that your internet connection is set up properly or try again later." msgstr "" +"Assegureu-vos que la vostra connexió a internet està ben configurada i torneu a intentar-ho " +"més tard." #, c-format msgid "Failed to scan status from plugin: %s." msgstr "" -msgid "The repository index has been successfully updated." +msgid "" +"Your local copy of the repository was broken and has been fixed. Please download the plugin " +"list again." msgstr "" +msgid "The repository index has been successfully updated." +msgstr "S'ha actualitzat correctament l'índex del magatzem." + msgid "All plugins are already up-to-date." -msgstr "" +msgstr "Tots els plugins estan actualitzats" #, c-format msgid "%s plugin updated." @@ -1925,8 +1958,9 @@ msgid "Community plugins (%suse at your own risk!%s)" msgstr "" +#, fuzzy msgid "Repository Error" -msgstr "" +msgstr "Magatzem" #, fuzzy msgid "You must select at least one repository." @@ -1954,10 +1988,11 @@ #, fuzzy msgid "Download Plugin List" -msgstr "Descarregant %s" +msgstr "Descarrega les proves d'unitat" +#, fuzzy msgid "Show Repository List" -msgstr "" +msgstr "Magatzem" msgid "Upgrade Gallery" msgstr "Galeria" @@ -1968,20 +2003,24 @@ "the features of the new version may become available. Here are the recommended steps for " "upgrading:" msgstr "" +"Està disponible una nova versió de Gallery, peò no es pot millorar a través d'aquesta " +"interfície. La millora pot fer deixar de funcionar alguns dels vostres plugins, però altres " +"basats en la nova versió estaran disponibles. Aquests són els passos recomanats per a " +"efectuar la millora:" msgid "Review plugin compatibility (on the Themes and Modules tabs)" -msgstr "" +msgstr "Revisa la compatibilitat dels plugins (als apartats de Tema i Mòduls)" #, c-format msgid "%sDownload%s Gallery core" -msgstr "" +msgstr "%sDescarrega%s el nucli de Gallery" #, c-format msgid "Read the %supgrade instructions%s and perform the upgrade" -msgstr "" +msgstr "Llegiu les %sinstruccions de millora%s i procediu a la millora" msgid "Incompatible plugins are marked with an exclamation icon." -msgstr "" +msgstr "Els plugins incompatibles estan marcats amb una icona d'exclamació." #, c-format msgid "" @@ -1989,6 +2028,9 @@ "installed core module, which are not shown here. You can view a %scomplete list%s of " "plugins, including incompatible ones, which are marked with a red icon." msgstr "" +"Està disponible una nova versió del mòdul del nucli. Poden haver-hi plugins incompatibles " +"amb el mòdul del nucli instal·lat que no es mostrin aquí. Podeu veure una %sllista completa%" +"s de plugins, incloent els que són incompatibles, marcats amb una icona vermella." #, fuzzy msgid "upgrade available" @@ -2023,12 +2065,14 @@ msgstr "modificar" msgid "Upgrade All Plugins" -msgstr "" +msgstr "Millora tots els plugins" msgid "" "Gallery can automatically upgrade your themes and modules to the latest available versions. " "No new plugins will be downloaded." msgstr "" +"Gallery pot millorar automàticament els vostres temes i mòduls a l'última versió disponible. " +"No es descarregaran nous plugins." msgid "Upgrade All" msgstr "actualitzar" @@ -2038,7 +2082,7 @@ msgstr "Descarregant %s" msgid "No packages have been selected." -msgstr "" +msgstr "No s'ha seleccionat cap paquet." msgid "" "Download a package in order to use this plugin. You can upgrade by choosing a newer version " @@ -2240,7 +2284,7 @@ #, fuzzy msgid "Locked" -msgstr "Escalar" +msgstr "Locale" #, fuzzy msgid "Failed Logins" @@ -2276,7 +2320,7 @@ msgstr "Error en la Base de Dades" msgid "Platform Error" -msgstr "" +msgstr "A ocorregut un error" #, fuzzy msgid "Authentication Failure" @@ -2304,7 +2348,7 @@ #, fuzzy msgid "Clear the cache" -msgstr "Borrar la cache de la base de dades" +msgstr "Borra les pàgines desades" msgid "Alternatively, you can return to the main Gallery page and resume browsing." msgstr "Com alternativa, pots tornar a la página principal de Gallery i reprendre la recerca." @@ -2338,6 +2382,9 @@ "system permissions. This can happen if you or your webhost changed something in the file " "system, e.g. by restoring data from a backup." msgstr "" +"La naturalesa exacta de l'error de la plataforma és desconeguda. Una causa comú és la manca " +"de permissos en el sistema d'arxius. Això pot succeir si s'ha canviat alguna cosa al sistema " +"d'arxius, ex. restaurar dades d'una còpia de seguretat." msgid "Item not found." msgstr "" @@ -2572,7 +2619,7 @@ msgstr "Has d'escriure un número (major que zero)" msgid "Use this thumbnail size in all subalbums" -msgstr "" +msgstr "Utilitza aquestes mides de miniatura per a tots els subàlbums" msgid "Resized Images" msgstr "Imatges Redimensionades" @@ -2591,7 +2638,7 @@ msgstr "Has d'escriure una mida vàlida" msgid "Use these target sizes in all subalbums" -msgstr "" +msgstr "Utilitza aquestes mides per a tots els subàlbums" #, fuzzy msgid "Apply settings to existing items" @@ -2823,13 +2870,13 @@ msgstr "Solament pots girar la foto en intervals de 90 graus." msgid "CC 90°" -msgstr "Sentit oposat a les agulles del rellotje 90°" +msgstr "CC 90°" msgid "180°" msgstr "180°" msgid "C 90°" -msgstr "Sentit de les agulles 90°" +msgstr "C 90°" msgid "" "There are no graphics toolkits enabled that support this type of photo, so we cannot rotate " @@ -2914,7 +2961,7 @@ msgstr "" msgid "Use this theme in all subalbums" -msgstr "" +msgstr "Utilitza aquest tema per a tots els subàlbums" msgid "Choose Theme" msgstr "" @@ -2929,9 +2976,9 @@ "Aquest álbum està configurat per usar el tema <b>%s</b>. Aquestes configuracions només " "s'apliquen al tema d'aquest àlbum." -#, c-format +#, fuzzy, c-format msgid "Use these settings in all subalbums that use the %s theme" -msgstr "" +msgstr "Utilitza aquesta configuració per a tots els àlbums que utilitzin el tema %s" msgid "Album Highlight" msgstr "Destacar Álbum" @@ -3159,7 +3206,7 @@ msgstr "" msgid "Site is temporarily down for maintenance." -msgstr "" +msgstr "Aquest lloc està fora de servei degut a manteniment" msgid "Admin Login" msgstr "Opcions de l'Administrador" @@ -3335,16 +3382,16 @@ #, c-format msgid "Welcome, %s!" -msgstr "" +msgstr "Benvingut, %s!" msgid "Account settings saved successfully" msgstr "La configuració del compte s'ha guardat amb èxit" msgid "(required, password required for change)" -msgstr "" +msgstr "(Canvi de contrasenya obligatori)" msgid "(suggested, password required for change)" -msgstr "" +msgstr "(Canvi la contrasenya recomanat)" msgid "(required to change the e-mail address)" msgstr "Has d'introduïr una adreça de correu electrònic" @@ -3630,64 +3677,6 @@ msgid "Links to album/photo peers" msgstr "Enllaços als parells d'àlbum/foto" -#~ msgid "Format: [module.BlockName param=value] ..." -#~ msgstr "Format: [módul.NomdelBloc param=valor] ..." - -#~ msgid "Detecting broken derivatives " -#~ msgstr "Detectant derivades trencades" - -#~ msgid "Detecting broken derivatives, " -#~ msgstr "Detectant derivades trencades" - -#~ msgid "G2.1: Blackjack" -#~ msgstr "G2.1: Blackjack" - -#~ msgid "Unit test module" -#~ msgstr "Mòdul de prova d'unidad" - -#~ msgid "[test] A permission" -#~ msgstr "[test] Un permís" - -#~ msgid "[test] A second permission" -#~ msgstr "[test] Un permís secundari" - -#~ msgid "Unit test theme" -#~ msgstr "Tema de prova d'unitat" - -#, fuzzy -#~ msgid "Lock Account" -#~ msgstr "El teu compte" - -#~ msgid "More.." -#~ msgstr "Més..." - -#~ msgid "Rebuilding resized images..." -#~ msgstr "Refer imatges redimensionades" - -#~ msgid "Choose a theme for this album. (The way the album is arranged on the page)" -#~ msgstr "" -#~ "Escull un tema per aquest àlbum. (El mode per el cual l'àlbum es colocat a la pàgina.)" - -#~ msgid "Recreate thumbnails and resizes" -#~ msgstr "Refer miniatures i imatges redimensionades" - -#~ msgid "" -#~ "The thumbnail and resized image settings are for all new items. To apply these settings " -#~ "to all the items in your album, check the appropriate box." -#~ msgstr "" -#~ "La configuració de les miniatures i les imatges redimensionades és per a tots els " -#~ "elements nous. Per aplicar aquesta configuració a tots els elements existents en el teu " -#~ "àlbum, marca la opció apropiada." - -#~ msgid "Recreate thumbnails" -#~ msgstr "Refer vistes en miniatura" - -#~ msgid "Recreate resized images" -#~ msgstr "Refer imatges redimensionades" - -#~ msgid "Continue..." -#~ msgstr "Continuar..." - #~ msgid "Performing Maintenance Tasks" #~ msgstr "Mantenimient del Sistema" @@ -3697,42 +3686,36 @@ #~ msgid "Download" #~ msgstr "Descarregar" -#~ msgid "Plugins directory does not exist." -#~ msgstr "L'usuari '%s' no existeix." +#~ msgid "Detecting broken derivatives " +#~ msgstr "Detectant derivades trencades" -#~ msgid "Confirm module uninstall" -#~ msgstr "Confirma la desinstal·lació del mòdul" +#~ msgid "Detecting broken derivatives, " +#~ msgstr "Detectant derivades trencades" -#~ msgid "This will also remove any permissions and clean up any data created by this module." -#~ msgstr "" -#~ "Això també traurà qualsevol permís i netejarà qualsevol informació temporal creada per " -#~ "aquest mòdul." +#~ msgid "From Local Server" +#~ msgstr "Desde el Servidor Local" -#~ msgid "Uninstall" -#~ msgstr "Desinstal·lar" +#~ msgid "From Web Page" +#~ msgstr "Desde la Pàgina Web" -#~ msgid "Modules" -#~ msgstr "Mòduls" - -#, fuzzy -#~ msgid "Gallery Up-To-Date" -#~ msgstr "Central de Gallery" - -#~ msgid "Unit Tests" -#~ msgstr "Tema de prova d'unitat" - -#~ msgid "Gallery Repository Setup" -#~ msgstr "Repositori d'instal·lació de Gallery" - #~ msgid "create link" #~ msgstr "crear enllaç" #~ msgid "link an item" #~ msgstr "enllaç a un element" +#~ msgid "Rebuilding resized images..." +#~ msgstr "Refer imatges redimensionades" + #~ msgid "Create Link" #~ msgstr "Crear Enllaç" +#~ msgid "Modules" +#~ msgstr "Mòduls" + +#~ msgid "Display" +#~ msgstr "Visualizació" + #~ msgid "Link Album" #~ msgstr "Enllaçar Àlbum" @@ -3745,41 +3728,28 @@ #~ msgid "Link %s" #~ msgstr "Enllaçar %s" -#~ msgid "Link an Item" -#~ msgstr "Enllaçar un Element" +#~ msgid "Plugins directory does not exist." +#~ msgstr "L'usuari '%s' no existeix." -#~ msgid "Successfully linked %d item" -#~ msgid_plural "Successfully linked %d items" -#~ msgstr[0] "%d element enllaçat amb éxit" -#~ msgstr[1] "%d elements enllaçats amb éxit" +#~ msgid "" +#~ "Couldn't create plugins subdirectory. Make sure the webserver has write permissions in it." +#~ msgstr "" +#~ "No s'ha pogut crear el subdirectori de plugins. Assegureu-vos que el servidor web hi té " +#~ "permís d'escriptura." -#~ msgid "This album contains no items to link." -#~ msgstr "Aquest àlbum no conté elements per enllaçar." +#~ msgid "G2.1: Blackjack" +#~ msgstr "G2.1: Blackjack" -#~ msgid "Choose the items you want to link" -#~ msgstr "Elegeix els elements que vols enllaçar" +#~ msgid "Format: [module.BlockName param=value] ..." +#~ msgstr "Format: [módul.NomdelBloc param=valor] ..." -#~ msgid "No sources chosen" -#~ msgstr "No s'han escollit fonts" +#~ msgid "" +#~ "Invalid return URL! The requested URL %s tried to insert a redirection to %s which is not " +#~ "a part of this Gallery." +#~ msgstr "" +#~ "La URL de retorn no és vàlida. La URL %s demanada ha intentat redireccionar a %s, que no " +#~ "forma part d'aquest Gallery." -#~ msgid "Choose a new album for the link" -#~ msgstr "Elegeix un nou àlbum per a l'enllaç" - -#~ msgid "Link" -#~ msgstr "Enllaç" - -#~ msgid "Successfully linked" -#~ msgstr "Enllaç amb èxit" - -#~ msgid "From Local Server" -#~ msgstr "Desde el Servidor Local" - -#~ msgid "From Web Page" -#~ msgstr "Desde la Pàgina Web" - -#~ msgid "Display" -#~ msgstr "Visualizació" - #~ msgid "Local Server Upload Paths" #~ msgstr "Adreces Locals del Servidor per Pujada" @@ -3846,6 +3816,160 @@ #~ msgid "Module API Required: %s (available: %s)" #~ msgstr "API del Mòdul Requerida: %s (disponible: %s)" +#~ msgid "Confirm module uninstall" +#~ msgstr "Confirma la desinstal·lació del mòdul" + +#~ msgid "This will also remove any permissions and clean up any data created by this module." +#~ msgstr "" +#~ "Això també traurà qualsevol permís i netejarà qualsevol informació temporal creada per " +#~ "aquest mòdul." + +#~ msgid "Uninstall" +#~ msgstr "Desinstal·lar" + +#~ msgid "Common Tasks" +#~ msgstr "Tasques comuns" + +#~ msgid "Warning: Experimental feature!" +#~ msgstr "Avís: característica experimental!" + +#~ msgid "" +#~ "The repository features are currently experimental, and no actual repository has been set " +#~ "up yet, so none of these features will work at this time." +#~ msgstr "" +#~ "Les opcions del magatzem actualment són experimentals, i encara no s'ha configurat cap " +#~ "magatzem, per tan cap d'aquestes opcions funciona per ara." + +#~ msgid "" +#~ "The Gallery repository contains the latest modules and themes extensively tested by the " +#~ "Gallery team. The repository index contains information about available plugins, such as " +#~ "the latest versions, available languages and compatibility. The index must be " +#~ "synchronized periodically with the Gallery server so you are informed about any available " +#~ "updates. No personal information is sent to the Gallery server during updating. On slower " +#~ "connections the process might take a minute or two." +#~ msgstr "" +#~ "El magatzem de Gallery conté els últims mòduls i temes provats exhaustivament per l'equip " +#~ "de Gallery. L'índex del magatzem conté informació sobre els plugins disponibles, com ara " +#~ "les últimes versions, llenguatges disponibles i compatibilitat. L'índex s'ha de " +#~ "sincronitzar periòdicament amb el servidor de Gallery per a que estigueu informats de " +#~ "qualsevol actualització disponible. No s'envia cap informació personal al servidor de " +#~ "Gallery durant l'actualització. En connexions lentes, el procés pot trigar un o dos " +#~ "minuts." + +#~ msgid "" +#~ "As of the last update on %s, the repository contains %s modules and %s themes. Its " +#~ "contents can be viewed on the Modules and Themes tabs." +#~ msgstr "" +#~ "Després de l'ultima actualització el %s, el magatzem conté %s mòduls i %s temes. Els " +#~ "continguts poden visualitzar-se als apartats de Mòduls i Temes." + +#~ msgid "" +#~ "The index has never been updated. Click on the Update button to see what updates are " +#~ "available." +#~ msgstr "" +#~ "L'índex no s'ha actualitzat mai. Cliqueu el botó d'Actualitzar per a veure quines " +#~ "actualitzacions hi ha disponibles." + +#~ msgid "Gallery Up-To-Date" +#~ msgstr "Gallery actualitzat" + +#~ msgid "" +#~ "Gallery cannot be upgraded through this interface. When a new version becomes available, " +#~ "upgrade instructions will be presented here." +#~ msgstr "" +#~ "Gallery no es pot millorar a través d'aquesta interfície. Quan hi hagi una nova versio " +#~ "disponible, es mostraran aquí les instruccions de millora." + +#~ msgid "" +#~ "Once the repository index has been downloaded, a list of available plugins will be " +#~ "presented. It can be downloaded by clicking on the Update button on the Common Tasks tab." +#~ msgstr "" +#~ "Un cop s'ha descarregat l'índex del magatzem es presentarà una llista de plugins " +#~ "disponibles. Es pot descarregar clicant el botó d' Actualitzar a l'apartat de Tasques " +#~ "comuns." + +#~ msgid "" +#~ "The following plugins are available. Click on the action beside the plugin you're " +#~ "interested in to see what's available in the repository." +#~ msgstr "" +#~ "Estan disponibles els següents plugins. Cliqueu l'acció al costat del plugin en què esteu " +#~ "interessats per a veure què està disponible al magatzem." + +#~ msgid "" +#~ "The base files required for the theme to work and the English (US) translation will be " +#~ "downloaded." +#~ msgstr "" +#~ "Es descarregaran els fitxers base necessaris per a que funcioni el tema i la traducció al " +#~ "anglès (US)." + +#~ msgid "Upgrade Base Files" +#~ msgstr "Millora els fitxers base" + +#~ msgid "You can upgrade the base module files." +#~ msgstr "Podeu millorar els fitxers base del mòdul." + +#~ msgid "Upgrade base files" +#~ msgstr "Millora els fitxers base" + +#~ msgid "Base Files Up-To-Date" +#~ msgstr "Fitxers base actualitzats" + +#~ msgid "This plugin's base files are up-to-date." +#~ msgstr "Els fitxers base d'aquest plugin estan actualitzats." + +#~ msgid "Updated Translations" +#~ msgstr "Traduccions actualitzades" + +#~ msgid "" +#~ "Below is a list of translations that have been updated since they were last downloaded. " +#~ "Select the ones you want to download." +#~ msgstr "" +#~ "A continuació hi ha una llista dels idiomes actualitzats des de l'última descàrrega. " +#~ "Sel·leccioneu els que voleu descarregar." + +#~ msgid "Additional Languages" +#~ msgstr "Idiomes disponibles" + +#~ msgid "" +#~ "Below is a list of languages this plugin has been translated to. Select the ones you want " +#~ "included in addition to the ones already downloaded." +#~ msgstr "" +#~ "A continuació hi ha una llista dels idiomes als que ha estat traduït aquest plugin. " +#~ "Sel·leccioneu els que voleu incloure als que ja heu descarregat." + +#~ msgid "Unit Tests" +#~ msgstr "Tema de prova d'unitat" + +#~ msgid "" +#~ "This plugin has unit tests available for download, which are useful for Gallery " +#~ "developers. All of the module's features are available without the tests." +#~ msgstr "" +#~ "Aquest plugin té tests d'unitat disponibles per a descarregar, útils per a " +#~ "desenvolupadors de Gallery. Totes les característiques del mòdul estàn disponibles sense " +#~ "els test." + +#~ msgid "Gallery Repository Setup" +#~ msgstr "Repositori d'instal·lació de Gallery" + +#~ msgid "" +#~ "In order to download plugins from the Gallery repository, a special directory needs to be " +#~ "created where Gallery will store the data. Under your Gallery base directory, create a " +#~ "directory called '%s' and allow the web server to write into it by appropriately setting " +#~ "the permissions." +#~ msgstr "" +#~ "Per a descarregar plugins del magatzem de Gallery s'ha de crear un directori especial on " +#~ "Gallery pugui emmagatzemar les dades. Dins del directori de Gallery creeu un directori " +#~ "anomenat '%s2 i permeteu al servicor escriure-hi assignant-li els permissos adequats." + +#~ msgid "Instructions for Unix-type platforms:" +#~ msgstr "Instruccions per a plataformes de tipus Unix:" + +#~ msgid "" +#~ "Refreshing this page will take you to the Repository if the directory has been " +#~ "successfully created." +#~ msgstr "" +#~ "Si el directori s'ha creat amb èxit, us portarà al magatzem en refrescar aquesta pàgina." + #~ msgid "All Themes" #~ msgstr "Tots els Temes" @@ -3861,6 +3985,9 @@ #~ msgid "(default)" #~ msgstr "(per defecte)" +#~ msgid "More.." +#~ msgstr "Més..." + #~ msgid "" #~ "Transfer files that are already on your server into your Gallery. The files must already " #~ "have been uploaded to your server some other way (like FTP) and must be placed in a " @@ -4003,6 +4130,69 @@ #~ msgid "Add URLs" #~ msgstr "Agregar URLs" +#~ msgid "Link an Item" +#~ msgstr "Enllaçar un Element" + +#~ msgid "Successfully linked %d item" +#~ msgid_plural "Successfully linked %d items" +#~ msgstr[0] "%d element enllaçat amb éxit" +#~ msgstr[1] "%d elements enllaçats amb éxit" + +#~ msgid "This album contains no items to link." +#~ msgstr "Aquest àlbum no conté elements per enllaçar." + +#~ msgid "Choose the items you want to link" +#~ msgstr "Elegeix els elements que vols enllaçar" + +#~ msgid "No sources chosen" +#~ msgstr "No s'han escollit fonts" + +#~ msgid "Choose a new album for the link" +#~ msgstr "Elegeix un nou àlbum per a l'enllaç" + +#~ msgid "Link" +#~ msgstr "Enllaç" + +#~ msgid "Successfully linked" +#~ msgstr "Enllaç amb èxit" + +#~ msgid "Choose a theme for this album. (The way the album is arranged on the page)" +#~ msgstr "" +#~ "Escull un tema per aquest àlbum. (El mode per el cual l'àlbum es colocat a la pàgina.)" + +#~ msgid "Recreate thumbnails and resizes" +#~ msgstr "Refer miniatures i imatges redimensionades" + +#~ msgid "" +#~ "The thumbnail and resized image settings are for all new items. To apply these settings " +#~ "to all the items in your album, check the appropriate box." +#~ msgstr "" +#~ "La configuració de les miniatures i les imatges redimensionades és per a tots els " +#~ "elements nous. Per aplicar aquesta configuració a tots els elements existents en el teu " +#~ "àlbum, marca la opció apropiada." + +#~ msgid "Recreate thumbnails" +#~ msgstr "Refer vistes en miniatura" + +#~ msgid "Recreate resized images" +#~ msgstr "Refer imatges redimensionades" + +#~ msgid "" +#~ "Note: to set the same theme for all subalbums, check the appropriate box in <b>Album</b> " +#~ "tab" +#~ msgstr "" +#~ "Nota: per a fer servir el mateix tema a tots els subàlbums, activa la casella " +#~ "corresponent a l'apartat <b>Àlbum</b>" + +#~ msgid "Unit test module" +#~ msgstr "Mòdul de prova d'unidad" + +#~ msgid "[test] A permission" +#~ msgstr "[test] Un permís" + +#~ msgid "[test] A second permission" +#~ msgstr "[test] Un permís secundari" + #~ msgid "« None »" #~ msgstr "« Ninguno »" Modified: trunk/gallery2/modules/customfield/locale/ca/LC_MESSAGES/modules_customfield.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/customfield/po/ca.po =================================================================== --- trunk/gallery2/modules/customfield/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/customfield/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Custom Fields 1.0.7\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 09:40-0800\n" +"Report-Msgid-Bugs-To: <gal...@li...>\n" +"POT-Creation-Date: 2005-12-02 15:18+0100\n" "PO-Revision-Date: 2006-06-15 15:51+0100\n" "Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" "Language-Team: Spanish <gal...@li...>\n" Modified: trunk/gallery2/modules/dcraw/locale/ca/LC_MESSAGES/modules_dcraw.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/dcraw/po/ca.po =================================================================== --- trunk/gallery2/modules/dcraw/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/dcraw/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Dcraw 1.0.6\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-12-20 09:40-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-12-07 20:26+0100\n" "PO-Revision-Date: 2006-06-13 16:35+0100\n" "Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" "Language-Team: Spanish <gal...@li...>\n" Modified: trunk/gallery2/modules/debug/locale/ca/LC_MESSAGES/modules_debug.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/debug/po/ca.po =================================================================== --- trunk/gallery2/modules/debug/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/debug/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Gallery: Debugging 1.0.4\n" "POT-Creation-Date: 2005-12-18 12:00-0800\n" -"PO-Revision-Date: 2006-06-15 18:07+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" +"PO-Revision-Date: 2006-12-14 20:58+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" "Language-Team: Spanish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +36,7 @@ msgstr "Depuració" msgid "Debugging and Developer Tools" -msgstr "" +msgstr "Eines de depuració i desenvolupament" msgid "Gallery" msgstr "Gallery" @@ -52,4 +52,4 @@ msgstr "%d: (%s)" msgid "[browse]" -msgstr "" +msgstr "[navega]" Modified: trunk/gallery2/modules/gd/locale/ca/LC_MESSAGES/modules_gd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/gd/po/ca.po =================================================================== --- trunk/gallery2/modules/gd/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/gd/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -20,10 +20,10 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Gd 1.1.0\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-09-12 10:54-0700\n" -"PO-Revision-Date: 2006-06-13 17:04+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-05-21 15:49+0100\n" +"PO-Revision-Date: 2006-12-14 21:10+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" "Language-Team: Spanish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,17 +48,17 @@ msgstr "" msgid "(optional) target height, defaults to same as width" -msgstr "" +msgstr "(opcional) alçada desitjada, per defecte igual que l'amplada" msgid "Scale the image to the target size, maintain aspect ratio" -msgstr "" +msgstr "Escala la imatge a la mida desitjada, mantenint la relació d'aspecte" #, no-c-format msgid "target height (# pixels or #% of full size)" msgstr "" msgid "Resize the image to the target dimensions" -msgstr "" +msgstr "Redimensiona la imatge a les dimensions desitjades" msgid "rotation degrees" msgstr "graus de rotació" @@ -67,52 +67,52 @@ msgstr "Rotar l'imatge" msgid "left edge %" -msgstr "" +msgstr "marge esquerre %" msgid "top edge %" -msgstr "" +msgstr "marge superior %" msgid "width %" -msgstr "" +msgstr "amplada %" msgid "height %" -msgstr "" +msgstr "alçada %" msgid "Crop the image" -msgstr "" +msgstr "Retalla la imatge" msgid "overlay path" -msgstr "" +msgstr "superposa el camí" msgid "overlay mime type" -msgstr "" +msgstr "superposa el tipus mime" msgid "overlay width" -msgstr "" +msgstr "supoerposa l'amplada" msgid "overlay height" -msgstr "" +msgstr "superposa l'alçada" msgid "alignment type" -msgstr "" +msgstr "tipus d'aliniament" msgid "alignment x %" -msgstr "" +msgstr "aliniament x %" msgid "alignment y %" -msgstr "" +msgstr "aliniament y %" msgid "Overlay source image with a second one" -msgstr "" +msgstr "Superposa la imatge original amb una altra" msgid "target size in kb" -msgstr "" +msgstr "Tamany desitjat en kb" msgid "Reduce image quality to reach target file size" -msgstr "" +msgstr "Redueix la qualitat de la imatge per a assolir el tamany de fitxer desitjat" msgid "Get the width and height of the image" -msgstr "" +msgstr "Troba l'amplada i l'alçada de l'imatge" msgid "Gd Settings" msgstr "Configuració Gd" @@ -124,6 +124,8 @@ "Gd is a graphics toolkit that can be used to process images that you upload to Gallery. The " "GD-library should be compiled in your PHP (--with-gd)." msgstr "" +"GD és un conjunt d'eines que pot ser utilitzat per a processar les imatges que pugeu a " +"Gallery. La llibraria GD ha d'estar compilada al vostre PHP (--with-dg)." msgid "JPEG Quality:" msgstr "JPEG Qualitat:" @@ -150,24 +152,32 @@ msgstr "Pass/fail" msgid "bundled" -msgstr "" +msgstr "empaquetat" msgid "Failed" -msgstr "Fracàs" +msgstr "Incorrecte" msgid "" "This GD version is too old and is not supported by this module! Please upgrade your PHP " "installation to include the latest GD version." msgstr "" +"Aquesta versió de GD és massa antiga i aquest mòdul no la soporta. Per favor, milloreu la " +"vostra instal·lació de PHP per a que inclogui l'última versió de GD." msgid "Passed" -msgstr "" +msgstr "Correcte" msgid "You don't seem to have the GD library available on this PHP installation." -msgstr "" +msgstr "Sembla que no teniu disponible la llibreria GD en aquesta instal·lació de PHP." msgid "Supported MIME Types" -msgstr "" +msgstr "Tipus MIME soportats" msgid "The Gd module will support files with the following MIME types:" msgstr "El mòdulo GD suporta fitxers amb les següents extensions:" + +#~ msgid "target width" +#~ msgstr "amplada desitjada" + +#~ msgid "target height" +#~ msgstr "alçada desitjada" Modified: trunk/gallery2/modules/httpauth/locale/ca/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/ca.po =================================================================== --- trunk/gallery2/modules/httpauth/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/httpauth/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -22,7 +22,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: HTTP Auth 0.5.0\n" +"Project-Id-Version: Gallery: HTTP Auth 0.5.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:40-0800\n" "PO-Revision-Date: 2006-06-16 15:39+0100\n" @@ -139,6 +139,12 @@ msgid "Use Web Server Authentication:" msgstr "" +msgid "By default HTTP authentication is only enabled for specific modules." +msgstr "" + +msgid "Use the authentication plugins for all modules:" +msgstr "" + #, c-format msgid "" "You may wish to trust only HTTP authentication types or HTTP usernames which match specified " Modified: trunk/gallery2/modules/httpauth/po/strings.raw =================================================================== --- trunk/gallery2/modules/httpauth/po/strings.raw 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/httpauth/po/strings.raw 2007-01-26 23:13:39 UTC (rev 15727) @@ -31,6 +31,8 @@ gettext("HTTP Authentication Realm:") gettext("Your web server may offer more comprehensive and more secure authentication. If you configured your web server to authenticate requests to Gallery, you may choose to trust the username it reports in the REMOTE_USER environment variable.") gettext("Use Web Server Authentication:") +gettext("By default HTTP authentication is only enabled for specific modules.") +gettext("Use the authentication plugins for all modules:") gettext("You may wish to trust only HTTP authentication types or HTTP usernames which match specified regular expressions - or HTTP usernames may not match your Gallery usernames; for instance if using %s authentication, the REMOTE_USER environment variable may be username@REALM.TLD. In these cases, you may use regular expressions to filter authentication types and usernames.") gettext("Use Regular Expressions:") gettext("Specify here a regular expression which the authentication type must match for authentication to proceed; for instance /Negotiate/") Modified: trunk/gallery2/modules/imagemagick/locale/ca/LC_MESSAGES/modules_imagemagick.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/imagemagick/po/ca.po =================================================================== --- trunk/gallery2/modules/imagemagick/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/imagemagick/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -20,8 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: ImageMagick 1.1.0\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-09-12 11:02-0700\n" +"POT-Creation-Date: 2005-12-18 12:00-0800\n" "PO-Revision-Date: 2006-06-15 18:47+0100\n" "Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" "Language-Team: Spanish <gal...@li...>\n" @@ -37,7 +36,7 @@ msgstr "" msgid "Graphics Toolkits" -msgstr "Eines Gràfiques" +msgstr "" msgid "Convert to" msgstr "" @@ -138,7 +137,7 @@ msgstr "Preferències de ImageMagick" msgid "Settings saved successfully" -msgstr "La configuració s'ha guardat amb èxit" +msgstr "" msgid "" "ImageMagick is a graphics toolkit that can be used to process images that you upload to " @@ -192,7 +191,7 @@ msgstr "Cancel·lar" msgid "Reset" -msgstr "Reiniciar" +msgstr "" msgid "ImageMagick binary test results" msgstr "Resultat del test binari de ImageMagick" @@ -213,7 +212,7 @@ msgstr "Missatges d'error" msgid "Version" -msgstr "Versió" +msgstr "" #, c-format msgid "" Modified: trunk/gallery2/modules/members/locale/ca/LC_MESSAGES/modules_members.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/members/po/ca.po =================================================================== --- trunk/gallery2/modules/members/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/members/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -20,10 +20,10 @@ msgid "" msgstr "" "Project-Id-Version: Gallery: Members 1.0.4\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-09-12 11:39-0700\n" -"PO-Revision-Date: 2006-06-13 17:44+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-09-05 18:04+0000\n" +"PO-Revision-Date: 2006-12-22 16:37+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" "Language-Team: Spanish <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,12 +72,14 @@ msgstr "Configuració guardada" msgid "This will select who can see the members list and member profiles." -msgstr "" +msgstr "Permet sel·leccionar qui pot veure el llistat de membres i els seus perfils." msgid "" "This will select if email addresses are displayed in the member profiles. Administrators " "will always be able to see email addresses." msgstr "" +"Permet sel·leccionar si es mostren les adreces de correu electrònic al perfil dels membres. " +"Els administradors sempre poden veure aquestes adreces." msgid "Save" msgstr "Guardar" @@ -87,26 +89,26 @@ #, c-format msgid "Member Items for %s" -msgstr "" +msgstr "Elements del membre %s" #, c-format msgid "%d item total" msgid_plural "%d items total" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d total de l'element" +msgstr[1] "%d total dels elements" msgid "« first" msgstr "« primer" msgid "« back" -msgstr "« anterior" +msgstr "« enrera" #, c-format msgid "Viewing page %d of %d" -msgstr "Mostrant pàgina %d de %d" +msgstr "Visualitzant la pàgina %d de %d" msgid "next »" -msgstr "següent »" +msgstr "pròxim »" msgid "last »" msgstr "últim »" @@ -127,7 +129,7 @@ msgstr "Àlbum" msgid "Item" -msgstr "" +msgstr "Element" msgid "None" msgstr "Ningun" @@ -135,8 +137,8 @@ #, c-format msgid "%d member" msgid_plural "%d members" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d membre" +msgstr[1] "%d membres" msgid "#" msgstr "#" @@ -152,7 +154,7 @@ #, c-format msgid "Member Profile for %s" -msgstr "" +msgstr "Perfil del membre %s" msgid "Name:" msgstr "Nom:" @@ -161,7 +163,7 @@ msgstr "Email:" msgid "Member Since:" -msgstr "" +msgstr "Membre desde:" #, c-format msgid "(%d day)" @@ -181,8 +183,8 @@ #, c-format msgid "%s member" msgid_plural "%s members" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s membre" +msgstr[1] "%s membres" msgid "Members Block" msgstr "Bloc Membres" Modified: trunk/gallery2/modules/mime/locale/ca/LC_MESSAGES/modules_mime.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/mime/po/ca.po =================================================================== --- trunk/gallery2/modules/mime/po/ca.po 2007-01-26 10:21:50 UTC (rev 15726) +++ trunk/gallery2/modules/mime/po/ca.po 2007-01-26 23:13:39 UTC (rev 15727) @@ -18,44 +18,45 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # # Previous translators (as far as known, add yourself here, please): -# - Oscar Garcia Amor <osc...@mo...> +# - Frederik Kunz <fre...@we...> # msgid "" msgstr "" "Project-Id-Version: Gallery: MIME Maintenance 1.1.1\n" -"Report-Msgid-Bugs-To: gal...@li...\n" -"POT-Creation-Date: 2006-09-12 11:46-0700\n" -"PO-Revision-Date: 2006-06-16 15:39+0100\n" -"Last-Translator: Juan Vega Aiguadé <joa...@an...>\n" -"Language-Team: Spanish <gal...@li...>\n" +"POT-Creation-Date: 2003-10-19 05:10+0200\n" +"PO-Revision-Date: 2007-01-10 03:19+0100\n" +"Last-Translator: Roger Cervantes <cer...@ya...>\n" +"Language-Team: German <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.10.1\n" msgid "This type of file not allowed; item will not be added." msgstr "" msgid "MIME Maintenance" -msgstr "" +msgstr "Manteniment MIME" msgid "Maintain MIME types and file extensions" -msgstr "" +msgstr "Mantingues els tipus MIME i les extensions dels fitxers" msgid "Extra Data" -msgstr "" +msgstr "Dades extra" msgid "MIME Types" -msgstr "" +msgstr "Tipus MIME" +#, fuzzy msgid "Settings saved successfully" -msgstr "La configuració s'ha guardat amb èxit" +msgstr "Entrada MIME desada amb èxit" msgid "MIME entry saved successfully" -msgstr "" +msgstr "Entrada MIME desada amb èxit" msgid "MIME entry deleted" -msgstr "" +msgstr "Entrada MIME eliminada" msgid "Allow all uploads" msgstr "" @@ -67,28 +68,28 @@ msgstr "" msgid "Save" -msgstr "Guardar" +msgstr "Desa" msgid "Reset" -msgstr "Reiniciar" +msgstr "" msgid "Add new MIME type" -msgstr "" +msgstr "Afegeix un nou tipus MIME" msgid "Extensions" -msgstr "" +msgstr "Extensions" msgid "Viewable" -msgstr "" +msgstr "Visible" msgid "Actions" msgstr "Accions" msgid "edit" -msgstr "editar" +msgstr "edita" msgid "delete" -msgstr "eliminar" +msgstr "suprimeix" msgid "Allow Upload" msgstr "" @@ -98,37 +99,39 @@ #, c-format msgid "Edit MIME type: %s" -msgstr "" +msgstr "Edita el tipus MIME: %s" msgid "New MIME type" -msgstr "" +msgstr "Nou tipus Mime" msgid "Mime entry saved successfully" -msgstr "" +msgstr "Entrada MIME desada amb èxit" msgid "MIME type: " -msgst... [truncated message content] |
From: <an...@us...> - 2007-01-31 20:54:11
|
Revision: 15759 http://svn.sourceforge.net/gallery/?rev=15759&view=rev Author: andy_st Date: 2007-01-31 12:43:26 -0800 (Wed, 31 Jan 2007) Log Message: ----------- Fix session fixation vulnerability in httpauth, remote and nokiaupload (review 69) - Move $session->regenerate() call into the Gallery::Login handler - Ensure that $gallery->setActiveUser is called before the event is posted - Special handling in httpauth since we cannot use the Gallery::Login event there. Only regenerate if the authenticated user is different from the user from the session. - Also fixes a GR protocol bug. Login responses now include the auth-token. - Small refactoring / cleanup of nokiaupload tests. Modified Paths: -------------- trunk/gallery2/modules/core/UserLogin.inc trunk/gallery2/modules/core/classes/helpers/GalleryUserHelper_medium.class trunk/gallery2/modules/core/module.inc trunk/gallery2/modules/core/test/phpunit/UserHelperTest.class trunk/gallery2/modules/core/test/phpunit/UserLoginControllerTest.class trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class trunk/gallery2/modules/nokiaupload/classes/ImageUploadHelper.class trunk/gallery2/modules/nokiaupload/test/phpunit/ImageUploadHelperTest.class trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadDirectoryListingControllerTest.class trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadNewDirectoryControllerTest.class trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadUploadControllerTest.class trunk/gallery2/modules/publishxp/PublishXpLogin.inc trunk/gallery2/modules/publishxp/test/phpunit/PublishXpLoginControllerTest.class Modified: trunk/gallery2/modules/core/UserLogin.inc =================================================================== --- trunk/gallery2/modules/core/UserLogin.inc 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/core/UserLogin.inc 2007-01-31 20:43:26 UTC (rev 15759) @@ -145,12 +145,6 @@ return array($ret, null); } - $session =& $gallery->getSession(); - $ret = $session->regenerate(); - if ($ret) { - return array($ret, null); - } - /* Redirect if requested by event listener, otherwise return */ if (!empty($redirect)) { $results['redirect'] = array_shift($redirect); Modified: trunk/gallery2/modules/core/classes/helpers/GalleryUserHelper_medium.class =================================================================== --- trunk/gallery2/modules/core/classes/helpers/GalleryUserHelper_medium.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/core/classes/helpers/GalleryUserHelper_medium.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -322,6 +322,12 @@ if ($ret) { return array($ret, null); } + + $session =& $gallery->getSession(); + $ret = $session->regenerate(); + if ($ret) { + return array($ret, null); + } } else if ($event->getEventName() == 'Gallery::FailedLogin') { $data = $event->getData(); if (!empty($data['userName'])) { Modified: trunk/gallery2/modules/core/module.inc =================================================================== --- trunk/gallery2/modules/core/module.inc 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/core/module.inc 2007-01-31 20:43:26 UTC (rev 15759) @@ -57,8 +57,8 @@ GalleryCoreApi::registerEventListener('GalleryEntity::delete', $handler); GalleryCoreApi::requireOnce('modules/core/classes/helpers/GalleryUserHelper_medium.class'); $handler2 = new GalleryUserHelper_medium(); - GalleryCoreApi::registerEventListener('Gallery::FailedLogin', $handler2); - GalleryCoreApi::registerEventListener('Gallery::Login', $handler2); + GalleryCoreApi::registerEventListener('Gallery::FailedLogin', $handler2, true); + GalleryCoreApi::registerEventListener('Gallery::Login', $handler2, true); } /** Modified: trunk/gallery2/modules/core/test/phpunit/UserHelperTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/UserHelperTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/core/test/phpunit/UserHelperTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -38,9 +38,21 @@ $this->_storage = new UserHelperTestMockStorage(); $gallery->_storage =& $this->_storage; $gallery->_phpVm =& $this->_phpVm; + $this->_saveSession = $gallery->_session; } + function tearDown() { + global $gallery; + $gallery->_session = $this->_saveSession; + + parent::tearDown(); + } + function testGalleryLoginEvent() { + global $gallery; + + $gallery->_session = new UserHelperTestSession(); + $event = GalleryCoreApi::newEvent('Gallery::Login'); $event->setEntity(new UserHelperTestMockUser()); list ($ret, $ignored) = GalleryUserHelper_medium::handleEvent($event); @@ -51,6 +63,9 @@ $this->assertEquals( array(array('remove', 'FailedLoginsMap', array('userName' => 'MockUser'))), $this->_storage->_operations); + + $this->assert($gallery->_session->regenerateWasCalled(), + 'Regenerate session was not called!'); } function testGalleryFailedLoginEventFirstFailure() { @@ -279,4 +294,21 @@ return $this->_time; } } + +/** + * Mock Session + */ +class UserHelperTestSession { + function UserHelperTestSession() { + $this->_regenerateWasCalled = false; + } + + function regenerate() { + $this->_regenerateWasCalled = true; + } + + function regenerateWasCalled() { + return $this->_regenerateWasCalled; + } +} ?> Modified: trunk/gallery2/modules/core/test/phpunit/UserLoginControllerTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/UserLoginControllerTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/core/test/phpunit/UserLoginControllerTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -19,6 +19,7 @@ */ GalleryCoreApi::requireOnce('modules/core/classes/GalleryValidationPlugin.class'); +GalleryCoreApi::requireOnce('modules/core/classes/helpers/GalleryUserHelper_medium.class'); /** * UserLogin controller tests @@ -52,6 +53,9 @@ $this->_mockSession = new UserLoginControllerTestSession(); $gallery->_session =& $this->_mockSession; + $eventHandler = new GalleryUserHelper_medium(); + $this->_registerTestEventListener('Gallery::Login', $eventHandler); + list ($ret, $this->_validationLevel) = GalleryCoreApi::getPluginParameter('module', 'core', 'validation.level'); if ($ret) { @@ -91,6 +95,9 @@ GalleryUtilities::putRequestVariable('form[username]', $this->_user->getUserName()); GalleryUtilities::putRequestVariable('form[password]', 'password'); + $listener = new NullEventListener(); + $this->_registerTestEventListener('Gallery::Login', $listener); + $results = $this->handleRequest(); /* May get a redirect url (like from useralbum module) or return */ $this->assert(isset($results['return']) || isset($results['redirect']), 'result'); @@ -100,6 +107,10 @@ $this->assertEquals($this->_user->getId(), $gallery->getActiveUserId()); $this->assert($this->_mockSession->regenerateWasCalled(), '$session->regenerate() was not called'); + + /* Verify our event got posted */ + $this->assertEquals('Gallery::Login', $listener->_event->getEventName(), 'Login event'); + $this->assertEquals($this->_user, $listener->_event->getEntity(), 'Event entity'); } function testLoginDisabledUserName() { Modified: trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -210,6 +210,27 @@ } /** + * Regenerate the session if this request might the initial login (active auth vs passive auth). + * @param object GalleryUser $authenticatedUser user authenticated for this request + * @return object GalleryStatus a status code + */ + function regenerateSessionIfNecessary($authenticatedUser) { + global $gallery; + $session =& $gallery->getSession(); + + $oldUserId = $session->getUserId(); + if (isset($authenticatedUser) && $oldUserId != $authenticatedUser->getId()) { + /* This *may* be an initial authentication. We need to regenerate the session. */ + $ret = $session->regenerate(); + if ($ret) { + return $ret; + } + } + + return null; + } + + /** * Adds the given pair of username / password to the given URL as HTTP auth user:pass@hostname. * @param string $url An absolute URL * @param string $username Modified: trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthPlugin.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -49,8 +49,13 @@ * post a login event each time we do this, but we need to post FailedLogin events. */ if (isset($user) && $user->isCorrectPassword($password)) { + $ret = HttpAuthHelper::regenerateSessionIfNecessary($user); + if ($ret) { + return array($ret, null); + } + return array(null, $user); - } else if (!empty($username) && strncmp($username, '__LOGOUT__', strlen('__LOGOUT__'))) { + } else if (!empty($username) && strpos($username, '__LOGOUT__') !== 0) { /* * Don't post an event if the username starts with __logout__ since that is used when we * try to force the user-agent to clear its auth cache. Modified: trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/classes/ServerAuthPlugin.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -53,6 +53,13 @@ return array($ret, null); } + if (!empty($user)) { + $ret = HttpAuthHelper::regenerateSessionIfNecessary($user); + if ($ret) { + return array($ret, null); + } + } + return array(null, $user); } } Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthHelperTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -130,10 +130,15 @@ /* Clear response headers */ $this->_headers =& GalleryUtilities::_getResponseHeaders(); $this->_headers = array(); + + $this->_saveSession = $gallery->_session; } function tearDown() { + global $gallery; GalleryDataCache::reset(); + $gallery->_session = $this->_saveSession; + parent::tearDown(); if (!empty($this->_resetFactory)) { @@ -534,6 +539,54 @@ 'www-authenticate' => "WWW-Authenticate: Basic realm='TEST_AUTH_NAME'"), $this->_headers); } + + function testRegenerateSessionIfNecessary() { + global $gallery; + $gallery->_session = new HttpAuthHelperTestSession(); + + $ret = HttpAuthHelper::regenerateSessionIfNecessary($this->_user); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert($gallery->_session->regenerateWasCalled()); + } + + function testRegenerateSessionIfNecessarySameUserAsFromSession() { + global $gallery; + $gallery->_session = new HttpAuthHelperTestSession($this->_user->getId()); + + $ret = HttpAuthHelper::regenerateSessionIfNecessary($this->_user); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert(!$gallery->_session->regenerateWasCalled()); + } + + function testRegenerateSessionIfNecessaryOtherUserThanFromSession() { + global $gallery; + $gallery->_session = new HttpAuthHelperTestSession('OTHER_USER'); + + $ret = HttpAuthHelper::regenerateSessionIfNecessary($this->_user); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert($gallery->_session->regenerateWasCalled()); + } + + function testRegenerateSessionIfNecessaryNoAuthenticatedUser() { + global $gallery; + $gallery->_session = new HttpAuthHelperTestSession($this->_user->getId()); + + $ret = HttpAuthHelper::regenerateSessionIfNecessary(null); + if ($ret) { + return $this->failWithStatus($ret); + } + + $this->assert(!$gallery->_session->regenerateWasCalled()); + } } class HttpAuthHelperTestRewriteApi { @@ -613,9 +666,29 @@ return true; } } + class HttpAuthHelperTestPhpVm extends GalleryPhpVm { function header($header, $replace=null) { /* Avoid modifying actual header information */ } } + +class HttpAuthHelperTestSession { + function HttpAuthHelperTestSession($userId=null) { + $this->_userId = $userId; + $this->_regenerateWasCalled = false; + } + + function getUserId() { + return $this->_userId; + } + + function regenerate() { + $this->_regenerateWasCalled = true; + } + + function regenerateWasCalled() { + return $this->_regenerateWasCalled; + } +} ?> Modified: trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/test/phpunit/HttpAuthPluginTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -48,11 +48,17 @@ $this->_plugin = new HttpAuthPlugin(); + $this->_saveSession = $gallery->_session; + $gallery->_session = new HttpAuthPluginTestSession(); + $this->_listener = new NullEventListener(); $this->_registerTestEventListener('Gallery::FailedLogin', $this->_listener); } function tearDown() { + global $gallery; + $gallery->_session = $this->_saveSession; + $ret = GalleryCoreApi::removeAllMapEntries('FailedLoginsMap'); if ($ret) { $this->failWithStatus($ret); @@ -62,6 +68,9 @@ } function testValidUser() { + global $gallery; + $session =& $gallery->getSession(); + $_SERVER['PHP_AUTH_USER'] = $this->_user->getUserName(); $_SERVER['PHP_AUTH_PW'] = 'password'; @@ -72,6 +81,7 @@ $this->assertEquals($this->_user, $user); $this->assert(!isset($this->_listener->_event), 'There was a FailedLogin event!'); + $this->assert($session->regenerateWasCalled(), 'Session has not been regenerated!'); } function testInvalidUser() { @@ -125,4 +135,25 @@ $this->assert(!isset($this->_listener->_event), 'There was a FailedLogin event!'); } } + +/** + * Mock Session + */ +class HttpAuthPluginTestSession { + function HttpAuthPluginTestSession() { + $this->_regenerateWasCalled = false; + } + + function getUserId() { + return null; + } + + function regenerate() { + $this->_regenerateWasCalled = true; + } + + function regenerateWasCalled() { + return $this->_regenerateWasCalled; + } +} ?> Modified: trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class =================================================================== --- trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/httpauth/test/phpunit/ServerAuthPluginTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -47,9 +47,15 @@ $_SERVER['AUTH_TYPE'] = 'Test'; $this->_plugin = new ServerAuthPlugin(); + + $this->_saveSession = $gallery->_session; + $gallery->_session = new HttpAuthPluginTestSession(); } function tearDown() { + global $gallery; + $gallery->_session = $this->_saveSession; + $ret = GalleryCoreApi::removeAllMapEntries('FailedLoginsMap'); if ($ret) { $this->failWithStatus($ret); @@ -59,6 +65,9 @@ } function testValidUser() { + global $gallery; + $session =& $gallery->getSession(); + $_SERVER['REMOTE_USER'] = $this->_user->getUserName(); list ($ret, $user) = $this->_plugin->getUser(); @@ -67,6 +76,7 @@ } $this->assertEquals($this->_user, $user); + $this->assert($session->regenerateWasCalled(), 'Session has not been regenerated!'); } function testInvalidUser() { @@ -80,4 +90,25 @@ $this->assertEquals(null, $user); } } + +/** + * Mock Session + */ +class ServerAuthPluginTestSession { + function ServerAuthPluginTestSession() { + $this->_regenerateWasCalled = false; + } + + function getUserId() { + return null; + } + + function regenerate() { + $this->_regenerateWasCalled = true; + } + + function regenerateWasCalled() { + return $this->_regenerateWasCalled; + } +} ?> Modified: trunk/gallery2/modules/nokiaupload/classes/ImageUploadHelper.class =================================================================== --- trunk/gallery2/modules/nokiaupload/classes/ImageUploadHelper.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/nokiaupload/classes/ImageUploadHelper.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -98,6 +98,9 @@ /* ignore errors, we're erroring out anyway */ return $status; } else { + $gallery->debug('Username and password correct.'); + $gallery->setActiveUser($user); + $event = GalleryCoreApi::newEvent('Gallery::Login'); $event->setEntity($user); list ($ret, $ignored) = GalleryCoreApi::postEvent($event); @@ -107,9 +110,6 @@ } } - $gallery->debug('Username and password correct.'); - $gallery->setActiveUser($user); - /* Add user to the mobile users' group if s/he isn't yet a member of it */ list ($ret, $groupId) = GalleryCoreApi::getPluginParameter('module', 'nokiaupload', 'id.mobileGroup'); @@ -420,7 +420,8 @@ list ($ret, $albumIds) = GalleryCoreApi::fetchAllItemIds('GalleryAlbumItem', 'core.addDataItem'); if ($ret || count($albumIds) < 1) { - $gallery->debug("ERROR: No albums with addDataItem permission.\n" . $ret->getAsText()); + $gallery->debug("ERROR: No albums with addDataItem permission.\n" + . ($ret ? $ret->getAsText() : '')); return $status; } Modified: trunk/gallery2/modules/nokiaupload/test/phpunit/ImageUploadHelperTest.class =================================================================== --- trunk/gallery2/modules/nokiaupload/test/phpunit/ImageUploadHelperTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/nokiaupload/test/phpunit/ImageUploadHelperTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -55,7 +55,8 @@ $status = ImageUploadHelper::doLogin(); - $this->assertEquals($this->_user, $listener->_event->getEntity()); + $this->assertEquals('Gallery::Login', $listener->_event->getEventName(), 'Login event'); + $this->assertEquals($this->_user, $listener->_event->getEntity(), 'Event entity'); $suffix = "&\r\n"; $this->assertEquals( array('success' => '0', Modified: trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadDirectoryListingControllerTest.class =================================================================== --- trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadDirectoryListingControllerTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadDirectoryListingControllerTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -64,12 +64,12 @@ print $ret->getAsHtml(); return $this->failWithStatus($ret); } - $this->_markForCleanup($this->_user); - - $this->_password = 'password'; - if (!$this->_user->isCorrectPassword($this->_password)) { - return $this->assert(false, "test user wasn't created with expected password"); + + $ret = GalleryCoreApi::addUserToGroup($this->_user->getId(), $this->_group->getId()); + if ($ret) { + print $ret->getAsHtml(); + return $this->failWithStatus($ret); } $ret = $this->_markPluginParametersForCleanup('module', 'albumselect'); @@ -103,15 +103,8 @@ global $gallery; // Login our test user - GalleryUtilities::putRequestVariable('Username', $this->_user->getUserName(), false); - GalleryUtilities::putRequestVariable('Password', $this->_password, false); - $results = ImageUploadHelper::doLogin(); - if ($results['success'] != NOKIAUPLOAD_ERR_NOERR || - $gallery->getActiveUser() != $this->_user) { - return $this->assert(false, 'unable to login test user'); - } - GalleryUtilities::removeRequestVariable('Username', false); - GalleryUtilities::removeRequestVariable('Password', false); + $gallery->setActiveUser($this->_user); + $session =& $gallery->getSession(); $session->remove('permissionCache'); $ret = GalleryCoreApi::assertHasItemPermission($this->_getRootId(), 'core.addAlbumItem'); Modified: trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadNewDirectoryControllerTest.class =================================================================== --- trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadNewDirectoryControllerTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadNewDirectoryControllerTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -63,12 +63,12 @@ print $ret->getAsHtml(); return $this->failWithStatus($ret); } - $this->_markForCleanup($this->_user); - $this->_password = 'password'; - if (!$this->_user->isCorrectPassword($this->_password)) { - return $this->assert(false, "test user wasn't created with expected password"); + $ret = GalleryCoreApi::addUserToGroup($this->_user->getId(), $this->_group->getId()); + if ($ret) { + print $ret->getAsHtml(); + return $this->failWithStatus($ret); } $ret = $this->_markPluginParametersForCleanup('module', 'nokiaupload'); @@ -96,15 +96,8 @@ global $gallery; // Login our test user - GalleryUtilities::putRequestVariable('Username', $this->_user->getUserName(), false); - GalleryUtilities::putRequestVariable('Password', $this->_password, false); - $results = ImageUploadHelper::doLogin(); - if ($results['success'] != NOKIAUPLOAD_ERR_NOERR || - $gallery->getActiveUser() != $this->_user) { - return $this->assert(false, 'unable to login test user'); - } - GalleryUtilities::removeRequestVariable('Username', false); - GalleryUtilities::removeRequestVariable('Password', false); + $gallery->setActiveUser($this->_user); + $session =& $gallery->getSession(); $session->remove('permissionCache'); $ret = GalleryCoreApi::assertHasItemPermission($this->_getRootId(), 'core.addAlbumItem'); Modified: trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadUploadControllerTest.class =================================================================== --- trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadUploadControllerTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/nokiaupload/test/phpunit/NokiaUploadUploadControllerTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -68,12 +68,12 @@ print $ret->getAsHtml(); return $this->failWithStatus($ret); } - $this->_markForCleanup($this->_user); - $this->_password = 'password'; - if (!$this->_user->isCorrectPassword($this->_password)) { - return $this->assert(false, "test user wasn't created with expected password"); + $ret = GalleryCoreApi::addUserToGroup($this->_user->getId(), $this->_group->getId()); + if ($ret) { + print $ret->getAsHtml(); + return $this->failWithStatus($ret); } $ret = $this->_markPluginParametersForCleanup('module', 'nokiaupload'); @@ -101,15 +101,8 @@ global $gallery; /* Login our test user */ - GalleryUtilities::putRequestVariable('Username', $this->_user->getUserName(), false); - GalleryUtilities::putRequestVariable('Password', $this->_password, false); - $results = ImageUploadHelper::doLogin(); - if ($results['success'] != NOKIAUPLOAD_ERR_NOERR || - $gallery->getActiveUser() != $this->_user) { - return $this->assert(false, 'unable to login test user'); - } - GalleryUtilities::removeRequestVariable('Username', false); - GalleryUtilities::removeRequestVariable('Password', false); + $gallery->setActiveUser($this->_user); + $session =& $gallery->getSession(); $session->remove('permissionCache'); $ret = GalleryCoreApi::assertHasItemPermission($this->_getRootId(), 'core.addAlbumItem'); Modified: trunk/gallery2/modules/publishxp/PublishXpLogin.inc =================================================================== --- trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/publishxp/PublishXpLogin.inc 2007-01-31 20:43:26 UTC (rev 15759) @@ -70,9 +70,6 @@ return array($ret, null); } - $session =& $gallery->getSession(); - $session->regenerate(); - $results['redirect']['view'] = 'publishxp.SelectAlbum'; } } Modified: trunk/gallery2/modules/publishxp/test/phpunit/PublishXpLoginControllerTest.class =================================================================== --- trunk/gallery2/modules/publishxp/test/phpunit/PublishXpLoginControllerTest.class 2007-01-31 14:42:42 UTC (rev 15758) +++ trunk/gallery2/modules/publishxp/test/phpunit/PublishXpLoginControllerTest.class 2007-01-31 20:43:26 UTC (rev 15759) @@ -40,16 +40,8 @@ return $this->failWithStatus($ret); } $this->_markForCleanup($this->_user); - $this->_saveSession = $gallery->_session; - $gallery->_session = new GallerySession(); } - function tearDown() { - global $gallery; - $gallery->_session = $this->_saveSession; - parent::tearDown(); - } - function testLogin() { GalleryUtilities::putRequestVariable('form[userName]', $this->_user->getUserName()); GalleryUtilities::putRequestVariable('form[password]', 'password'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2007-02-01 20:17:48
|
Revision: 15763 http://svn.sourceforge.net/gallery/?rev=15763&view=rev Author: mindless Date: 2007-02-01 12:17:48 -0800 (Thu, 01 Feb 2007) Log Message: ----------- fix usage of empty() with objects to work on php4.. use isset instead Modified Paths: -------------- trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/webdav/classes/WebDavHelper.class trunk/gallery2/modules/webdav/module.inc trunk/gallery2/modules/webdav/templates/WebDavMount.tpl Modified: trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class =================================================================== --- trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-02-01 19:59:45 UTC (rev 15762) +++ trunk/gallery2/modules/httpauth/classes/HttpAuthHelper.class 2007-02-01 20:17:48 UTC (rev 15763) @@ -66,7 +66,7 @@ if ($ret) { return array($ret, null); } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED), null); } Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2007-02-01 19:59:45 UTC (rev 15762) +++ trunk/gallery2/modules/httpauth/module.inc 2007-02-01 20:17:48 UTC (rev 15763) @@ -246,7 +246,7 @@ } return $rules; } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return $rules; } @@ -361,7 +361,7 @@ if ($ret) { return $ret; } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED); } Modified: trunk/gallery2/modules/webdav/classes/WebDavHelper.class =================================================================== --- trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2007-02-01 19:59:45 UTC (rev 15762) +++ trunk/gallery2/modules/webdav/classes/WebDavHelper.class 2007-02-01 20:17:48 UTC (rev 15763) @@ -75,7 +75,7 @@ if ($ret) { return array($ret, null); } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return array(GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED), null); } @@ -154,7 +154,7 @@ if ($ret) { return array($ret, null); } - if (!empty($httpAuthInterface)) { + if (isset($httpAuthInterface)) { list ($ret, $httpAuthPluginEnabled, $serverAuthPluginEnabled) = $httpAuthInterface->getConfiguration(); if ($ret) { @@ -643,7 +643,7 @@ $files[] = $file; if ($depth <= 0) { - return; + return null; } list ($ret, $childIds) = GalleryCoreApi::fetchChildItemIds($item); @@ -652,7 +652,7 @@ } if (empty($childIds)) { - return; + return null; } list ($ret, $childItems) = GalleryCoreApi::loadEntitiesById($childIds); @@ -672,6 +672,8 @@ return $ret; } } + + return null; } /** @@ -786,6 +788,8 @@ if ($ret) { return $ret; } + + return null; } /** Modified: trunk/gallery2/modules/webdav/module.inc =================================================================== --- trunk/gallery2/modules/webdav/module.inc 2007-02-01 19:59:45 UTC (rev 15762) +++ trunk/gallery2/modules/webdav/module.inc 2007-02-01 20:17:48 UTC (rev 15763) @@ -251,7 +251,7 @@ } return $rules; } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return $rules; } @@ -325,7 +325,7 @@ if ($ret) { return array($ret, null); } - if (!empty($httpAuthInterface)) { + if (isset($httpAuthInterface)) { $ret = $httpAuthInterface->requestAuthentication(); if ($ret) { return array($ret, null); @@ -349,7 +349,7 @@ if ($ret) { return $ret; } - if (empty($rewriteApi)) { + if (!isset($rewriteApi)) { return GalleryCoreApi::error(ERROR_CONFIGURATION_REQUIRED); } Modified: trunk/gallery2/modules/webdav/templates/WebDavMount.tpl =================================================================== --- trunk/gallery2/modules/webdav/templates/WebDavMount.tpl 2007-02-01 19:59:45 UTC (rev 15762) +++ trunk/gallery2/modules/webdav/templates/WebDavMount.tpl 2007-02-01 20:17:48 UTC (rev 15763) @@ -38,4 +38,4 @@ {if $isView} </div> {/if} -{/if} \ No newline at end of file +{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2007-02-07 06:49:39
|
Revision: 15781 http://svn.sourceforge.net/gallery/?rev=15781&view=rev Author: mindless Date: 2007-02-06 22:49:40 -0800 (Tue, 06 Feb 2007) Log Message: ----------- Language update: zh_TW -> 100% Modified Paths: -------------- trunk/gallery2/modules/core/locale/zh_TW/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/zh_TW.po trunk/gallery2/modules/httpauth/locale/zh_TW/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/zh_TW.po trunk/gallery2/modules/webdav/locale/zh_TW/LC_MESSAGES/modules_webdav.mo trunk/gallery2/modules/webdav/po/zh_TW.po Modified: trunk/gallery2/modules/core/locale/zh_TW/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/zh_TW.po =================================================================== --- trunk/gallery2/modules/core/po/zh_TW.po 2007-02-07 04:19:45 UTC (rev 15780) +++ trunk/gallery2/modules/core/po/zh_TW.po 2007-02-07 06:49:40 UTC (rev 15781) @@ -106,9 +106,9 @@ msgid "Updating Packages" msgstr "正在更新軟體包" -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "準備中..." +msgstr "準備%s中..." #, c-format msgid "Downloading %s" @@ -121,9 +121,8 @@ msgid "Deleting Language Packs" msgstr "正在刪除語文包" -#, fuzzy msgid "Update completed with errors." -msgstr "更新完畢。" +msgstr "更新完畢但有錯誤。" msgid "Update complete." msgstr "更新完畢。" @@ -1825,13 +1824,13 @@ msgid "" "Your local copy of the repository was broken and has been fixed. Please download the plugin " "list again." -msgstr "" +msgstr "你在本機的軟體庫拷貝損壞了但已經修復。請再下載一次外掛組件清單。" #, c-format msgid "" "Failed to download the %s plugin because the following files/directories could not be " "modified:" -msgstr "" +msgstr "下載%s外掛組件失敗了。因為無法修改下列的檔案或目錄:" msgid "The repository index has been successfully updated." msgstr "成功更新軟體庫索引。" Modified: trunk/gallery2/modules/httpauth/locale/zh_TW/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/zh_TW.po =================================================================== --- trunk/gallery2/modules/httpauth/po/zh_TW.po 2007-02-07 04:19:45 UTC (rev 15780) +++ trunk/gallery2/modules/httpauth/po/zh_TW.po 2007-02-07 06:49:40 UTC (rev 15781) @@ -152,10 +152,10 @@ msgstr "使用網頁伺服器認証:" msgid "By default HTTP authentication is only enabled for specific modules." -msgstr "" +msgstr "在預設狀況下,HTTP 認証只有在某些特定的模組中啟用。" msgid "Use the authentication plugins for all modules:" -msgstr "" +msgstr "在所有的模組中啟用HTTP 認証:" #, c-format msgid "" Modified: trunk/gallery2/modules/webdav/locale/zh_TW/LC_MESSAGES/modules_webdav.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/webdav/po/zh_TW.po =================================================================== --- trunk/gallery2/modules/webdav/po/zh_TW.po 2007-02-07 04:19:45 UTC (rev 15780) +++ trunk/gallery2/modules/webdav/po/zh_TW.po 2007-02-07 06:49:40 UTC (rev 15781) @@ -66,20 +66,19 @@ msgid "Redirect OPTIONS requests so we can set DAV headers." msgstr "重導 OPTIONS 要求以設定 DAV 檔頭。" -#, fuzzy msgid "WebDAV Mount Instructions" -msgstr "WebDAV 設定" +msgstr "WebDAV 搭載方式說明" -#, fuzzy, c-format +#, c-format msgid "" "%sClick here%s to mount Gallery on your desktop with a WebDAV client. Documentation on " "mounting Gallery with WebDAV is in the %sGallery Codex%s." msgstr "" -"你可以使用 WebDAV 用戶端程式在你的桌面上搭載 Gallery。使用 WebDAV 搭載 Gallery 的說明文件在 %" -"sGallery Codex%s。" +"%s按這裡%s就可以用 WebDAV 用戶端程式在你的桌面上搭載 Gallery。使用 WebDAV 搭載 Gallery 的說明" +"文件在 %sGallery Codex%s。" msgid "Alternatively, you can enter the following URL in your WebDAV client:" -msgstr "" +msgstr "或者,你可以在你的 WebDAV 用戶端程式中輸入下列網址:" msgid "WebDAV Settings" msgstr "WebDAV 設定" @@ -106,19 +105,19 @@ "You can't connect with WebDAV because PHP has no XML support on this server. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"你無法使用 WebDAV 連接的原因是這個伺服器上的 PHP 不支援 XML。排除問題的說明在 %sGallery Codex" -"%s。" +"你無法使用 WebDAV 連接,因為這個伺服器上的 PHP 不支援 XML。排除問題的說明在 %sGallery Codex%" +"s。" msgid "WebDAV requests not handled" -msgstr "" +msgstr "不能處理 WebDAV 要求" -#, fuzzy, c-format +#, c-format msgid "" "You can't connect with WebDAV because this server doesn't pass WebDAV requests to Gallery. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"你無法使用 WebDAV 連接的原因是這個伺服器上的 PHP 不支援 XML。排除問題的說明在 %sGallery Codex" -"%s。" +"你無法使用 WebDAV 連接,因為這個伺服器不會將 WebDAV 要求傳給 Gallery。排除問題的說明在 %" +"sGallery Codex%s。" msgid "HTTP auth module disabled" msgstr "未啟用 HTTP 認証模組" @@ -134,11 +133,9 @@ "動作。你需要在%s網站管理的外掛組件設定%s中啟用 HTTP 認証模組。排除問題的說明在 %sGallery " "Codex%s。" -#, fuzzy msgid "HTTP auth plugin disabled" -msgstr "未啟用 HTTP 認証模組" +msgstr "未啟用 HTTP 認証外掛組件" -#, fuzzy msgid "" "You can connect with WebDAV anonymously, but you can't do anything which requires you to " "login because neither HTTP authentication nor server authentication are enabled in the HTTP " @@ -146,8 +143,7 @@ "module." msgstr "" "你可以用匿名方式使用 WebDAV 連接,可是因為 HTTP 認証是關閉的,你無法作任何需要登入才能執行的" -"動作。你需要在%s網站管理的外掛組件設定%s中啟用 HTTP 認証模組。排除問題的說明在 %sGallery " -"Codex%s。" +"動作。你需要在 HTTP 認証模組的設定中啟用 HTTP 認証。" msgid "'Connect to WebDAV' rule disabled" msgstr "未啟用連接到 WebDAV 的規則" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ja...@us...> - 2007-02-08 22:27:59
|
Revision: 15792 http://svn.sourceforge.net/gallery/?rev=15792&view=rev Author: jablko Date: 2007-02-08 14:27:56 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Add 'urlEncode' option to URL generator to support safely adding parameters which are already URL encoded. This is useful in WebDAV, to avoid double URL encoding, and in URL rewrite, to avoid URL encoding '$' and '%' special characters. The 'urlEncode' option defaults to true (current behavior). If false, it's passed to appendParamsToUrl. Add unit test for generate URL with 'urlEncode = false. Modified Paths: -------------- trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class trunk/gallery2/modules/rewrite/test/phpunit/ModRewriteUrlGeneratorTest.class trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTest.class trunk/gallery2/modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class Modified: trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class =================================================================== --- trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class 2007-02-08 16:36:08 UTC (rev 15791) +++ trunk/gallery2/modules/core/classes/GalleryUrlGenerator.class 2007-02-08 22:27:56 UTC (rev 15792) @@ -542,24 +542,24 @@ } /** - * Return a valid Gallery URL. - * - * @param array $params (optional) key/value pairs to be included in the URL - * special 'href' key specifies path to append to Gallery base URL instead of a query param - * %CURRENT_URL% token in a parameter value will be replaced with current URL + * Generate a Gallery URL. + * @param array $params (optional) key=value pairs to be included in the URL + * special 'href' key specifies path to append to Gallery base URL instead of a query param + * %CURRENT_URL% token in a parameter value will be replaced with current URL * @param array $options (optional) additional URL generation options: - * 'baseUrl' => string; to override the default baseUrl - * 'forceDirect' => true; to generate from Gallery site URL even if embedded/multisite - * 'forceFullUrl' => true; to generate absolute URL instead of relative path URL - * 'forceSessionId' => boolean; to force session id to be in/not in the URL; by default - * it is included when cookies are not in use (for href URLs, default=not included) - * 'htmlEntities' => false; to use & parameter separator instead of & - * 'forceServerRelativeUrl' => true; to generate server-relative URLs if possible but no - * relative URLs (e.g. /gallery2/main.php instead of - * http://example.com/gallery2/main.php but never just main.php (without path)) - * 'useAuthToken' => boolean; to force auth token to be in/not in the URL; by default it is - * included in controller URLs - * 'protocol' => string; to override the URL scheme + * 'baseUrl' => string; to override the default baseUrl + * 'forceDirect' => true; to generate from Gallery site URL even if embedded or multisite + * 'forceFullUrl' => true; to generate absolute URL instead of relative path URL + * 'forceSessionId' => boolean; to force session id to be included or excluded; by default + * it is included when cookies are not in use (by default it is excluded from href URLs) + * 'htmlEntities' => false; to use '&' parameter separator instead of '&' + * 'urlEncode' => false; to not URL encode parameter names and values + * 'forceServerRelativeUrl' => true; to generate server-relative URLs if possible but no + * relative URLs (e.g. /gallery2/main.php instead of + * http://example.com/gallery2/main.php but never just main.php (without path)) + * 'useAuthToken' => boolean; to force auth token to be included or excluded; by default it + * is included in controller URLs + * 'protocol' => string; to override the URL scheme * @return string URL */ function generateUrl($params=array(), $options=array()) { @@ -568,11 +568,10 @@ /* * For 'core.DownloadItem' URLs or if 'forceDirect' option given, use Gallery site URL - * (direct to main.php in directory for active config.php, even if embedded/multisite) - * For other non-absolute 'href' URLs use Gallery base URL - * (direct to Gallery codebase location, even if multisite or embedded), - * Otherwise use application URL - * (embed URL; same as Gallery site URL if not embedded) + * (direct to main.php in directory for active config.php, even if embedded/multisite). For + * other non-absolute 'href' URLs use Gallery base URL (direct to Gallery codebase location, + * even if multisite or embedded). Otherwise use application URL (embed URL; same as + * Gallery site URL if not embedded). */ if (isset($options['baseUrl'])) { $url = $options['baseUrl']; @@ -584,14 +583,14 @@ $url = $this->getCurrentUrlDir(true); } + /* Default to not including session id in href URLs */ if (!isset($options['forceSessionId'])) { - /* Default to not including session id in href URLs */ $options['forceSessionId'] = false; } $href = $params['href']; unset($params['href']); - if (preg_match('{^[a-z]+://}', $href)) { + if (preg_match('/^[a-zA-Z0-9\+\.\-]+:\/\//', $href)) { /* Absolute URL */ $url = $href; } else if (($pos = strpos($href, '/')) === 0) { @@ -608,10 +607,11 @@ } else { $url .= $href; } - } else if ((isset($params['view']) && $params['view'] == 'core.DownloadItem') || - !empty($options['forceDirect'])) { + } else if ((isset($params['view']) && $params['view'] == 'core.DownloadItem') + || !empty($options['forceDirect'])) { /* DownloadItem requests go always directly to Gallery, even when embedded */ $url = $this->getCurrentUrlDir(true) . $this->_file[true]; + /* Check if we are forced to append the session id in embedded Gallery */ if ($this->embedForceSessionId($params)) { $options['forceSessionId'] = true; @@ -621,18 +621,6 @@ $appSession = true; } - /* Decide whether to include session id in the URL */ - if ((isset($options['forceSessionId']) && - $options['forceSessionId'] === true && $session =& $gallery->getSession()) || - (!isset($options['forceSessionId']) && - $session =& $gallery->getSession() && !$session->isUsingCookies()) ) { - if (!empty($this->_embedSessionString) && isset($appSession)) { - $embedSessionString = $this->_embedSessionString; - } else { - $params[$session->getKey()] = $session->getId(); - } - } - /* Swap in the actual URL for the 'return' placeholder */ if (isset($params['return'])) { list ($ret, $view) = GalleryView::loadView($currentView); @@ -650,11 +638,13 @@ /* Navigation */ $targetView = isset($params['view']) ? $params['view'] : ''; - if (!empty($this->_navId) && empty($options['forceDirect']) && - (empty($currentView) || $currentView == $targetView || !empty($params['controller']))) { + if (!empty($this->_navId) && empty($options['forceDirect']) + && (empty($currentView) + || $currentView == $targetView + || !empty($params['controller']))) { /* * We are moving around in the same view or we are redirecting to a controller, - * who knows where it will redirect to. Let's keep the navigation + * who knows where it will redirect to. Let's keep the navigation. */ $params['navId'] = $this->_navId; } @@ -681,17 +671,15 @@ } } - /* - * Remove session related params if requested (we're already outputting or output without - * fetching the html (immediate view / progressbar) - */ if ($session =& $gallery->getSession()) { $sessionId = $session->getId(); - if (empty($sessionId)) { - unset($params[$session->getKey()]); + + /* + * Remove session related parameters if requested (we're already outputting or output + * without fetching the HTML (immediate view / progressbar) + */ + if (empty($sessionId) || !$session->isPersistent()) { unset($params['navId']); - } else if (!$session->isPersistent()) { - unset($params['navId']); } else { /* Add authToken to all controller URLs */ if (!empty($options['useAuthToken']) @@ -699,14 +687,30 @@ $params['authToken'] = $session->getAuthToken(); } } + + /* Add session parameters to URL */ + if (!empty($options['forceSessionId']) + || (!isset($options['forceSessionId']) && !$session->isUsingCookies())) { + if (!empty($this->_embedSessionString) && !empty($appSession)) { + list ($sessionKey, $sessionId) = explode( + '=', $this->_embedSessionString, 2); + $embedSessionParams = array(); + $embedSessionParams[$sessionKey] = $sessionId; + } else if (!empty($sessionId)) { + $params[$session->getKey()] = $sessionId; + } + } } /* Add parameters to URL */ - $url = GalleryUrlGenerator::appendParamsToUrl($url, $params); + $url = GalleryUrlGenerator::appendParamsToUrl($url, $params, true, + !empty($options['htmlEntities']) || !isset($options['htmlEntities']), + !empty($options['urlEncode']) || !isset($options['urlEncode'])); - /* Add embed session id if needed */ - if (isset($embedSessionString)) { - $url .= ((strpos($url, '?') === false) ? '?' : '&') . $embedSessionString; + /* Add embed session parameters to URL */ + if (!empty($embedSessionParams)) { + $url = GalleryUrlGenerator::appendParamsToUrl($url, $embedSessionParams, false, + !empty($options['htmlEntities']) || !isset($options['htmlEntities']), false); } /* Replace protocol with $options['protocol']. See RFC1738 section 2.1. */ @@ -725,10 +729,6 @@ $url = $this->makeRelativeUrl($url, !empty($options['forceServerRelativeUrl'])); } - if (isset($options['htmlEntities']) && !$options['htmlEntities']) { - $url = str_replace('&', '&', $url); - } - return $url; } Modified: trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class 2007-02-08 16:36:08 UTC (rev 15791) +++ trunk/gallery2/modules/core/test/phpunit/UrlGeneratorTest.class 2007-02-08 22:27:56 UTC (rev 15792) @@ -19,7 +19,7 @@ */ /** - * Test UrlGenerator functionality + * URL generator tests. * @package GalleryCore * @subpackage PHPUnit * @author Bharat Mediratta <bh...@me...> @@ -397,7 +397,7 @@ 'relative embedded, no trailing slash'); } - function testGenerateUrlNoEntities() { + function testGenerateUrlNoHtmlEntities() { $values[] = GalleryUtilities::prefixFormVariable('a') . '=' . urlencode('123'); $values[] = GalleryUtilities::prefixFormVariable('b') . '=' . urlencode('ab&c'); @@ -413,6 +413,24 @@ array('htmlEntities' => false)), 'href'); } + function testGenerateUrlNoUrlEncode() { + $values[] = GalleryUtilities::prefixFormVariable('a') . '=' . 'The Quick!Brown#Fox'; + $values[] = GalleryUtilities::prefixFormVariable('b') . '=' . 'Jumps Over%The/Lazy_Dog'; + + $this->assertEquals( + 'phpunit_test.php?' . implode('&', $values), + $this->_urlGenerator->generateUrl(array('a' => 'The Quick!Brown#Fox', + 'b' => 'Jumps Over%The/Lazy_Dog'), + array('urlEncode' => false)), 'url'); + + $this->assertEquals( + 'test/blah.php?' . implode('&', $values), + $this->_urlGenerator->generateUrl(array('href' => 'test/blah.php', + 'a' => 'The Quick!Brown#Fox', + 'b' => 'Jumps Over%The/Lazy_Dog'), + array('urlEncode' => false)), 'href'); + } + function testGenerateReturnUrl() { $_SERVER['REQUEST_URI'] = '/gallery2/phpunit_test.php?' . GalleryUtilities::prefixFormVariable('view') . '=foo&' . Modified: trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2007-02-08 16:36:08 UTC (rev 15791) +++ trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2007-02-08 22:27:56 UTC (rev 15792) @@ -21,7 +21,7 @@ GalleryCoreApi::requireOnce('modules/core/classes/GalleryUrlGenerator.class'); /** - * Generic rewrite URL generator class + * Generic rewrite URL generator. * @package Rewrite * @subpackage Classes * @author Douglas Cau <do...@ca...> @@ -31,7 +31,6 @@ /** * If there's an error, use parent GalleryUrlGenerator functions. - * * @var bool has an error occured? * @access private */ @@ -39,15 +38,13 @@ /** * Short URL map. - * * @var array of view => short URL pattern * @access private */ var $_shortUrls = array(); /** - * Return first short URL to match URL params - * + * Return first short URL to match URL params. * @param array $params URL params * @return array first short URL to match URL params */ @@ -86,8 +83,7 @@ /** * This function is called at the end of URL generator initialization. If an onLoad function is * specified for the current view it loads the needed file and calls the function which should - * parse any request params that wasn't parsed by the rewrite parser (eg. %path% to itemId). - * + * parse any request params that wasn't parsed by the rewrite parser (e.g. %path% to itemId). * @return object GalleryStatus a status code * @private */ @@ -95,8 +91,8 @@ $shortUrl = $this->_getShortUrl(GalleryUtilities::getAllRequestVariables()); if (!empty($shortUrl['onLoad'])) { - GalleryCoreApi::requireOnce('modules/' . $shortUrl['onLoad'][0] . '/classes/' - . $shortUrl['onLoad'][1] . '.class'); + GalleryCoreApi::requireOnce('modules/' . $shortUrl['onLoad'][0] + . '/classes/' . $shortUrl['onLoad'][1] . '.class'); $ret = call_user_func(array($shortUrl['onLoad'][1], $shortUrl['onLoad'][2])); if ($ret) { return $ret; @@ -132,20 +128,21 @@ } $trueParams = $params; + /* Parse and replace all keywords */ $url = $shortUrl['pattern']; $functions = array(); if (isset($shortUrl['functions'])) { $functions = $shortUrl['functions']; } - if (!$this->_parseShortUrl($url, $params, $functions)) { + if (!$this->_parseShortUrl($url, $params, $options, $functions)) { return parent::generateUrl($trueParams, $options); } $forceDirect = !empty($options['forceDirect']) || (isset($trueParams['view']) && $trueParams['view'] == 'core.DownloadItem'); - $options['baseUrl'] = - $this->_getBaseUrl($forceDirect) . $url . $this->_getBaseParamString($forceDirect); + $options['baseUrl'] = $this->_getBaseUrl($forceDirect) + . ltrim($url, '/') . $this->_getBaseParamString($forceDirect); foreach ($shortUrl['match'] as $key => $value) { unset($params[$key]); @@ -155,15 +152,15 @@ } /** - * Substitute all keywords with values from URL params or custom functions - * + * Substitute all keywords with values from URL params or custom functions. * @param string $url URL to be parsed * @param array $params of URL parameters + * @param array $options of generation options * @param array $functions of custom functions * @return boolean true on success * @access private */ - function _parseShortUrl(&$url, &$params, $functions) { + function _parseShortUrl(&$url, &$params, $options, $functions) { $entity = null; preg_match_all('/%([a-zA-Z]+)%/', $url, $regs); @@ -179,8 +176,13 @@ return $ret; } } else if (!empty($params[$arg])) { - $url = str_replace('%' . $arg . '%', urlencode($params[$arg]), $url); + $value = $params[$arg]; + if (!empty($options['urlEncode']) || !isset($options['urlEncode'])) { + $value = urlencode($value); + } + $url = str_replace('%' . $arg . '%', $value, $url); + /* We can't unset the itemId until we have replaced all keywords */ if ($arg != 'itemId') { unset($params[$arg]); @@ -195,10 +197,12 @@ if (isset($unsetItemId)) { unset($params['itemId']); } + return true; } /** + * Load entity. * @param int $itemId itemId of the entity to load * @return object GalleryEntity or null on failure */ @@ -215,12 +219,12 @@ if ($ret) { return null; } + return $entity; } /** - * Return the base URL for all generated short URLs - * + * Return the base URL for all generated short URLs. * @param boolean $forceDirect (optional) if true, return Gallery base URL * (different when embedded) * @return string the base URL @@ -231,8 +235,7 @@ } /** - * Return the base URL parameters for all generated short URLs, eg. '?module=gallery' - * + * Return the base URL parameters for all generated short URLs, e.g. '?module=gallery'. * @param boolean $forceDirect (optional) if true, return Gallery base URL * (different when embedded) * @return string the base URL parameters Modified: trunk/gallery2/modules/rewrite/test/phpunit/ModRewriteUrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/ModRewriteUrlGeneratorTest.class 2007-02-08 16:36:08 UTC (rev 15791) +++ trunk/gallery2/modules/rewrite/test/phpunit/ModRewriteUrlGeneratorTest.class 2007-02-08 22:27:56 UTC (rev 15792) @@ -24,8 +24,7 @@ GalleryCoreApi::requireOnce('modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class'); /** - * Mod rewrite URL generator tests - * + * Apache mod_rewrite URL generator tests. * @package Rewrite * @subpackage PHPUnit * @author Douglas Cau <do...@ca...> @@ -43,8 +42,7 @@ /* Set up our environment */ foreach (array('modrewrite.galleryLocation' => '/gallery2/', - 'modrewrite.embeddedLocation' => '/cms/') - as $key => $value) { + 'modrewrite.embeddedLocation' => '/cms/') as $key => $value) { $ret = GalleryCoreApi::setPluginParameter('module', 'rewrite', $key, $value); if ($ret) { print $ret->getAsHtml(); @@ -66,14 +64,15 @@ function testGenerateUrlOverrideBaseUri() { /* Override the expected URLs, not server-relative, but with relative ones */ - $this->_expectedUrl[0] = 'index.php?page=photos&g2_view=rand164.NonShort&' . - 'g2_foo=bar'; + $this->_expectedUrl[0] = 'index.php?page=photos&g2_view=rand164.NonShort' + . '&g2_foo=bar'; $this->_expectedUrl[1] = sprintf('d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('index.php?page=photos' . - '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('index.php?page=photos' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = 'themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = 'index.php?page=photos'; $this->_expectedUrl[6] = 'v' . $this->_testAlbumPath; @@ -85,8 +84,9 @@ $this->_expectedUrl[11] = ltrim($this->_testItemPath, '/') . '/test.html'; $this->_expectedUrl[12] = 't' . rtrim($this->_testAlbumPath, '/') . '.test'; $this->_expectedUrl[13] = 't' . $this->_testItemPath . '.test'; - $this->_expectedUrl[14] = 'phpunit1/'; + $this->_expectedUrl[14] = 'phpunit/'; $this->_expectedUrl[15] = $this->_signUrl('phpunit2/'); + $this->_expectedUrl[16] = 'phpunit/' . urlencode($this->_urlEncodePath); parent::testGenerateUrlOverrideBaseUri(); } Modified: trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2007-02-08 16:36:08 UTC (rev 15791) +++ trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2007-02-08 22:27:56 UTC (rev 15792) @@ -22,8 +22,7 @@ GalleryCoreApi::requireOnce('modules/rewrite/test/phpunit/RewriteUrlGeneratorTestCase.class'); /** - * Path info URL generator tests - * + * Path info URL generator tests. * @package Rewrite * @subpackage PHPUnit * @author Douglas Cau <do...@ca...> @@ -47,8 +46,8 @@ 'Qg2_view=php.Dynamic2&g2_itemId=$1')); /* Set up our environment */ - $ret = GalleryCoreApi::setPluginParameter('module', 'rewrite', 'pathinfo.parser', - serialize($parser)); + $ret = GalleryCoreApi::setPluginParameter( + 'module', 'rewrite', 'pathinfo.parser', serialize($parser)); if ($ret) { print $ret->getAsHtml(); return $this->failWithStatus($ret); @@ -63,7 +62,6 @@ print $ret->getAsHtml(); return $this->failWithStatus($ret); } - } function testGetBaseUrl() { @@ -151,72 +149,74 @@ } function testGenerateUrl() { - $this->_expectedUrl[0] = - '/gallery2/' . GALLERY_MAIN_PHP . '?g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . - '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP; $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath; - $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testItemPath . - '.html'; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testItemPath + . '.html'; $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'; - $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testAlbumPath, '/') . 'test.html'; - $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testItemPath, '/') . '/test.html'; - $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - rtrim($this->_testAlbumPath, '/') . '.test'; - $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - $this->_testItemPath . '.test'; - $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'; + $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/'; $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'); + $this->_expectedUrl[16] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . urlencode($this->_urlEncodePath); parent::testGenerateUrl(); } function testGenerateUrlForceFullUrl() { - $this->_expectedUrl[0] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . - '?g2_view=rand164.NonShort&g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('http://example.com/gallery2/' . GALLERY_MAIN_PHP . - '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('http://example.com/gallery2/' . GALLERY_MAIN_PHP + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = 'http://example.com/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP; - $this->_expectedUrl[6] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/v' . - $this->_testAlbumPath; - $this->_expectedUrl[7] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/v' . - $this->_testItemPath . '.html'; - $this->_expectedUrl[8] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . - '?g2_itemId=-5759'; - $this->_expectedUrl[9] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . - '?g2_itemId=' . $this->_derivative->getId(); - $this->_expectedUrl[10] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testAlbumPath, '/') . - 'test.html'; - $this->_expectedUrl[11] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testItemPath, '/') . - '/test.html'; - $this->_expectedUrl[12] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/t' . - rtrim($this->_testAlbumPath, '/') . - '.test'; - $this->_expectedUrl[13] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/t' . - $this->_testItemPath . '.test'; - $this->_expectedUrl[14] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'; - $this->_expectedUrl[15] = - $this->_signUrl('http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'); + $this->_expectedUrl[6] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testAlbumPath; + $this->_expectedUrl[7] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testItemPath . '.html'; + $this->_expectedUrl[8] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=-5759'; + $this->_expectedUrl[9] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId(); + $this->_expectedUrl[10] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/'; + $this->_expectedUrl[15] = $this->_signUrl('http://example.com/gallery2/' . GALLERY_MAIN_PHP + . '/phpunit2/'); + $this->_expectedUrl[16] = 'http://example.com/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . urlencode($this->_urlEncodePath); parent::testGenerateUrlForceFullUrl(); } @@ -227,199 +227,251 @@ $sessionString = sprintf('g2_%s=%s', $session->getKey(), $session->getId()); - $this->_expectedUrl[0] = - '/gallery2/' . GALLERY_MAIN_PHP . '?g2_view=rand164.NonShort&' . - 'g2_foo=bar&' . $sessionString; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent()), $sessionString); + $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar&' . $sessionString; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent()), $sessionString); $this->_expectedUrl[2] = 'http://href_website.com/foo?' . $sessionString; $this->_expectedUrl[3] = $this->_signUrl( - '/gallery2/' . GALLERY_MAIN_PHP . '?g2_controller=core.ShowItem&' . - 'g2_itemId=' . $this->_testItem->getId() . '&' . $sessionString); + '/gallery2/' . GALLERY_MAIN_PHP . '?g2_controller=core.ShowItem&g2_itemId=' + . $this->_testItem->getId()) . '&' . $sessionString; $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg?' . $sessionString; $this->_expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP . '?' . $sessionString; - $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath . - '?' . $sessionString; - $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testItemPath . - '.html?' . $sessionString; - $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759&' . - $sessionString; - $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=' . - $this->_derivative->getId() . '&' . $sessionString; - $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testAlbumPath, '/') . 'test.html?' . $sessionString; - $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testItemPath, '/') . '/test.html?' . $sessionString; - $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - rtrim($this->_testAlbumPath, '/') . '.test?' . $sessionString; - $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . $this->_testItemPath . - '.test?' . $sessionString; - $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/?' . $sessionString; - $this->_expectedUrl[15] = - $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/?' . $sessionString); + $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testAlbumPath . '?' . $sessionString; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testItemPath . '.html?' . $sessionString; + $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=-5759&' . $sessionString; + $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId() . '&' . $sessionString; + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?' . $sessionString; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html?' . $sessionString; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test?' . $sessionString; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test?' . $sessionString; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/?' . $sessionString; + $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/') + . '&' . $sessionString; + $this->_expectedUrl[16] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . urlencode($this->_urlEncodePath) . '?' . $sessionString; parent::testGenerateUrlForceSessionId(); } function testGenerateUrlNoHtmlEntities() { - $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; $this->_expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId(), false); $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP; $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath; - $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . - $this->_testItemPath . '.html'; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testItemPath . '.html'; $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'; - $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testAlbumPath, '/') . 'test.html'; - $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testItemPath, '/') . '/test.html'; - $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - rtrim($this->_testAlbumPath, '/') . '.test'; - $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - $this->_testItemPath . '.test'; - $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'; - $this->_expectedUrl[15] = - $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/', false); + $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/'; + $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/', + false); + $this->_expectedUrl[16] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . urlencode($this->_urlEncodePath); parent::testGenerateUrlNoHtmlEntities(); } + function testGenerateUrlNoUrlEncode() { + $this->_expectedUrl[0] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[2] = 'http://href_website.com/foo'; + $this->_expectedUrl[3] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . + '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; + $this->_expectedUrl[5] = '/gallery2/' . GALLERY_MAIN_PHP; + $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testItemPath . '.html'; + $this->_expectedUrl[8] = '/gallery2/' . GALLERY_MAIN_PHP . '?g2_itemId=-5759'; + $this->_expectedUrl[9] = '/gallery2/' . GALLERY_MAIN_PHP + . '?g2_itemId=' . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/'; + $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'); + $this->_expectedUrl[16] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . $this->_urlEncodePath; + + parent::testGenerateUrlNoUrlEncode(); + } + function testGenerateUrlEmbeddedCookieless() { $sessionString = 'cmssid=12345'; - $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort&' . - 'g2_foo=bar&' . $sessionString; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent()), $sessionString); + $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort' + . '&g2_foo=bar&' . $sessionString; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent()), $sessionString); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2&' . - 'g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()) . - '&' . $sessionString; + $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()) + . '&' . $sessionString; $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/cms/index.php?mod=gallery2&' . $sessionString; - $this->_expectedUrl[6] = '/cms/index.php/v' . $this->_testAlbumPath . - '?mod=gallery2&' . $sessionString; - $this->_expectedUrl[7] = '/cms/index.php/v' . $this->_testItemPath . - '.html?mod=gallery2&' . $sessionString; - $this->_expectedUrl[8] = '/cms/index.php?mod=gallery2&g2_itemId=-5759&' . - $sessionString; - $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' . - $this->_derivative->getId() . '&' . $sessionString; - $this->_expectedUrl[10] = '/cms/index.php/' . ltrim($this->_testAlbumPath, '/') . - 'test.html?mod=gallery2&' . $sessionString; - $this->_expectedUrl[11] = '/cms/index.php/' . ltrim($this->_testItemPath, '/') . - '/test.html?mod=gallery2&' . $sessionString; - $this->_expectedUrl[12] = '/cms/index.php/t' . rtrim($this->_testAlbumPath, '/') . - '.test?mod=gallery2&' . $sessionString; - $this->_expectedUrl[13] = '/cms/index.php/t' . $this->_testItemPath . - '.test?mod=gallery2&' . $sessionString; - $this->_expectedUrl[14] = '/cms/index.php/phpunit1/?mod=gallery2&' . $sessionString; - $this->_expectedUrl[15] = $this->_signUrl('/cms/index.php/phpunit2/?mod=gallery2') . - '&' . $sessionString; + $this->_expectedUrl[6] = '/cms/index.php/v' + . $this->_testAlbumPath . '?mod=gallery2&' . $sessionString; + $this->_expectedUrl[7] = '/cms/index.php/v' + . $this->_testItemPath . '.html?mod=gallery2&' . $sessionString; + $this->_expectedUrl[8] = '/cms/index.php?mod=gallery2&g2_itemId=-5759&' + . $sessionString; + $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' + . $this->_derivative->getId() . '&' . $sessionString; + $this->_expectedUrl[10] = '/cms/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2&' . $sessionString; + $this->_expectedUrl[11] = '/cms/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2&' . $sessionString; + $this->_expectedUrl[12] = '/cms/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2&' . $sessionString; + $this->_expectedUrl[13] = '/cms/index.php/t' + . $this->_testItemPath . '.test?mod=gallery2&' . $sessionString; + $this->_expectedUrl[14] = '/cms/index.php/phpunit/?mod=gallery2&' . $sessionString; + $this->_expectedUrl[15] = $this->_signUrl('/cms/index.php/phpunit2/?mod=gallery2') + . '&' . $sessionString; + $this->_expectedUrl[16] = '/cms/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?mod=gallery2&' . $sessionString; parent::testGenerateUrlEmbeddedCookieless(); } function testGenerateUrlEmbedded() { - $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort' + . '&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2&' . - 'g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/cms/index.php?mod=gallery2'; $this->_expectedUrl[6] = '/cms/index.php/v' . $this->_testAlbumPath . '?mod=gallery2'; $this->_expectedUrl[7] = '/cms/index.php/v' . $this->_testItemPath . '.html?mod=gallery2'; $this->_expectedUrl[8] = '/cms/index.php?mod=gallery2&g2_itemId=-5759'; - $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/cms/index.php/' . ltrim($this->_testAlbumPath, '/') . - 'test.html?mod=gallery2'; - $this->_expectedUrl[11] = '/cms/index.php/' . ltrim($this->_testItemPath, '/') . - '/test.html?mod=gallery2'; - $this->_expectedUrl[12] = '/cms/index.php/t' . rtrim($this->_testAlbumPath, '/') . - '.test?mod=gallery2'; + $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/cms/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2'; + $this->_expectedUrl[11] = '/cms/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2'; + $this->_expectedUrl[12] = '/cms/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2'; $this->_expectedUrl[13] = '/cms/index.php/t' . $this->_testItemPath . '.test?mod=gallery2'; - $this->_expectedUrl[14] = '/cms/index.php/phpunit1/?mod=gallery2'; + $this->_expectedUrl[14] = '/cms/index.php/phpunit/?mod=gallery2'; $this->_expectedUrl[15] = $this->_signUrl('/cms/index.php/phpunit2/?mod=gallery2'); + $this->_expectedUrl[16] = '/cms/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?mod=gallery2'; parent::testGenerateUrlEmbedded(); } function testGenerateUrlMultisite() { $this->_expectedUrl[0] = '/gallery2/main.php?g2_view=rand164.NonShort&g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/gallery2/main.php' . - '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/gallery2/main.php' + . '?g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = 'codebase/rep/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/gallery2/main.php'; $this->_expectedUrl[6] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . $this->_testAlbumPath; - $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' . - $this->_testItemPath . '.html'; + $this->_expectedUrl[7] = '/gallery2/' . GALLERY_MAIN_PHP . '/v' + . $this->_testItemPath . '.html'; $this->_expectedUrl[8] = '/gallery2/main.php?g2_itemId=-5759'; $this->_expectedUrl[9] = '/gallery2/main.php?g2_itemId=' . $this->_derivative->getId(); - $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testAlbumPath, '/') . 'test.html'; - $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' . - ltrim($this->_testItemPath, '/') . '/test.html'; - $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - rtrim($this->_testAlbumPath, '/') . '.test'; - $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' . - $this->_testItemPath . '.test'; - $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit1/'; + $this->_expectedUrl[10] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testAlbumPath, '/') . 'test.html'; + $this->_expectedUrl[11] = '/gallery2/' . GALLERY_MAIN_PHP . '/' + . ltrim($this->_testItemPath, '/') . '/test.html'; + $this->_expectedUrl[12] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . rtrim($this->_testAlbumPath, '/') . '.test'; + $this->_expectedUrl[13] = '/gallery2/' . GALLERY_MAIN_PHP . '/t' + . $this->_testItemPath . '.test'; + $this->_expectedUrl[14] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/'; $this->_expectedUrl[15] = $this->_signUrl('/gallery2/' . GALLERY_MAIN_PHP . '/phpunit2/'); + $this->_expectedUrl[16] = '/gallery2/' . GALLERY_MAIN_PHP . '/phpunit/' + . urlencode($this->_urlEncodePath); parent::testGenerateUrlMultisite(); } function testGenerateUrlEmbeddedMultisite() { - $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort' + . '&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2' . - '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = 'codebase/rep/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/cms/index.php?mod=gallery2'; $this->_expectedUrl[6] = '/cms/index.php/v' . $this->_testAlbumPath . '?mod=gallery2'; $this->_expectedUrl[7] = '/cms/index.php/v' . $this->_testItemPath . '.html?mod=gallery2'; $this->_expectedUrl[8] = '/cms/index.php?mod=gallery2&g2_itemId=-5759'; - $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/cms/index.php/' . ltrim($this->_testAlbumPath, '/') . - 'test.html?mod=gallery2'; - $this->_expectedUrl[11] = '/cms/index.php/' . ltrim($this->_testItemPath, '/') . - '/test.html?mod=gallery2'; - $this->_expectedUrl[12] = '/cms/index.php/t' . rtrim($this->_testAlbumPath, '/') . - '.test?mod=gallery2'; + $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/cms/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2'; + $this->_expectedUrl[11] = '/cms/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2'; + $this->_expectedUrl[12] = '/cms/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2'; $this->_expectedUrl[13] = '/cms/index.php/t' . $this->_testItemPath . '.test?mod=gallery2'; - $this->_expectedUrl[14] = '/cms/index.php/phpunit1/?mod=gallery2'; + $this->_expectedUrl[14] = '/cms/index.php/phpunit/?mod=gallery2'; $this->_expectedUrl[15] = $this->_signUrl('/cms/index.php/phpunit2/?mod=gallery2'); + $this->_expectedUrl[16] = '/cms/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?mod=gallery2'; parent::testGenerateUrlEmbeddedMultisite(); } @@ -428,162 +480,143 @@ global $gallery; $session =& $gallery->getSession(); - $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?g2_%s=%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent()), - $session->getKey(), $session->getId()); + $this->_expectedUrl[0] = '/cms/index.php?mod=gallery2&g2_view=rand164.NonShort' + . '&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + '/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s?g2_%s=%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent()), + $session->getKey(), $session->getId()); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2&' . - 'g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/cms/index.php?mod=gallery2' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/cms/index.php?mod=gallery2'; $this->_expectedUrl[6] = '/cms/index.php/v' . $this->_testAlbumPath . '?mod=gallery2'; $this->_expectedUrl[7] = '/cms/index.php/v' . $this->_testItemPath . '.html?mod=gallery2'; $this->_expectedUrl[8] = '/cms/index.php?mod=gallery2&g2_itemId=-5759'; - $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/cms/index.php/' . ltrim($this->_testAlbumPath, '/') . - 'test.html?mod=gallery2'; - $this->_expectedUrl[11] = '/cms/index.php/' . ltrim($this->_testItemPath, '/') . - '/test.html?mod=gallery2'; - $this->_expectedUrl[12] = '/cms/index.php/t' . rtrim($this->_testAlbumPath, '/') . - '.test?mod=gallery2'; + $this->_expectedUrl[9] = '/cms/index.php?mod=gallery2&g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/cms/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2'; + $this->_expectedUrl[11] = '/cms/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2'; + $this->_expectedUrl[12] = '/cms/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2'; $this->_expectedUrl[13] = '/cms/index.php/t' . $this->_testItemPath . '.test?mod=gallery2'; - $this->_expectedUrl[14] = '/cms/index.php/phpunit1/?mod=gallery2'; + $this->_expectedUrl[14] = '/cms/index.php/phpunit/?mod=gallery2'; $this->_expectedUrl[15] = $this->_signUrl('/cms/index.php/phpunit2/?mod=gallery2'); + $this->_expectedUrl[16] = '/cms/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?mod=gallery2'; parent::testGenerateUrlEmbeddedCookiePathNotSet(); } function testGenerateUrlEmbeddedForceFullUrl() { - $this->_expectedUrl[0] = 'https://cms.com/cms/index.php?mod=gallery2&' . - 'g2_view=rand164.NonShort&g2_foo=bar'; - $this->_expectedUrl[1] = - sprintf('http://photos.com:81/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_expectedUrl[0] = 'https://cms.com/cms/index.php?mod=gallery2' + . '&g2_view=rand164.NonShort&g2_foo=bar'; + $this->_expectedUrl[1] = sprintf( + 'http://photos.com:81/gallery2/' . GALLERY_MAIN_PHP . '/d/%d-%d/%s', + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('https://cms.com/cms/index.php?mod=gallery2&' . - 'g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('https://cms.com/cms/index.php?mod=gallery2' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = 'http://photos.com:81/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = 'https://cms.com/cms/index.php?mod=gallery2'; - $this->_expectedUrl[6] = 'https://cms.com/cms/index.php/v' . $this->_testAlbumPath . - '?mod=gallery2'; - $this->_expectedUrl[7] = 'https://cms.com/cms/index.php/v' . $this->_testItemPath . - '.html?mod=gallery2'; + $this->_expectedUrl[6] = 'https://cms.com/cms/index.php/v' + . $this->_testAlbumPath . '?mod=gallery2'; + $this->_expectedUrl[7] = 'https://cms.com/cms/index.php/v' . $this->_testItemPath + . '.html?mod=gallery2'; $this->_expectedUrl[8] = 'https://cms.com/cms/index.php?mod=gallery2&g2_itemId=-5759'; - $this->_expectedUrl[9] = 'https://cms.com/cms/index.php?mod=gallery2&g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = 'https://cms.com/cms/index.php/' . - ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2'; - $this->_expectedUrl[11] = 'https://cms.com/cms/index.php/' . - ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2'; - $this->_expectedUrl[12] = 'https://cms.com/cms/index.php/t' . - rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2'; - $this->_expectedUrl[13] = 'https://cms.com/cms/index.php/t' . $this->_testItemPath . - '.test?mod=gallery2'; - $this->_expectedUrl[14] = 'https://cms.com/cms/index.php/phpunit1/?mod=gallery2'; - $this->_expectedUrl[15] = - $this->_signUrl('https://cms.com/cms/index.php/phpunit2/?mod=gallery2'); + $this->_expectedUrl[9] = 'https://cms.com/cms/index.php?mod=gallery2&g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = 'https://cms.com/cms/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?mod=gallery2'; + $this->_expectedUrl[11] = 'https://cms.com/cms/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?mod=gallery2'; + $this->_expectedUrl[12] = 'https://cms.com/cms/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?mod=gallery2'; + $this->_expectedUrl[13] = 'https://cms.com/cms/index.php/t' + . $this->_testItemPath . '.test?mod=gallery2'; + $this->_expectedUrl[14] = 'https://cms.com/cms/index.php/phpunit/?mod=gallery2'; + $this->_expectedUrl[15] = $this->_signUrl( + 'https://cms.com/cms/index.php/phpunit2/?mod=gallery2'); + $this->_expectedUrl[16] = 'https://cms.com/cms/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?mod=gallery2'; parent::testGenerateUrlEmbeddedForceFullUrl(); } function testGenerateUrlOverrideBaseUri() { - $this->_expectedUrl[0] = - '/gallery2/index.php?page=photos&g2_view=rand164.NonShort&' . - 'g2_foo=bar'; + $this->_expectedUrl[0] = '/gallery2/index.php?page=photos&g2_view=rand164.NonShort' + . '&g2_foo=bar'; $this->_expectedUrl[1] = sprintf('/gallery2/index.php/d/%d-%d/%s?page=photos', - $this->_testItem->getId(), $this->_testItem->getSerialNumber(), - urlencode($this->_testItem->getPathComponent())); + $this->_testItem->getId(), + $this->_testItem->getSerialNumber(), + urlencode($this->_testItem->getPathComponent())); $this->_expectedUrl[2] = 'http://href_website.com/foo'; - $this->_expectedUrl[3] = $this->_signUrl('/gallery2/index.php?page=photos&' . - 'g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); + $this->_expectedUrl[3] = $this->_signUrl('/gallery2/index.php?page=photos' + . '&g2_controller=core.ShowItem&g2_itemId=' . $this->_testItem->getId()); $this->_expectedUrl[4] = '/gallery2/themes/foo/images/bar.jpg'; $this->_expectedUrl[5] = '/gallery2/index.php?page=photos'; $this->_expectedUrl[6] = '/gallery2/index.php/v' . $this->_testAlbumPath . '?page=photos'; - $this->_expectedUrl[7] = '/gallery2/index.php/v' . $this->_testItemPath . - '.html?page=photos'; + $this->_expectedUrl[7] = '/gallery2/index.php/v' + . $this->_testItemPath . '.html?page=photos'; $this->_expectedUrl[8] = '/gallery2/index.php?page=photos&g2_itemId=-5759'; - $this->_expectedUrl[9] = '/gallery2/index.php?page=photos&g2_itemId=' . - $this->_derivative->getId(); - $this->_expectedUrl[10] = '/gallery2/index.php/' . ltrim($this->_testAlbumPath, '/') . - 'test.html?page=photos'; - $this->_expectedUrl[11] = '/gallery2/index.php/' . ltrim($this->_testItemPath, '/') . - '/test.html?page=photos'; - $this->_expectedUrl[12] = '/gallery2/index.php/t' . rtrim($this->_testAlbumPath, '/') . - '.test?page=photos'; - $this->_expectedUrl[13] = '/gallery2/index.php/t' . $this->_testItemPath . - '.test?page=photos'; - $this->_expectedUrl[14] = '/gallery2/index.php/phpunit1/?page=photos'; + $this->_expectedUrl[9] = '/gallery2/index.php?page=photos&g2_itemId=' + . $this->_derivative->getId(); + $this->_expectedUrl[10] = '/gallery2/index.php/' + . ltrim($this->_testAlbumPath, '/') . 'test.html?page=photos'; + $this->_expectedUrl[11] = '/gallery2/index.php/' + . ltrim($this->_testItemPath, '/') . '/test.html?page=photos'; + $this->_expectedUrl[12] = '/gallery2/index.php/t' + . rtrim($this->_testAlbumPath, '/') . '.test?page=photos'; + $this->_expectedUrl[13] = '/gallery2/index.php/t' + . $this->_testItemPath . '.test?page=photos'; + $this->_expectedUrl[14] = '/gallery2/index.php/phpunit/?page=photos'; $this->_expectedUrl[15] = $this->_signUrl('/gallery2/index.php/phpunit2/?page=photos'); + $this->_expectedUrl[16] = '/gallery2/index.php/phpunit/' + . urlencode($this->_urlEncodePath) . '?page=photos'; parent::testGenerateUrlOverrideBaseUri(); } - function testGenerateUrlRewriteErrorFallback() { - $this->_expectedUrl[0] = GALLERY_MAIN_PHP . '?g2_view=rand164.NonShort&' . - 'g2_foo=bar'; - $this->_expectedUrl[1] = sprintf(GALLERY_MAIN_PHP . '?g2_view=core.DownloadItem' . - '&g2_itemId=%s&g2_serialNumber=%s', - $this-... [truncated message content] |
From: <min...@us...> - 2007-02-13 22:38:32
|
Revision: 15812 http://svn.sourceforge.net/gallery/?rev=15812&view=rev Author: mindless Date: 2007-02-13 14:38:27 -0800 (Tue, 13 Feb 2007) Log Message: ----------- Language update: fr 99.6->99.9% Also language sync for itemadd module. Modified Paths: -------------- trunk/gallery2/modules/core/locale/fr/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/fr.po trunk/gallery2/modules/httpauth/locale/fr/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/fr.po trunk/gallery2/modules/itemadd/locale/af/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ar/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/bg/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ca/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/cs/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/da/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/de/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/es/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/es_AR/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/es_MX/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/et/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/eu/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/fi/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/fr/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ga/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/he/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/hu/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/is/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/it/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ja/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ko/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/lt/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/nl/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/no/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/pl/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/pt/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/pt_BR/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ro/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/ru/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/sk/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/sl/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/sr/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/sv/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/tr/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/uk/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/vi/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/zh_CN/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/locale/zh_TW/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/po/af.po trunk/gallery2/modules/itemadd/po/ar.po trunk/gallery2/modules/itemadd/po/bg.po trunk/gallery2/modules/itemadd/po/ca.po trunk/gallery2/modules/itemadd/po/cs.po trunk/gallery2/modules/itemadd/po/da.po trunk/gallery2/modules/itemadd/po/de.po trunk/gallery2/modules/itemadd/po/es.po trunk/gallery2/modules/itemadd/po/es_AR.po trunk/gallery2/modules/itemadd/po/es_MX.po trunk/gallery2/modules/itemadd/po/et.po trunk/gallery2/modules/itemadd/po/eu.po trunk/gallery2/modules/itemadd/po/fi.po trunk/gallery2/modules/itemadd/po/fr.po trunk/gallery2/modules/itemadd/po/ga.po trunk/gallery2/modules/itemadd/po/he.po trunk/gallery2/modules/itemadd/po/hu.po trunk/gallery2/modules/itemadd/po/is.po trunk/gallery2/modules/itemadd/po/it.po trunk/gallery2/modules/itemadd/po/ja.po trunk/gallery2/modules/itemadd/po/ko.po trunk/gallery2/modules/itemadd/po/lt.po trunk/gallery2/modules/itemadd/po/nl.po trunk/gallery2/modules/itemadd/po/no.po trunk/gallery2/modules/itemadd/po/pl.po trunk/gallery2/modules/itemadd/po/pt.po trunk/gallery2/modules/itemadd/po/pt_BR.po trunk/gallery2/modules/itemadd/po/ro.po trunk/gallery2/modules/itemadd/po/ru.po trunk/gallery2/modules/itemadd/po/sk.po trunk/gallery2/modules/itemadd/po/sl.po trunk/gallery2/modules/itemadd/po/sr.po trunk/gallery2/modules/itemadd/po/strings.raw trunk/gallery2/modules/itemadd/po/sv.po trunk/gallery2/modules/itemadd/po/tr.po trunk/gallery2/modules/itemadd/po/uk.po trunk/gallery2/modules/itemadd/po/vi.po trunk/gallery2/modules/itemadd/po/zh_CN.po trunk/gallery2/modules/itemadd/po/zh_TW.po trunk/gallery2/modules/webdav/locale/fr/LC_MESSAGES/modules_webdav.mo trunk/gallery2/modules/webdav/po/fr.po Modified: trunk/gallery2/modules/core/locale/fr/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/fr.po =================================================================== --- trunk/gallery2/modules/core/po/fr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/core/po/fr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: Gallery: Core 1.1.29\n" "POT-Creation-Date: 2003-08-10 04:27+0200\n" -"PO-Revision-Date: 2007-01-20 00:00+0100\n" +"PO-Revision-Date: 2007-02-11 00:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -110,9 +110,9 @@ msgid "Updating Packages" msgstr "Mise à jour des packages" -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Préparation en cours..." +msgstr "Préparation de %s en cours" #, c-format msgid "Downloading %s" @@ -125,12 +125,11 @@ msgid "Deleting Language Packs" msgstr "Suppression des packages de langue" -#, fuzzy msgid "Update completed with errors." -msgstr "Mise à jour terminée" +msgstr "Mise à jour terminée avec des erreurs." msgid "Update complete." -msgstr "Mise à jour terminée" +msgstr "Mise à jour terminée." msgid "install" msgstr "installer" @@ -1920,12 +1919,16 @@ "Your local copy of the repository was broken and has been fixed. Please download the plugin " "list again." msgstr "" +"Votre copie locale de l'entrepôt était corrompue et a été corrigée. Veuillez télécharger de " +"nouveau la liste des composants." #, c-format msgid "" "Failed to download the %s plugin because the following files/directories could not be " "modified:" msgstr "" +"Impossible de télécharger le composant %s car les fichiers ou répertoires suivants n'ont pas " +"pu être modifiés :" msgid "The repository index has been successfully updated." msgstr "L'index de l'entrepôt des composants a été mis à jour avec succès" Modified: trunk/gallery2/modules/httpauth/locale/fr/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/fr.po =================================================================== --- trunk/gallery2/modules/httpauth/po/fr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/httpauth/po/fr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: HTTP Auth 0.5.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-31 15:39+0100\n" -"PO-Revision-Date: 2007-01-20 12:00+0100\n" +"PO-Revision-Date: 2007-02-11 12:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -167,10 +167,10 @@ msgstr "Utiliser l'authentification du serveur HTTP :" msgid "By default HTTP authentication is only enabled for specific modules." -msgstr "" +msgstr "Par défaut, l'authentification HTTP n'est mise à disposition que de certains modules." msgid "Use the authentication plugins for all modules:" -msgstr "" +msgstr "Utiliser les composants d'authentification pour tous les modules :" #, c-format msgid "" Modified: trunk/gallery2/modules/itemadd/locale/af/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ar/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/bg/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ca/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/cs/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/da/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/de/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/es/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/es_AR/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/es_MX/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/et/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/eu/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/fi/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/fr/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ga/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/he/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/hu/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/is/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/it/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ja/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ko/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/lt/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/nl/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/no/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/pl/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/pt/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/pt_BR/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ro/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/ru/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/sk/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/sl/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/sr/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/sv/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/tr/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/uk/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/vi/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/zh_CN/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/locale/zh_TW/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/po/af.po =================================================================== --- trunk/gallery2/modules/itemadd/po/af.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/af.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2006-03-16 09:59+0200\n" "Last-Translator: Renier <re...@gi...>\n" @@ -238,6 +238,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Plaaslike Bediener oplaai paaie" Modified: trunk/gallery2/modules/itemadd/po/ar.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ar.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ar.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-31 20:26+0200\n" "PO-Revision-Date: 2005-08-14 13:34+0300\n" @@ -231,6 +231,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "مسارات مجلدات رفع الملفات للسيرفرات المحلية" Modified: trunk/gallery2/modules/itemadd/po/bg.po =================================================================== --- trunk/gallery2/modules/itemadd/po/bg.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/bg.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2005-08-13 11:42-0500\n" @@ -224,6 +224,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Пътеки към локални на сървъра директории за качване" Modified: trunk/gallery2/modules/itemadd/po/ca.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ca.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ca.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:40-0800\n" "PO-Revision-Date: 2006-06-16 15:39+0100\n" @@ -240,6 +240,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Adreces Locals del Servidor per Pujada" Modified: trunk/gallery2/modules/itemadd/po/cs.po =================================================================== --- trunk/gallery2/modules/itemadd/po/cs.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/cs.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-28 21:40+0100\n" "PO-Revision-Date: 2006-12-06 13:30+0100\n" @@ -238,6 +238,16 @@ msgid "Add From Server" msgstr "Přidat ze serveru" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Cesty pro nové soubory na místním serveru" Modified: trunk/gallery2/modules/itemadd/po/da.po =================================================================== --- trunk/gallery2/modules/itemadd/po/da.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/da.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -23,7 +23,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:51-0800\n" "PO-Revision-Date: 2006-04-03 11:30+0200\n" @@ -236,6 +236,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Stier til overførsel fra lokal server" Modified: trunk/gallery2/modules/itemadd/po/de.po =================================================================== --- trunk/gallery2/modules/itemadd/po/de.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/de.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-10-11 18:55+0200\n" "PO-Revision-Date: 2006-11-07 04:43+0100\n" @@ -238,6 +238,16 @@ msgid "Add From Server" msgstr "Vom Gallery-Server" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Hochlade-Pfad auf dem Server" Modified: trunk/gallery2/modules/itemadd/po/es.po =================================================================== --- trunk/gallery2/modules/itemadd/po/es.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/es.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2005-10-25 17:54+0200\n" "PO-Revision-Date: 2006-11-07 16:33+0100\n" @@ -241,6 +241,16 @@ msgid "Add From Server" msgstr "Añadir desde el Servidor" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Rutas Locales del Servidor para Subida" Modified: trunk/gallery2/modules/itemadd/po/es_AR.po =================================================================== --- trunk/gallery2/modules/itemadd/po/es_AR.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/es_AR.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-06-05 16:56-0300\n" "PO-Revision-Date: 2003-08-27 22:25-0700\n" "Last-Translator: Alvaro Cortizo <al...@ne...>\n" @@ -251,6 +251,16 @@ msgid "Add From Server" msgstr "Añadir desde el Servidor" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Direcciones Locales del Servidor para Subida" Modified: trunk/gallery2/modules/itemadd/po/es_MX.po =================================================================== --- trunk/gallery2/modules/itemadd/po/es_MX.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/es_MX.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2005-01-01 14:00-0600\n" "PO-Revision-Date: 2005-01-01 16:12-0800\n" "Last-Translator: Wieland E. Kublun <wie...@gm...>, www.kublun.com\n" @@ -254,6 +254,16 @@ msgid "Add From Server" msgstr "Añadir desde el Servidor" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Paths del servidor local" Modified: trunk/gallery2/modules/itemadd/po/et.po =================================================================== --- trunk/gallery2/modules/itemadd/po/et.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/et.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-08-04 14:07+0300\n" "PO-Revision-Date: 2006-08-04 14:56+0200\n" @@ -234,6 +234,16 @@ msgid "Add From Server" msgstr "Lisa Serverist" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Kohaliku Serveri Üleslaadimis-Tee" Modified: trunk/gallery2/modules/itemadd/po/eu.po =================================================================== --- trunk/gallery2/modules/itemadd/po/eu.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/eu.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-10-31 14:44+0100\n" "PO-Revision-Date: 2006-02-19 11:14+0100\n" @@ -239,6 +239,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Zerbitzari Lokal Igoera Bidea" Modified: trunk/gallery2/modules/itemadd/po/fi.po =================================================================== --- trunk/gallery2/modules/itemadd/po/fi.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/fi.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-05-16 09:41+0300\n" "PO-Revision-Date: 2005-12-11 14:35+0200\n" "Last-Translator: Marko Kohtala <mar...@gm...>\n" @@ -233,6 +233,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Paikallisen Palvelimen Siirtohakemistot" Modified: trunk/gallery2/modules/itemadd/po/fr.po =================================================================== --- trunk/gallery2/modules/itemadd/po/fr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/fr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-08-10 04:27+0200\n" "PO-Revision-Date: 2006-09-30 00:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" @@ -236,6 +236,16 @@ msgid "Add From Server" msgstr "Ajouter depuis le serveur" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Chemins locaux de chargement" Modified: trunk/gallery2/modules/itemadd/po/ga.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ga.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ga.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: <gal...@li...>\n" "POT-Creation-Date: 2003-05-30 17:11-0700\n" "PO-Revision-Date: 2003-09-24 22:04-0700\n" @@ -241,6 +241,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Comhadlanna áitiúil d'uaslodáil" Modified: trunk/gallery2/modules/itemadd/po/he.po =================================================================== --- trunk/gallery2/modules/itemadd/po/he.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/he.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2004-12-18 15:28+0200\n" "PO-Revision-Date: 2006-04-05 16:36+0300\n" "Last-Translator: Guy Sheffer <gu...@or...>\n" @@ -232,6 +232,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "סיפריות העלאה בשרת מקומי" Modified: trunk/gallery2/modules/itemadd/po/hu.po =================================================================== --- trunk/gallery2/modules/itemadd/po/hu.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/hu.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-11-04 20:08+0100\n" "PO-Revision-Date: 2006-01-06 17:02+0100\n" @@ -236,6 +236,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Helyi szerver feltöltési útvonal" Modified: trunk/gallery2/modules/itemadd/po/is.po =================================================================== --- trunk/gallery2/modules/itemadd/po/is.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/is.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-31 20:26+0200\n" "PO-Revision-Date: 2005-04-01 17:00+0200\n" @@ -222,6 +222,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "" Modified: trunk/gallery2/modules/itemadd/po/it.po =================================================================== --- trunk/gallery2/modules/itemadd/po/it.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/it.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-08-25 16:49+0200\n" "PO-Revision-Date: 2007-01-08 18:23+0100\n" @@ -239,6 +239,16 @@ msgid "Add From Server" msgstr "Aggiungi Da Server" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Path per l'upload sul server locale" Modified: trunk/gallery2/modules/itemadd/po/ja.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ja.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ja.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-06 00:53+0900\n" "PO-Revision-Date: 2006-05-03 23:51+0900\n" @@ -237,6 +237,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "サーバのローカルアップロードパス" Modified: trunk/gallery2/modules/itemadd/po/ko.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ko.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ko.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:44-0800\n" "PO-Revision-Date: 2006-06-01 11:05+0900\n" @@ -228,6 +228,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "로컬 서버 업로드 경로" Modified: trunk/gallery2/modules/itemadd/po/lt.po =================================================================== --- trunk/gallery2/modules/itemadd/po/lt.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/lt.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-12 22:28+0200\n" "PO-Revision-Date: 2006-03-12 23:02+0200\n" @@ -237,6 +237,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Lokalaus serverio failų įkėlimo keliai" Modified: trunk/gallery2/modules/itemadd/po/nl.po =================================================================== --- trunk/gallery2/modules/itemadd/po/nl.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/nl.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2006-03-17 19:49+0100\n" "Last-Translator: Buut <buut at users.sourceforge Remove - This dot net>\n" @@ -235,6 +235,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Lokale Server Upload Paden" Modified: trunk/gallery2/modules/itemadd/po/no.po =================================================================== --- trunk/gallery2/modules/itemadd/po/no.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/no.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-02-01 23:38+0100\n" "PO-Revision-Date: 2006-07-28 22:38+0100\n" @@ -234,6 +234,16 @@ msgid "Add From Server" msgstr "Legg til fra tjener" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Opplastingsstier på lokal tjener" Modified: trunk/gallery2/modules/itemadd/po/pl.po =================================================================== --- trunk/gallery2/modules/itemadd/po/pl.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/pl.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2006-02-23 10:15+0100\n" "PO-Revision-Date: 2006-12-27 16:35+0100\n" "Last-Translator: Kappana <ka...@gn...>\n" @@ -240,6 +240,16 @@ msgid "Add From Server" msgstr "Dodaj z serwera" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Ścieżki uploadu na lokalnym serwerze" Modified: trunk/gallery2/modules/itemadd/po/pt.po =================================================================== --- trunk/gallery2/modules/itemadd/po/pt.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/pt.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-09-18 12:00+0900\n" "PO-Revision-Date: 2003-10-01 15:46+0900\n" "Last-Translator: Hugo Cruz <hug...@ne...>\n" @@ -241,6 +241,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Caminhos para Upload de Servidor Local" Modified: trunk/gallery2/modules/itemadd/po/pt_BR.po =================================================================== --- trunk/gallery2/modules/itemadd/po/pt_BR.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/pt_BR.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2004-10-08 18:00+0100\n" "Last-Translator: José Ricardo\n" @@ -236,6 +236,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Diretórios Locais no Servidor para Uploads" Modified: trunk/gallery2/modules/itemadd/po/ro.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ro.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ro.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -20,7 +20,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:39-0800\n" "PO-Revision-Date: 2006-03-16 16:27+0100\n" @@ -239,6 +239,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Calea de incarcare locala pe server" Modified: trunk/gallery2/modules/itemadd/po/ru.po =================================================================== --- trunk/gallery2/modules/itemadd/po/ru.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/ru.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2006-03-17 18:20+0300\n" "Last-Translator: Konstantin Ivanov <Con...@vo...>\n" @@ -237,6 +237,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Путь к папке на сервере для загрузки" Modified: trunk/gallery2/modules/itemadd/po/sk.po =================================================================== --- trunk/gallery2/modules/itemadd/po/sk.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/sk.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -21,7 +21,7 @@ # Branislav Hanacek <br...@br...>, 2006. msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-03 10:22+0200\n" "PO-Revision-Date: 2006-09-10 21:10+0200\n" @@ -230,6 +230,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Cesty pre adresár na príjem dát na miestnom serveri" Modified: trunk/gallery2/modules/itemadd/po/sl.po =================================================================== --- trunk/gallery2/modules/itemadd/po/sl.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/sl.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2003-06-25 11:44+0100\n" "PO-Revision-Date: 2006-04-29 12:50+0100\n" "Last-Translator: Janez Troha <ja...@te...>\n" @@ -225,6 +225,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "" Modified: trunk/gallery2/modules/itemadd/po/sr.po =================================================================== --- trunk/gallery2/modules/itemadd/po/sr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/sr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-14 16:52+0200\n" "PO-Revision-Date: 2005-09-06 17:10+0200\n" @@ -237,6 +237,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Putanje za slanje sa lokalnog servera" Modified: trunk/gallery2/modules/itemadd/po/strings.raw =================================================================== --- trunk/gallery2/modules/itemadd/po/strings.raw 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/strings.raw 2007-02-13 22:38:27 UTC (rev 15812) @@ -70,6 +70,8 @@ gettext("Enable") gettext("Add From Web") gettext("Add From Server") +gettext("Security Warning") +gettext("\"Add From Web\" can be abused to attack other websites in your name. For the attacked party it would seem as if you, the administrator of this Gallery, deliberately attacked their website because your Gallery acts on behalf of your users. Therefore it is recommended to enable \"Add From Web\" only for trusted users.") gettext("Local Server Upload Paths") gettext("Specify the legal directories on the local server where a user can store files and then upload them into Gallery using the <i>Upload from Local Server</i> feature. The paths you enter here and all the files and directories under those paths will be available to any Gallery user who has upload privileges, so you should limit this to directories that won't contain sensitive data (eg. /tmp or /usr/ftp/incoming)") gettext("Path") Modified: trunk/gallery2/modules/itemadd/po/sv.po =================================================================== --- trunk/gallery2/modules/itemadd/po/sv.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/sv.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2003-02-11 03:09-0800\n" "PO-Revision-Date: 2007-01-02 22:55+0100\n" @@ -237,6 +237,16 @@ msgid "Add From Server" msgstr "Lägg till från Server" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Lokala sökvägar på servern för uppladdning" Modified: trunk/gallery2/modules/itemadd/po/tr.po =================================================================== --- trunk/gallery2/modules/itemadd/po/tr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/tr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2005-05-23 02:14+0200\n" "PO-Revision-Date: 2006-02-27 00:00+0200\n" "Last-Translator: Goker ISIK <ad...@an...>\n" @@ -226,6 +226,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Local Server Yükleme Klasör Yolları" Modified: trunk/gallery2/modules/itemadd/po/uk.po =================================================================== --- trunk/gallery2/modules/itemadd/po/uk.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/uk.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ # along with this program; if not, write to the Free Software msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:35-0800\n" "PO-Revision-Date: 2006-08-07 20:36+0300\n" @@ -240,6 +240,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Локальна Тека Вивантажень" Modified: trunk/gallery2/modules/itemadd/po/vi.po =================================================================== --- trunk/gallery2/modules/itemadd/po/vi.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/vi.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2005-05-04 16:46-0400\n" "PO-Revision-Date: 2005-08-29 14:16+0100\n" "Last-Translator: Trung Dong Huynh <tru...@do...>\n" @@ -235,6 +235,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "Đường dẫn để tải lên thư mục cục bộ" Modified: trunk/gallery2/modules/itemadd/po/zh_CN.po =================================================================== --- trunk/gallery2/modules/itemadd/po/zh_CN.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/zh_CN.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2005-03-28 14:00+0800\n" "PO-Revision-Date: 2006-03-10 11:37+0800\n" "Last-Translator: Lyric <ly...@ly...>\n" @@ -226,6 +226,16 @@ msgid "Add From Server" msgstr "" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "本地服务器上传路径" Modified: trunk/gallery2/modules/itemadd/po/zh_TW.po =================================================================== --- trunk/gallery2/modules/itemadd/po/zh_TW.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/itemadd/po/zh_TW.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -19,7 +19,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: Add Items 0.9.0\n" +"Project-Id-Version: Gallery: Add Items 0.9.1\n" "POT-Creation-Date: 2005-07-27 23:11-0400\n" "PO-Revision-Date: 2005-08-24 14:00-0400\n" "Last-Translator: Stephen Chu <st...@ju...>\n" @@ -226,6 +226,16 @@ msgid "Add From Server" msgstr "從伺服器增加" +msgid "Security Warning" +msgstr "" + +msgid "" +"\"Add From Web\" can be abused to attack other websites in your name. For the attacked " +"party it would seem as if you, the administrator of this Gallery, deliberately attacked " +"their website because your Gallery acts on behalf of your users. Therefore it is " +"recommended to enable \"Add From Web\" only for trusted users." +msgstr "" + msgid "Local Server Upload Paths" msgstr "本地伺服器上傳路徑" Modified: trunk/gallery2/modules/webdav/locale/fr/LC_MESSAGES/modules_webdav.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/webdav/po/fr.po =================================================================== --- trunk/gallery2/modules/webdav/po/fr.po 2007-02-13 19:38:05 UTC (rev 15811) +++ trunk/gallery2/modules/webdav/po/fr.po 2007-02-13 22:38:27 UTC (rev 15812) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: WebDAV 0.7.3\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-31 15:39+0100\n" -"PO-Revision-Date: 2007-01-20 12:00+0100\n" +"PO-Revision-Date: 2007-02-11 12:00+0100\n" "Last-Translator: Arnaud MOURONVAL <Arn...@ya...>\n" "Language-Team: French <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -108,18 +108,20 @@ "You can't connect with WebDAV because PHP has no XML support on this server. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" +"Vous ne pouvez pas vous connecter en WebDAV car PHP n'a aucun support pour XML sur ce " +"serveur. Une documentation d'aide est disponible dans le %sCodex de Gallery%s." msgid "WebDAV requests not handled" -msgstr "" +msgstr "Requêtes WebDAV non supportées" -#, fuzzy, c-format +#, c-format msgid "" "You can't connect with WebDAV because this server doesn't pass WebDAV requests to Gallery. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"Certains clients WebDAV (par exemple Mac OS X WebDAVFS) ne pourront pas se connecter car les " -"réponses aux requêtes OPTIONS ne contiennent pas d'entêtes WebDAV. Une documentation d'aide " -"à l'analyse d'incidents est disponible dans le %sCodex de Gallery%s." +"Vous ne pouvez pas vous connecter en WebDAV car ce serveur ne transmet pas les requêtes " +"WebDAV à Gallery. Une documentation d'aide à l'analyse d'incidents est disponible dans le %" +"sCodex de Gallery%s." msgid "HTTP auth module d... [truncated message content] |
From: <bh...@us...> - 2007-02-17 07:06:52
|
Revision: 15819 http://svn.sourceforge.net/gallery/?rev=15819&view=rev Author: bharat Date: 2007-02-16 23:06:51 -0800 (Fri, 16 Feb 2007) Log Message: ----------- Freshly signed jars, valid until 2009. Modified Paths: -------------- trunk/gallery2/modules/slideshowapplet/applets/GalleryRemoteAppletMini.jar trunk/gallery2/modules/slideshowapplet/applets/GalleryRemoteHTTPClient.jar trunk/gallery2/modules/slideshowapplet/applets/applet_img.jar trunk/gallery2/modules/uploadapplet/applets/GalleryRemoteAppletMini.jar trunk/gallery2/modules/uploadapplet/applets/GalleryRemoteHTTPClient.jar trunk/gallery2/modules/uploadapplet/applets/applet_img.jar Modified: trunk/gallery2/modules/slideshowapplet/applets/GalleryRemoteAppletMini.jar =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/slideshowapplet/applets/GalleryRemoteHTTPClient.jar =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/slideshowapplet/applets/applet_img.jar =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/uploadapplet/applets/GalleryRemoteAppletMini.jar =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/uploadapplet/applets/GalleryRemoteHTTPClient.jar =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/uploadapplet/applets/applet_img.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ja...@us...> - 2007-02-20 09:23:36
|
Revision: 15835 http://svn.sourceforge.net/gallery/?rev=15835&view=rev Author: jablko Date: 2007-02-20 01:23:35 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Use GalleryUrlGenerator to generate URL rewrite substitutions. Update internal regex rule data structure to support using GalleryUrlGenerator. Fixes a bug with WebDAV OPTIONS rewrite rule. Thanks ozgreg for finding this bug. Modified Paths: -------------- trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc trunk/gallery2/modules/rewrite/classes/RewriteHelper.class trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoUrlGenerator.class trunk/gallery2/modules/rewrite/module.inc trunk/gallery2/modules/rewrite/templates/Htaccess.tpl trunk/gallery2/modules/rewrite/templates/Httpdini.tpl trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class trunk/gallery2/modules/watermark/module.inc Modified: trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc =================================================================== --- trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/RewriteModuleExtras.inc 2007-02-20 09:23:35 UTC (rev 15835) @@ -228,8 +228,9 @@ * if 'match' is subset of URL params, instead of indexing by "$view|$subView". Means * adding 'match' to $shortUrls. */ + case '1.1.6': - /* Added activateRewriteRulesForModule() to Rewrite API */ + /* Add activateRewriteRulesForModule to rewrite API */ case '1.1.7': /* Support rewrite rules without 'pattern' */ @@ -314,14 +315,17 @@ case '1.1.8': /* Remove L from mandatory flags, remove pattern for restrict rules */ case '1.1.9': - /* Updating required Module API version for getRewriteRules change from v1.1.8 */ + /* Update required module API version for getRewriteRules change from 1.1.8 */ + case '1.1.10': + /* Update regex rules structure to reuse code from GalleryUrlGenerator */ + case 'end of upgrade path': break; default: return GalleryCoreApi::error(ERROR_BAD_PLUGIN, __FILE__, __LINE__, - sprintf('Unknown module version %s', $currentVersion)); + sprintf('Unknown module version %s', $currentVersion)); } return null; Modified: trunk/gallery2/modules/rewrite/classes/RewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -63,8 +63,8 @@ } $path = 'modules/rewrite/classes/parsers/' . $rewriteParserId . '/parser.inc'; - if ($platform->file_exists(GalleryCoreApi::getPluginBaseDir('module', 'rewrite') . - $path)) { + if ($platform->file_exists( + GalleryCoreApi::getPluginBaseDir('module', 'rewrite') . $path)) { GalleryCoreApi::requireOnce($path); } $class = $rewriteParserId . 'Parser'; @@ -79,7 +79,7 @@ * and build an array for the URL generator to use when generating short URLs. * @param array $activeRules array array ('pattern' => string pattern) active rules by reference * @param object RewriteParser $rewriteParser - * @param object GalleryModule $upgradeModule (optional) passed in during activate/upgrade + * @param object GalleryModule $upgradeModule (optional) passed in during activate / upgrade * @param array $flags optional definition of default and mandatory flags * @return array object GalleryStatus a status code * int rewrite status code (REWRITE_STATUS_OK on success) @@ -131,7 +131,7 @@ } $rules = $module->getRewriteRules(); - foreach ($activeRules[$moduleId] as $ruleId => $rule) { + foreach ($activeRules[$moduleId] as $ruleId => $activeRule) { /* Make sure this rule still exists, if not silently continue */ if (!isset($rules[$ruleId])) { unset($activeRules[$moduleId][$ruleId]); @@ -139,22 +139,21 @@ } /* Make sure this parser supports this kind of rule */ - if (!$rewriteParser->isValidRule( - $rules[$ruleId], $activeRules[$moduleId][$ruleId])) { + if (!$rewriteParser->isValidRule($rules[$ruleId], $activeRule)) { return array(null, REWRITE_STATUS_INVALID_PATTERN, null, null, array($moduleId, $ruleId)); } /* Save the pattern for the URL generator to use */ - if (isset($rules[$ruleId]['match']) && isset($rule['pattern'])) { + if (isset($rules[$ruleId]['match']) && isset($activeRule['pattern'])) { $shortUrl = array('match' => $rules[$ruleId]['match'], - 'pattern' => $rule['pattern']); + 'pattern' => $activeRule['pattern']); /* Get custom function information */ - if (isset($rules[$ruleId]['keywords'])) { - foreach ($rules[$ruleId]['keywords'] as $key => $info) { - if (isset($info['function'])) { - $shortUrl['functions'][$key] = $info['function']; + if (!empty($rules[$ruleId]['keywords'])) { + foreach ($rules[$ruleId]['keywords'] as $key => $value) { + if (isset($value['function'])) { + $shortUrl['functions'][$key] = $value['function']; } } } @@ -168,12 +167,14 @@ } /* Parse the pattern and create regular expressions with conditions */ - $settings = array(); - $keywords = array('itemId' => array('pattern' => '([0-9]+)')); + if (empty($rules[$ruleId]['keywords'])) { + $rules[$ruleId]['keywords'] = array(); + } /* Add custom keywords to the list of allowed keywords */ - if (isset($rules[$ruleId]['keywords'])) { - $keywords = array_merge($keywords, $rules[$ruleId]['keywords']); + if (!isset($rules[$ruleId]['keywords']['itemId'])) { + $rules[$ruleId]['keywords']['itemId'] = array('pattern' => '([0-9]+)'); + } /* Restrict this rule to given query string conditions */ @@ -202,32 +203,35 @@ } } + /* Build the query string to map the request on to */ + if (empty($rules[$ruleId]['queryString'])) { + $rules[$ruleId]['queryString'] = array(); + } + + if (!empty($rules[$ruleId]['match'])) { + $rules[$ruleId]['queryString'] = array_merge( + $rules[$ruleId]['match'], $rules[$ruleId]['queryString']); + } + /* Build the list of flags to apply to this rule */ - $settings['flags'] = isset($flags) ? $flags['default'] : array(); - if (isset($rules[$ruleId]['flags']) && isset($flags)) { - $settings['flags'] = array_merge($rules[$ruleId]['flags'], $flags['mandatory']); + if (isset($rules[$ruleId]['flags'])) { + $rules[$ruleId]['flags'] = array_merge( + $rules[$ruleId]['flags'], $flags['mandatory']); + } else { + $rules[$ruleId]['flags'] = isset($flags) ? $flags['default'] : array(); } /* Make sure that there's no subrequest made when we match by the query string */ if (!empty($rules[$ruleId]['restrict'])) { - $settings['flags'][] = 'L'; + $rules[$ruleId]['flags'][] = 'L'; } /* Ignore duplicate flags */ - $settings['flags'] = array_unique($settings['flags']); + $rules[$ruleId]['flags'] = array_unique($rules[$ruleId]['flags']); - /* Build the query string to map the request on to */ - $queryString = array(); - if (!empty($rules[$ruleId]['match'])) { - $queryString = $rules[$ruleId]['match']; - } - if (!empty($rules[$ruleId]['queryString'])) { - $queryString = array_merge($queryString, $rules[$ruleId]['queryString']); - } - /* Parse the rule */ - list ($ret, $code) = RewriteHelper::_parseRule($activeRules[$moduleId][$ruleId], - $keywords, $queryString, $regexRules, $settings, $rules[$ruleId]); + list ($ret, $code) = RewriteHelper::_parseRule( + $regexRules, $rules[$ruleId], $activeRule); if ($ret) { return array($ret, null, null, null, null); } @@ -242,27 +246,31 @@ } /** - * Replaces all keywords with an appropriate pattern and append to $regexRules. - * - * @param array $activeRule array ('pattern' => string pattern) - * @param array $keywords of keywords => regular expresion for the htaccess file - * @param array $queryString of query string params (key => value) + * Replace keywords with appropriate pattern and append to $regexRules. * @param array $regexRules of parsed rules - * @param array $settings of settings * @param array $rule rewrite rule + * @param array $activeRule array ('pattern' => string pattern) * @return array object GalleryStatus a status code * int rewrite status code (REWRITE_STATUS_OK on success) * @access private */ - function _parseRule($activeRule, $keywords, $queryString, &$regexRules, $settings, $rule) { - $reference = 1; - $regexRule = array('settings' => $settings); + function _parseRule(&$regexRules, $rule, $activeRule) { + $regexRule = array(); + $regexRule['keywords'] = array(); + $regexRule['queryString'] = $rule['queryString']; + $regexRule['flags'] = $rule['flags']; + /* + * Backreference 0 contains the text that matched the full pattern, backreference 1 + * contains the text that matched the first parenthesized subpattern, and so on + */ + $regexRule['keywords'][] = null; + if (!empty($rule['conditions'])) { $regexRule['conditions'] = array(); foreach ($rule['conditions'] as $condition) { $code = RewriteHelper::_parseKeywords( - $reference, $condition['pattern'], $keywords, $queryString); + $regexRule, $condition['pattern'], $rule['keywords']); if ($code != REWRITE_STATUS_OK) { return array(null, $code); } @@ -272,48 +280,42 @@ } if (!empty($activeRule['pattern'])) { - $pattern = preg_quote($activeRule['pattern']); + $regexRule['pattern'] = preg_quote($activeRule['pattern']); $code = RewriteHelper::_parseKeywords( - $reference, $pattern, $keywords, $queryString); + $regexRule, $regexRule['pattern'], $rule['keywords']); if ($code != REWRITE_STATUS_OK) { return array(null, $code); } - - $regexRule['pattern'] = $pattern; } - $args = array(); - foreach ($queryString as $key => $value) { - $args[] = GalleryUtilities::prefixFormVariable($key) . '=' . $value; - } - $regexRule['queryString'] = join('&', $args); $regexRules[] = $regexRule; return array(null, REWRITE_STATUS_OK); } /** - * Replaces all keywords with an appropriate pattern. - * @param array $reference back reference to next keyword pattern + * Replace keywords with appropriate pattern and add backreference to $regexRule['keywords']. + * @param array $regexRule parsed rule * @param array $pattern * @param array $keywords of keywords => regular expresion for the htaccess file - * @param array $queryString of query string params (key => value) * @return int rewrite status code (REWRITE_STATUS_OK on success) * @access private */ - function _parseKeywords(&$reference, &$pattern, $keywords, &$queryString) { + function _parseKeywords(&$regexRule, &$pattern, $keywords) { preg_match_all('/\%([^%]+)\%/', $pattern, $matches); foreach ($matches[1] as $keyword) { if (!isset($keywords[$keyword]['pattern'])) { return REWRITE_STATUS_BAD_KEYWORD; } + /* TODO: What if $pattern contains more than one instance of "%$keyword%"? */ $pattern = str_replace('%' . $keyword . '%', $keywords[$keyword]['pattern'], $pattern); - if (!isset($keywords[$keyword]['ignore'])) { - $queryString[$keyword] = '$' . $reference; + if (empty($keywords[$keyword]['ignore'])) { + $regexRule['keywords'][] = $keyword; + } else { + $regexRule['keywords'][] = null; } - $reference++; } return REWRITE_STATUS_OK; @@ -330,8 +332,8 @@ */ function _sortRules($a, $b) { /* Flags: rules which don't allow subrequests come last */ - if (in_array('L', $a['settings']['flags']) xor in_array('L', $b['settings']['flags'])) { - if (in_array('L', $b['settings']['flags'])) { + if (in_array('L', $a['flags']) xor in_array('L', $b['flags'])) { + if (in_array('L', $b['flags'])) { return -1; } @@ -355,16 +357,10 @@ * Pattern: static patterns come before regex patterns, long patterns come before short * patterns, empty patterns come last. */ - if (isset($a['pattern']) || isset($b['pattern'])) { - if (isset($a['pattern']) && isset($b['pattern'])) { - if (strpos($a['pattern'], '(') !== false - || strpos($b['pattern'], '(') !== false) { - if (strpos($a['pattern'], '(') !== false - && strpos($b['pattern'], '(') !== false) { - return strpos($b['pattern'], '(') - strpos($a['pattern'], '('); - } - - if (strpos($b['pattern'], '(') !== false) { + if (!empty($a['pattern']) || !empty($b['pattern'])) { + if (!empty($a['pattern']) && !empty($b['pattern'])) { + if (count($a['keywords']) < 2 xor count($b['keywords']) < 2) { + if (count($a['keywords']) < 2) { return -1; } @@ -374,7 +370,7 @@ return strlen($b['pattern']) - strlen($a['pattern']); } - if (isset($a['pattern'])) { + if (!empty($a['pattern'])) { return -1; } Modified: trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/RewriteUrlGenerator.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -88,8 +88,15 @@ * @private */ function _onLoad() { - $shortUrl = $this->_getShortUrl(GalleryUtilities::getAllRequestVariables()); + $variables = GalleryUtilities::getAllRequestVariables(); + /* Make sure the onLoad function is called even if the default view is omitted */ + if (empty($variables['controller']) && empty($variables['view'])) { + $variables['view'] = GALLERY_DEFAULT_VIEW; + } + + $shortUrl = $this->_getShortUrl($variables); + if (!empty($shortUrl['onLoad'])) { GalleryCoreApi::requireOnce('modules/' . $shortUrl['onLoad'][0] . '/classes/' . $shortUrl['onLoad'][1] . '.class'); Modified: trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -51,7 +51,7 @@ $regexRules = array(); $shortUrls = array(); - $flags = array('default' => array('N', 'L'), 'mandatory' => array()); + $flags = array('default' => array('QSA', 'N', 'L'), 'mandatory' => array()); if (!empty($activeRules)) { list ($ret, $code, $regexRules, $shortUrls, $errorId) = RewriteHelper::parseActiveRules( $activeRules, $parser, $upgradeModule, $flags); @@ -139,8 +139,8 @@ return array(null, true); } - $baseUrlComponents = parse_url(preg_replace('{(install|upgrade)/index\.php.*}', '', - $urlGenerator->getCurrentUrlDir(true))); + $baseUrlComponents = parse_url(preg_replace( + '/(install|upgrade)\/index\.php.*/', '', $urlGenerator->getCurrentUrlDir(true))); $ret = GalleryCoreApi::setPluginParameter( 'module', 'rewrite', 'isapirewrite.galleryLocation', $baseUrlComponents['path']); if ($ret) { @@ -183,18 +183,42 @@ * string the gallery .htaccess section */ function getHttpdiniContent($regexRules, $embedded=false) { - GalleryCoreApi::requireOnce('modules/core/classes/GalleryTemplate.class'); global $gallery; $urlGenerator =& $gallery->getUrlGenerator(); $Httpdini = array(); - $Httpdini['g2Prefix'] = GALLERY_FORM_VARIABLE_PREFIX; - $Httpdini['mainPhp'] = GALLERY_MAIN_PHP; $Httpdini['galleryId'] = GALLERY_CONFIG_DIR; - foreach ($regexRules as $ruleId => $rule) { - if (!empty($rule['conditions'])) { - foreach ($rule['conditions'] as $conditionId => $condition) { + list ($ret, $Httpdini['galleryDirectory']) = GalleryCoreApi::getPluginParameter( + 'module', 'rewrite', 'isapirewrite.galleryLocation'); + if ($ret) { + return array($ret, null); + } + + $Httpdini['directory'] = $Httpdini['galleryDirectory']; + $Httpdini['rewriteBase'] = $Httpdini['galleryDirectory']; + $Httpdini['baseFile'] = GALLERY_MAIN_PHP; + $Httpdini['host'] = preg_quote(GalleryUtilities::getServerVar('SERVER_NAME')); + if ($embedded) { + $Htaccess['baseFile'] = $urlGenerator->_file[false]; + list ($ret, $Httpdini['directory']) = GalleryCoreApi::getPluginParameter( + 'module', 'rewrite', 'isapirewrite.embeddedLocation'); + if ($ret) { + return array($ret, null); + } + + $Httpdini['rewriteBase'] = $Httpdini['directory']; + } + + /* Substitute with what the Gallery URL generator would generate */ + $urlGenerator = new GalleryUrlGenerator(); + $urlGenerator->init($Httpdini['directory'] . $Httpdini['baseFile'], + $Httpdini['galleryDirectory'] . GALLERY_MAIN_PHP); + + foreach ($regexRules as $ruleId => $regexRule) { + /* Conditions */ + if (!empty($regexRule['conditions'])) { + foreach ($regexRule['conditions'] as $conditionId => $condition) { /* * Apache mod_rewrite and ISAPI_Rewrite share the concepts of strings which * start with, end with, or contain a pattern, however they represent these @@ -281,43 +305,75 @@ * http://www.isapirewrite.com/docs/#RewriteCond */ if (!empty($condition['flags'])) { - $condition['flags'] = array_intersect( - $condition['flags'], array('O')); + $condition['flags'] = array_intersect($condition['flags'], + array('O')); } - $regexRules[$ruleId]['conditions'][$conditionId] = $condition; + $regexRule['conditions'][$conditionId] = $condition; } } - $count = 0; - if (isset($rule['pattern'])) { - $count = preg_match_all('/\(([^\(\)]+)\)/', $rule['pattern'], $tmp); + $regexRule['conditions'][] = array( + 'test' => 'Host:', + 'pattern' => $Httpdini['host']); + + /* Pattern */ + if (empty($regexRule['pattern'])) { + $regexRule['pattern'] = '[^?]*'; } - $regexRules[$ruleId]['queryStringId'] = $count + 1; - $regexRules[$ruleId]['queryString'] = str_replace('%', '$', - $regexRules[$ruleId]['queryString']); - } - $Httpdini['rules'] = $regexRules; - list ($ret, $Httpdini['galleryDirectory']) = GalleryCoreApi::getPluginParameter( - 'module', 'rewrite', 'isapirewrite.galleryLocation'); - if ($ret) { - return array($ret, null); - } + /* + * ISAPI_Rewrite matches the query string, so optionally match it with non-marking + * parentheses and match the query string excluding '?' so it can be appended to the + * substitution. + */ + $regexRule['pattern'] .= '(?:\\?(.*))?'; - $Httpdini['rewriteBase'] = $Httpdini['galleryDirectory']; - $Httpdini['host'] = preg_quote(GalleryUtilities::getServerVar('SERVER_NAME')); - $Httpdini['baseFile'] = GALLERY_MAIN_PHP; - if ($embedded) { - $Httpdini['baseFile'] = $urlGenerator->_file[0]; - list ($ret, $Httpdini['rewriteBase']) = GalleryCoreApi::getPluginParameter( - 'module', 'rewrite', 'isapirewrite.embeddedLocation'); - if ($ret) { - return array($ret, null); + /* Substitution */ + $params = $regexRule['queryString']; + foreach ($regexRule['keywords'] as $reference => $name) { + if (empty($name)) { + continue; + } + + $params[$name] = '$' . $reference; } + + $regexRule['substitution'] = $urlGenerator->generateUrl( + $params, array('forceDirect' => isset($params['view']) + && $params['view'] == 'watermark.DownloadItem', + 'forceServerRelativeUrl' => true, + 'forceSessionId' => false, + 'htmlEntities' => false, + 'urlEncode' => false, + 'useAuthToken' => false)); + + /* Flags */ + if (!empty($regexRule['flags'])) { + /* + * ISAPI_Rewrite doesn't support the 'QSA' flag, but we can append the query string + * by modifying our regular expression. count($regexRule['keywords']) is the last + * sub-expression. + */ + if (in_array('QSA', $regexRule['flags'])) { + $regexRule['substitution'] .= (strpos($regexRule['substitution'], '?') === false + ? '?' : '&') . '$' . count($regexRule['keywords']); + } + + /* + * ISAPI_Rewrite supports only certain flags: + * http://www.isapirewrite.com/docs/#RewriteRule + */ + $regexRule['flags'] = array_intersect($regexRule['flags'], + array('I', 'F', 'L', 'N', 'NS', 'P', 'R', 'RP', 'U', 'O', 'CL', 'CU')); + } + + $regexRules[$ruleId] = $regexRule; } - $Httpdini['baseFile'] .= (strpos($Httpdini['baseFile'], '?') === false) ? '?' : '&'; + $Httpdini['rules'] = $regexRules; + /* Render template */ + GalleryCoreApi::requireOnce('modules/core/classes/GalleryTemplate.class'); $template = new GalleryTemplate(dirname(__FILE__) . '/../../../templates', true, false); $template->setVariable('Httpdini', $Httpdini); list ($ret, $content) = $template->fetch('Httpdini.tpl', 'modules_rewrite'); @@ -329,9 +385,9 @@ } /** - * Return the .htaccess absolute file name. + * Return the absolute path to the httpd.ini file. * @return array object GalleryStatus a status code - * string .htaccess file name + * string httpd.ini file path */ function getHttpdiniPath() { list ($ret, $path) = Modified: trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -212,35 +212,11 @@ * string the Gallery .htaccess section */ function getHtaccessContent($regexRules, $embedded=false) { - GalleryCoreApi::requireOnce('modules/core/classes/GalleryTemplate.class'); global $gallery; $urlGenerator =& $gallery->getUrlGenerator(); $Htaccess = array(); - $Htaccess['g2Prefix'] = GALLERY_FORM_VARIABLE_PREFIX; - $Htaccess['mainPhp'] = GALLERY_MAIN_PHP; - foreach ($regexRules as $ruleId => $rule) { - if (!empty($rule['conditions'])) { - foreach ($rule['conditions'] as $conditionId => $condition) { - /* - * Apache mod_rewrite supports only certain flags: - * http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html#rewritecond - */ - if (!empty($condition['flags'])) { - $condition['flags'] = array_intersect( - $condition['flags'], array('NC', 'OR')); - } - - $regexRules[$ruleId]['conditions'][$conditionId] = $condition; - } - } - - $regexRules[$ruleId]['queryString'] = str_replace('$', '%', - $regexRules[$ruleId]['queryString']); - } - $Htaccess['rules'] = $regexRules; - list ($ret, $Htaccess['galleryDirectory']) = GalleryCoreApi::getPluginParameter( 'module', 'rewrite', 'modrewrite.galleryLocation'); if ($ret) { @@ -259,7 +235,7 @@ $Htaccess['rewriteBase'] = $Htaccess['galleryDirectory']; $Htaccess['baseFile'] = GALLERY_MAIN_PHP; if ($embedded) { - $Htaccess['baseFile'] = $urlGenerator->_file[0]; + $Htaccess['baseFile'] = $urlGenerator->_file[false]; list ($ret, $Htaccess['directory']) = GalleryCoreApi::getPluginParameter( 'module', 'rewrite', 'modrewrite.embeddedLocation'); if ($ret) { @@ -272,11 +248,68 @@ $Htaccess['directory'] = ''; } } - $Htaccess['baseFile'] .= (strpos($Htaccess['baseFile'], '?') === false) ? '?' : '&'; - $Htaccess['matchBaseFile'] = $Htaccess['directory'] . preg_quote( - preg_replace('/(\?.*)/', '', $Htaccess['baseFile'])); + $Htaccess['matchBaseFile'] = $Htaccess['directory'] + . preg_quote(preg_replace('/\?.*/', '', $Htaccess['baseFile'])); + /* Substitute with what the Gallery URL generator would generate */ + $urlGenerator = new GalleryUrlGenerator(); + $urlGenerator->init($Htaccess['directory'] . $Htaccess['baseFile'], + $Htaccess['galleryDirectory'] . GALLERY_MAIN_PHP); + + foreach ($regexRules as $ruleId => $regexRule) { + /* Conditions */ + if (!empty($regexRule['conditions'])) { + foreach ($regexRule['conditions'] as $conditionId => $condition) { + /* + * Apache mod_rewrite supports only certain flags: + * http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html#rewritecond + */ + if (!empty($condition['flags'])) { + $condition['flags'] = array_intersect($condition['flags'], + array('NC', 'OR')); + } + + $regexRule['conditions'][$conditionId] = $condition; + } + } + + /* Pattern */ + if (!empty($regexRule['pattern'])) { + $regexRule['conditions'][] = array( + 'test' => 'THE_REQUEST', + 'pattern' => $Htaccess['rewriteBase'] . $regexRule['pattern'] . '(\\?.|\\ .)'); + $regexRule['conditions'][] = array( + 'test' => 'REQUEST_URI', + 'pattern' => '!' . $Htaccess['matchBaseFile'] . '$'); + } + + /* Substitution */ + $params = $regexRule['queryString']; + foreach ($regexRule['keywords'] as $reference => $name) { + if (empty($name)) { + continue; + } + + /* $N are RewriteRule backreferences, %N are RewriteCond backreferences */ + $params[$name] = '%' . $reference; + } + + $regexRule['substitution'] = $urlGenerator->generateUrl( + $params, array('forceDirect' => isset($params['view']) + && $params['view'] == 'watermark.DownloadItem', + 'forceServerRelativeUrl' => true, + 'forceSessionId' => false, + 'htmlEntities' => false, + 'urlEncode' => false, + 'useAuthToken' => false)); + + $regexRules[$ruleId] = $regexRule; + } + $Htaccess['rules'] = $regexRules; + + /* Render template */ + GalleryCoreApi::requireOnce('modules/core/classes/GalleryTemplate.class'); $template = new GalleryTemplate(dirname(__FILE__) . '/../../../templates', true, false); $template->setVariable('Htaccess', $Htaccess); list ($ret, $content) = $template->fetch('Htaccess.tpl', 'modules_rewrite'); @@ -288,10 +321,10 @@ } /** - * Return the absolute file name of .htaccess + * Return the absolute path to the .htaccess file. * @param boolean $embedded (optional) true if embedded .htaccess is wanted * @return array object GalleryStatus a status code - * string .htaccess file name + * string .htaccess file path */ function getHtaccessPath($embedded=false) { if ($embedded) { @@ -406,10 +439,10 @@ /** * Returns one of the following codes: - * REWRITE_STATUS_OK everything is fine - * REWRITE_STATUS_APACHE_NO_MOD_REWRITE no mod rewrite support - * REWRITE_STATUS_APACHE_UNABLE_TO_TEST unable to properly test mod_rewrite - * REWRITE_STATUS_MULTISITE can't test mod_rewrite in multisite + * REWRITE_STATUS_OK everything is fine + * REWRITE_STATUS_APACHE_NO_MOD_REWRITE no mod rewrite support + * REWRITE_STATUS_APACHE_UNABLE_TO_TEST unable to properly test mod_rewrite + * REWRITE_STATUS_MULTISITE can't test mod_rewrite in multisite * * @return array object GalleryStatus a status code * int rewrite status code Modified: trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -19,7 +19,7 @@ */ /** - * This is a helper for the PHP Path Info parser. + * PHP path info helper. * @package Rewrite * @subpackage Parsers * @author Douglas Cau <do...@ca...> @@ -76,31 +76,32 @@ } /** - * This saves the rules in a way that the parser can grab quickly and compare agains. - * + * Save the rules in a way the parser can grab quickly and compare against the request. * @param array $regexRules regular expression rules used by the parser * @return object GalleryStatus a status code */ function saveParser($regexRules) { - $static = $find = $replace = array(); - + $static = $dynamic = array(); foreach ($regexRules as $rule) { - $queryString = 'Q' . $rule['queryString']; + if (empty($rule['pattern'])) { + $static['/'] = array('queryString' => $rule['queryString']); - if (!isset($rule['pattern'])) { - $static['/'] = $queryString; - } else if (strpos($rule['pattern'], '(') === false) { - $static['/' . $rule['pattern']] = $queryString; + /* + * Backreference 0 contains the text that matched the full pattern, backreference 1 + * contains the text that matched the first parenthesized subpattern, and so on + */ + } else if (count($rule['keywords']) < 2) { + $static['/' . $rule['pattern']] = array('queryString' => $rule['queryString']); } else { - $find[] = '@^\/' . $rule['pattern'] . '$@'; - $replace[] = $queryString; + $dynamic[] = array('pattern' => '@^/' . $rule['pattern'] . '$@', + 'keywords' => $rule['keywords'], + 'queryString' => $rule['queryString']); } } - $ret = GalleryCoreApi::setPluginParameter('module', 'rewrite', 'pathinfo.parser', - serialize(array('static' => $static, - 'dynamic.find' => $find, - 'dynamic.replace' => $replace))); + $ret = GalleryCoreApi::setPluginParameter( + 'module', 'rewrite', 'pathinfo.parser', serialize(array('static' => $static, + 'dynamic' => $dynamic))); if ($ret) { return $ret; } Modified: trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoUrlGenerator.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoUrlGenerator.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoUrlGenerator.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -21,7 +21,7 @@ GalleryCoreApi::requireOnce('modules/rewrite/classes/RewriteUrlGenerator.class'); /** - * URL generator for PHP Path Info parser. + * PHP path info URL generator. * @package Rewrite * @subpackage Parsers * @author Douglas Cau <do...@ca...> @@ -30,19 +30,17 @@ class PathInfoUrlGenerator extends RewriteUrlGenerator { /** - * Base parameter string for all generated URLs, eg. 'module=galllery' - * Index of array = $forceDirect (true/false) only relevant for embedded Gallery - * - * @var array (0 => string query string, 1 => string forceDirect query string) + * Base parameter string for all generated URLs, e.g. 'module=gallery'. Index of array = + * $forceDirect (true/false) only relevant for embedded Gallery. + * @var array 0 => string query string, 1 => string forceDirect query string * @access private */ var $_baseParamString; /** - * URL base filename of Gallery - * Doesn't include URL parameters (unlike GalleryUrlGenerator::_file) - * Index of array = $forceDirect (true/false) only relevant for embedded Gallery - * + * URL base filename of Gallery. Doesn't include URL parameters (unlike + * GalleryUrlGenerator::_file). Index of array = $forceDirect (true/false) only relevant for + * embedded Gallery. * @var array (0 => string file, 1 => string forceDirect file) * @access private */ @@ -79,8 +77,8 @@ } } - list($ret, $parser) = GalleryCoreApi::getPluginParameter('module', 'rewrite', - 'pathinfo.parser'); + list($ret, $parser) = GalleryCoreApi::getPluginParameter( + 'module', 'rewrite', 'pathinfo.parser'); if ($ret) { return $ret; } @@ -90,31 +88,42 @@ if (($pathInfo = GalleryUtilities::getServerVar('PATH_INFO')) != GalleryUtilities::getServerVar('SCRIPT_NAME') && !empty($pathInfo)) { /* Remove the path of the existing base file if necessary */ - $base = substr($this->getCurrentUrlDir() . $this->_piFile[0], - strlen($this->makeUrl('/')) - 1); + $base = substr( + $this->getCurrentUrlDir() . $this->_piFile[0], strlen($this->makeUrl('/')) - 1); $len = strlen($base); if (strncmp($pathInfo, $base, $len) == 0) { $pathInfo = substr($pathInfo, $len); } - /* Do the parsing (add params to REQUEST/GET params */ + /* Do the parsing (add params to request variables) */ $pathInfo = str_replace('+', ' ', $pathInfo); - if (isset($parser['static'][$pathInfo])) { - $queryString = $parser['static'][$pathInfo]; + if (!empty($parser['static'][$pathInfo])) { + foreach ($parser['static'][$pathInfo]['queryString'] as $key => $value) { + GalleryUtilities::putRequestVariable($key, $value); + } } else { - $queryString = preg_replace($parser['dynamic.find'], - $parser['dynamic.replace'], $pathInfo); - } + foreach ($parser['dynamic'] as $dynamic) { + if (!preg_match($dynamic['pattern'], $pathInfo, $matches)) { + continue; + } - if (!empty($queryString) && $queryString{0} == 'Q') { - $queryString = explode('&', substr($queryString, 1)); + foreach ($dynamic['keywords'] as $reference => $name) { + if (empty($name)) { + continue; + } - foreach ($queryString as $arg) { - $param = explode('=', $arg); - GalleryUtilities::putRequestVariable($param[0], $param[1], false); + GalleryUtilities::putRequestVariable($name, $matches[$reference]); + } + + foreach ($dynamic['queryString'] as $key => $value) { + GalleryUtilities::putRequestVariable($key, $value); + } + + break; } } } + return null; } @@ -144,7 +153,7 @@ } /* - * Since the baseFile (eg. main.php) is in the REQUEST_URI, eg. + * Since the baseFile (e.g. main.php) is in the REQUEST_URI, e.g. * http://example.com/gallery2/main.php/albumA/itemB.jpg.htm * GalleryUrlGenerator::makeRelativeUrl would generate relative URLs when it actually should * generate server-relative URLs. Thus enforce server-relative URLs. @@ -174,12 +183,12 @@ } /** - * Return the base directory of all generated URLs, eg. if the URL is: + * Return the base directory of all generated URLs, e.g. if the URL is: * http://example.com/gallery2/main.php/Travels/Somewhere/IMG001.jpg.htm * Then we return: * http://example.com/gallery2/ * - * Note that the URL parts can all be overidden + * Note that the URL parts can all be overridden. * * @param boolean $forceDirect (optional) ensure Gallery base URL is returned * (different when embedded) @@ -207,7 +216,7 @@ if (empty($this->_file[0])) { $url = substr($url, 0, strrpos($url, '/') + 1); } else if (($i = strpos($url, $this->_file[0])) !== false) { - /* $this->_file might include query params, eg. 'index.php?mod=gallery' */ + /* $this->_file might include query params, e.g. 'index.php?mod=gallery' */ $url = substr($url, 0, $i); } else if (($i = strpos($url, $this->_piFile[0])) !== false) { /* $this->_piFile doesn't include query params, but a traling slash */ Modified: trunk/gallery2/modules/rewrite/module.inc =================================================================== --- trunk/gallery2/modules/rewrite/module.inc 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/module.inc 2007-02-20 09:23:35 UTC (rev 15835) @@ -21,7 +21,7 @@ /** * URL Rewrite Module * - * This module provides URL rewriting support + * Enables short URLs using Apache mod_rewrite, ISAPI_Rewrite, or PHP path info. * * @package Rewrite * @author Douglas Cau <do...@ca...> @@ -35,7 +35,7 @@ $this->setName($gallery->i18n('URL Rewrite')); $this->setDescription($gallery->i18n( 'Enables short URLs using Apache mod_rewrite, ISAPI Rewrite, or PathInfo')); - $this->setVersion('1.1.10'); /* Update RewriteModuleExtras::upgrade also! */ + $this->setVersion('1.1.11'); /* Update RewriteModuleExtras::upgrade too! */ $this->setGroup('gallery', $gallery->i18n('Gallery')); $this->setCallbacks('getSiteAdminViews|registerEventListeners'); $this->setRequiredCoreApi(array(7, 5)); @@ -280,7 +280,7 @@ 'Ensures browsers do not use cached version when image has changed'), 'function' => array('rewrite', 'RewriteSimpleHelper', 'parseSerialNumber')), 'fileName' => array( - 'pattern' => '([^\/\?]+)', + 'pattern' => '([^/?]+)', 'help' => $this->translate('The item file name.'), 'function' => array('rewrite', 'RewriteSimpleHelper', 'parseFileName'))), 'help' => $this->translate('The general URL for downloading items.')); @@ -292,34 +292,36 @@ 'pattern' => 'admin/', 'help' => $this->translate('Quick and easy way to access Site Admin.')); - /* Rule 2: File not found*/ + /* Rule 2: File not found */ $rules[2] = array( 'comment' => $this->translate('404 File not found'), - 'pattern' => '%path%', - 'queryString' => array('view' => 'rewrite.FileNotFound'), 'keywords' => array( 'path' => array( 'pattern' => '([^?]+)', - 'ignore' => 1)), - 'locked' => 1, - 'parser' => 'preGallery'); + 'ignore' => true)), + 'match' => array('view' => 'rewrite.FileNotFound'), + 'pattern' => '%path%', + 'locked' => true); /* Rule 3: Block hotlinked items */ $rules[3] = array( 'comment' => $this->translate('Block hotlinked items'), 'flags' => array('F'), 'restrict' => array('view' => 'core.DownloadItem'), - 'exemptReferer' => 1); + 'exemptReferer' => true); /* Rule 5: Send HTML for hotlinked items */ $rules[5] = array( 'comment' => $this->translate('Send HTML for hotlinked items'), + 'restrict' => array( + GalleryUtilities::prefixFormVariable('view') => 'core.DownloadItem', + GalleryUtilities::prefixFormVariable('itemId') => '%itemId%'), + 'exemptReferer' => true, + 'match' => array('view' => 'rewrite.DownloadItem'), + 'options' => array('forceDirect' => true), 'flags' => array('L'), - 'restrict' => array('view' => 'core.DownloadItem', 'itemId' => '([0-9]+)'), - 'queryString' => array('view' => 'rewrite.DownloadItem', 'itemId' => '%1'), - 'exemptReferer' => 1, 'help' => $this->translate('Blocks use of images in other sites (HTML creates broken' - . ' image), but allows linking to images.')); + . ' image), but allows linking to images.')); return $rules; } Modified: trunk/gallery2/modules/rewrite/templates/Htaccess.tpl =================================================================== --- trunk/gallery2/modules/rewrite/templates/Htaccess.tpl 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/templates/Htaccess.tpl 2007-02-20 09:23:35 UTC (rev 15835) @@ -27,16 +27,7 @@ {/foreach} {/if} -{if isset($rule.pattern)} - RewriteCond %{ldelim}THE_REQUEST{rdelim} \ {$Htaccess.rewriteBase}{$rule.pattern}(\?.|\ .) - RewriteCond %{ldelim}REQUEST_URI{rdelim} !{$Htaccess.matchBaseFile}$ -{/if} -{if strpos($rule.queryString, 'view=core.DownloadItem') !== false || - strpos($rule.queryString, 'view=watermark.DownloadItem') !== false} - RewriteRule . {$Htaccess.galleryDirectory}{$Htaccess.mainPhp}?{$rule.queryString}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{else} - RewriteRule . {$Htaccess.directory}{$Htaccess.baseFile}{$rule.queryString}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{/if} + RewriteRule . {$rule.substitution}{if !empty($rule.flags)} [{$rule.flags|@implode:","}]{/if} {/foreach} </IfModule> Modified: trunk/gallery2/modules/rewrite/templates/Httpdini.tpl =================================================================== --- trunk/gallery2/modules/rewrite/templates/Httpdini.tpl 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/templates/Httpdini.tpl 2007-02-20 09:23:35 UTC (rev 15835) @@ -17,25 +17,8 @@ {/foreach} {/if} -{if isset($rule.pattern)} -RewriteCond Host: {$Httpdini.host} -{if strpos($rule.queryString, 'view=core.DownloadItem') !== false} -RewriteRule {$Httpdini.rewriteBase}{$rule.pattern} {$Httpdini.galleryDirectory}{$Httpdini.mainPhp}?{$rule.queryString}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{else} -RewriteRule {$Httpdini.rewriteBase}{$rule.pattern} {$Httpdini.rewriteBase}{$Httpdini.baseFile}{$rule.queryString}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{/if} +RewriteRule {$Httpdini.rewriteBase}{$rule.pattern} {$rule.substitution}{if !empty($rule.flags)} [{$rule.flags|@implode:","}]{/if} -RewriteCond Host: {$Httpdini.host} -{if strpos($rule.queryString, 'view=core.DownloadItem') !== false} -RewriteRule {$Httpdini.rewriteBase}{$rule.pattern}\?(.*) {$Httpdini.galleryDirectory}{$Httpdini.mainPhp}?{$rule.queryString}&${$rule.queryStringId}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{else} -RewriteRule {$Httpdini.rewriteBase}{$rule.pattern}\?(.*) {$Httpdini.rewriteBase}{$Httpdini.baseFile}{$rule.queryString}&${$rule.queryStringId}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{/if} -{else} -RewriteCond Host: {$Httpdini.host} -RewriteRule {$Httpdini.rewriteBase}.* {$Httpdini.rewriteBase}{$Httpdini.baseFile}{$rule.queryString}{if !empty($rule.settings.flags)} [{$rule.settings.flags|@implode:","}]{/if} -{/if} - {/foreach} # END Url Rewrite section Modified: trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/test/phpunit/PathInfoUrlGeneratorTest.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -38,12 +38,14 @@ global $gallery; parent::setUp(); - $parser = array( - 'static' => array('/static' => 'Qg2_view=php.Static'), - 'dynamic.find' => array('/\/p\/([a-z]{2})\/([^\?]+)/', - '/\/p\/([0-9]+).html/'), - 'dynamic.replace' => array('Qg2_view=php.Dynamic&g2_language=$1&g2_path=$2', - 'Qg2_view=php.Dynamic2&g2_itemId=$1')); + $parser = array(); + $parser['static']['/static'] = array('queryString' => array('view' => 'php.Static')); + $parser['dynamic'][] = array('pattern' => '/\/p\/([a-z]{2})\/([^\?]+)/', + 'keywords' => array(null, 'language', 'path'), + 'queryString' => array('view' => 'php.Dynamic')); + $parser['dynamic'][] = array('pattern' => '/\/p\/([0-9]+).html/', + 'keywords' => array(null, 'itemId'), + 'queryString' => array('view' => 'php.Dynamic2')); /* Set up our environment */ $ret = GalleryCoreApi::setPluginParameter( Modified: trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class 2007-02-20 02:43:44 UTC (rev 15834) +++ trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class 2007-02-20 09:23:35 UTC (rev 15835) @@ -142,9 +142,11 @@ $activeRules['rewritehelpermock'][0] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array()))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -153,9 +155,11 @@ $activeRules['rewritehelpermock'][1] = array('pattern' => 'php/%unit%'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'php/(.*)', - 'queryString' => 'g2_unit=$1', - 'settings' => array('flags' => array()))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'php/(.*)', + 'keywords' => array(null, 'unit'), + 'queryString' => array(), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -163,13 +167,17 @@ $activeRules = array(); $activeRules['rewritehelpermock'][2] = array('pattern' => 'php/%unit%'); $expectedActiveRules = $activeRules; - $expectedShortUrls = array(array('match' => array('view' => 'php.Unit'), - 'pattern' => 'php/%unit%', - 'functions' => array('unit' => array('bogus', 'BogusFile', 'BogusFunction1')), - 'onLoad' => array('bogus', 'BogusFile', 'BogusFunction2'))); - $expectedRegexRules = array(array('pattern' => 'php/(.*)', - 'queryString' => 'g2_view=php.Unit&g2_unit=$1', - 'settings' => array('flags' => array()))); + $expectedShortUrls = array(); + $expectedShortUrls[] = array( + 'match' => array('view' => 'php.Unit'), + 'pattern' => 'php/%unit%', + 'functions' => array('unit' => array('bogus', 'BogusFile', 'BogusFunction1')), + 'onLoad' => array('bogus', 'BogusFile', 'BogusFunction2')); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'php/(.*)', + 'keywords' => array(null, 'unit'), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -178,9 +186,11 @@ $activeRules['rewritehelpermock'][3] = array('pattern' => 'p/%php%/%unit%'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'p/([2])/([1])', - 'queryString' => 'g2_php=$1&g2_unit=$2', - 'settings' => array('flags' => array()))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'p/([2])/([1])', + 'keywords' => array(null, 'php', 'unit'), + 'queryString' => array(), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -188,12 +198,17 @@ $activeRules = array(); $activeRules['rewritehelpermock'][4] = array('pattern' => 'php/%unit%'); $expectedActiveRules = $activeRules; - $expectedShortUrls = array(array('match' => array('view' => 'php.Unit', - 'subView' => 'php.Sub'), - 'pattern' => 'php/%unit%')); - $expectedRegexRules = array(array('pattern' => 'php/(.*)', - 'queryString' => 'g2_view=php.Unit&g2_subView=php.Sub&g2_static=value&g2_unit=$1', - 'settings' => array('flags' => array()))); + $expectedShortUrls = array(); + $expectedShortUrls[] = array('match' => array('view' => 'php.Unit', + 'subView' => 'php.Sub'), + 'pattern' => 'php/%unit%'); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'php/(.*)', + 'keywords' => array(null, 'unit'), + 'queryString' => array('view' => 'php.Unit', + 'subView' => 'php.Sub', + 'static' => 'value'), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -202,9 +217,11 @@ $activeRules['rewritehelpermock'][0] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array('F1', 'F2')))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array('F1', 'F2')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('F1', 'F2'))); @@ -213,9 +230,11 @@ $activeRules['rewritehelpermock'][5] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array('C1', 'C2', 'F1')))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array('C1', 'C2', 'F1')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('F1', 'F2'), 'mandatory' => array('F1'))); @@ -225,9 +244,11 @@ $activeRules['rewritehelpermock'][5] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array('C1', 'C2')))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array('C1', 'C2')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('C1', 'C2'), 'mandatory' => array('C1'))); @@ -237,13 +258,15 @@ $activeRules['rewritehelpermock'][11] = array(); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('conditions' => array( + $expectedRegexRules = array(); + $expectedRegexRules[] = array('conditions' => array( array('test' => 'REQUEST_METHOD', 'pattern' => 'OPTIONS'), array('test' => 'HTTP:Authorization', 'pattern' => '(.+)')), - 'queryString' => 'g2_authorization=$1', - 'settings' => array('flags' => array()))); + 'keywords' => array(null, 'authorization'), + 'queryString' => array(), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -252,9 +275,12 @@ $activeRules['rewritehelpermock'][6] = array(); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('conditions' => array( + $expectedRegexRules = array(); + $expectedRegexRules[] = array('conditions' => array( array('test' => 'QUERY_STRING', - 'pattern' => 'param=bogus'), + 'pattern' => 'g2_view=php\\.Unit'), + array('test' => 'QUERY_STRING', + 'pattern' => 'param=php/(.*)'), array('test' => 'HTTP:Referer', 'pattern' => '!^[a-zA-Z0-9\\+\\.\\-]+://phpunit1/', 'flags' => array('NC')), @@ -267,8 +293,9 @@ 'flags' => array('NC')), array('test' => 'HTTP:Referer', 'pattern' => '!^$')), - 'queryString' => 'g2_static=value', - 'settings' => array('flags' => array('L')))); + 'keywords' => array(null, 'unit'), + 'queryString' => array(), + 'flags' => array('L')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -277,8 +304,10 @@ $activeRules['rewritehelpermock'][10] = array(); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('queryString' => 'g2_view=php.Unit', - 'settings' => array('flags' => array()))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -287,9 +316,11 @@ $activeRules['rewritehelpermock'][7] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array()))); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -350,6 +381,22 @@ $activeRules['rewritehelpermock'][2] = array('pattern' => 'phpunit1'); $activeRules['rewritehelpermock'][9] = array('pattern' => 'phpunit2'); $expectedActiveRules = $activeRules; + $expectedShortUrls = array(); + $expectedShortUrls[] = array('match' => array('view' => 'php.Unit'), + 'pattern' => 'phpunit1', + 'functions' => array('unit' => array('bogus', 'BogusFile', 'BogusFunction1')), + 'onLoad' => array('bogus', 'BogusFile', 'BogusFunction2')); + $expectedShortUrls[] = array('match' => array('view' => 'php.Unit'), + 'pattern' => 'phpunit2'); + $expectedRegexRules = array(); + $expectedRegexRules[] = array('pattern' => 'phpunit2', + 'keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array()); + $expectedRegexRules[] = array('pattern' => 'phpunit1', + 'keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array()); list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( $activeRules, $this->_parser); @@ -358,18 +405,8 @@ } $this->assertEquals(REWRITE_STATUS_OK, $code, 'code'); - $this->assertEquals(array(array('pattern' => 'phpunit2', - 'queryString' => 'g2_view=php.Unit', - 'settings' => array('flags' => array())), - array('pattern' => 'phpunit1', - 'queryString' => 'g2_view=php.Unit', - 'settings' => array('flags' => array()))), $regexRules, 'regex rules'); - $this->assertEquals(array(array('match' => array('view' => 'php.Unit'), - 'pattern' => 'phpunit1', - 'functions' => array('unit' => array('bogus', 'BogusFile', 'BogusFunction1')), - 'onLoad' => array('bogus', 'BogusFile', 'BogusFunction2')), - array('match' => array('view' => 'php.Unit'), - 'pattern' => 'phpunit2')), $shortUrls, 'short urls'); + $this->assertEquals($expectedRegexRules, $regexRules, 'regex rules'); + $this->assertEquals($expectedShortUrls, $shortUrls, 'short urls'); $this->assertEquals(null, $errno, 'errno'); $this->assertEquals($expectedActiveRules, $activeRules, 'active rules'); } @@ -394,33 +431,30 @@ /* Custom flags */ $activeRules['rewritehelpermock'][5] = array('pattern' => 'phpunit'); $expectedActiveRules = $activeRules; - - list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( - $activeRules, $this->_parser, null, array('default' => array('QSA', 'L'), - 'mandatory' => array())); - if ($ret) { - $this->failWithStatus($ret); - } - - $this->assertEquals(REWRITE_STATUS_OK, $code, 'code'); + $expectedShortUrls = array(); + $expectedShortUrls[] = array('match' => array('view' => 'php.Unit'), + 'pattern' => 'p'); + $expectedRegexRules = array(); /* Custom flags */ - $this->assertEquals(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array('C1', 'C2'))), - $regexRules[0], 'regex rules'); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array('C1', 'C2')); /* Conditions */ - $this->assertEquals(array('conditions' => array( + $expectedRegexRules[] = array('conditions' => array( array('test' => 'REQUEST_METHOD', 'pattern' => 'OPTIONS'), array('test' => 'HTTP:Authorization', 'pattern' => '(.+)')), - 'queryString' => 'g2_authorization=$1', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[1], 'regex rules'); + 'keywords' => array(null, 'authorization'), + 'queryString' => array(), + 'flags' => array('QSA', 'L')); /* Restrict */ - $this->assertEquals(array('conditions' => array( + $expectedRegexRules[] = array('conditions' => array( array('test' => 'QUERY_STRING', - 'pattern' => 'param=bogus'), + 'pattern' => 'g2_view=php\\.Unit'), + array('test' => 'QUERY_STRING', + 'pattern' => 'param=php/(.*)'), array('test' => 'HTTP:Referer', 'pattern' => '!^[a-zA-Z0-9\\+\\.\\-]+://phpunit1/', 'flags' => array('NC')), @@ -433,30 +467,41 @@ 'flags' => array('NC')), array('test' => 'HTTP:Referer', 'pattern' => '!^$')), - 'queryString' => 'g2_static=value', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[2], 'regex rules'); + 'keywords' => array(null, 'unit'), + 'queryString' => array(), + 'flags' => array('QSA', 'L')); /* Long pattern */ - $this->assertEquals(array('pattern' => 'phpunit', - 'queryString' => '', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[3], 'regex rules'); + $expectedRegexRules[] = array('pattern' => 'phpunit', + 'keywords' => array(null), + 'queryString' => array(), + 'flags' => array('QSA', 'L')); /* Short pattern */ - $this->assertEquals(array('pattern' => 'p', - 'queryString' => 'g2_view=php.Unit', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[4], 'regex rules'); + $expectedRegexRules[] = array('pattern' => 'p', + 'keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array('QSA', 'L')); /* Regex pattern */ - $this->assertEquals(array('pattern' => 'php/(.*)', - 'queryString' => 'g2_unit=$1', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[5], 'regex rules'); + $expectedRegexRules[] = array('pattern' => 'php/(.*)', + 'keywords' => array(null, 'unit'), + 'queryString' => array(), + 'flags' => array('QSA', 'L')); /* Empty pattern */ - $this->assertEquals(array('queryString' => 'g2_view=php.Unit', - 'settings' => array('flags' => array('QSA', 'L'))), - $regexRules[6], 'regex rules'); - $this->assertEquals(array(array('match' => array('view' => 'php.Unit'), - 'pattern' => 'p')), $shortUrls, 'short urls'); + $expectedRegexRules[] = array('keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'flags' => array('QSA', 'L')); + + list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( + $activeRules, $this->_parser, null, array('default' => array('QSA', 'L'), + 'mandatory' => array())); + if ($ret) { + $this->failWithStatus($ret); + } + + $this->assertEquals(REWRITE_STATUS_OK, $code, 'code'); + foreach ($expectedRegexRules as $key => $expectedRegexRule) { + $this->assertEquals($expectedRegexRule, $regexRules[$key], 'regex rules'); + } + $this->assertEquals($expectedShortUrls, $shortUrls, 'short urls'); $this->assertEquals(null, $errno, 'errno'); $this->assertEquals($expectedActiveRules, $activeRules, 'active rules'); } @@ -466,9 +511,11 @@ $activeRules['rewritehelpermock'][1] = array('pattern' => 'php.-/%unit%'); $expectedActiveRules = $activeRules; $expectedShortUrls = array(); - $expectedRegexRules = array(array('pattern' => 'php\\.-/(.*)', - ... [truncated message content] |
From: <min...@us...> - 2007-02-20 16:05:33
|
Revision: 15836 http://svn.sourceforge.net/gallery/?rev=15836&view=rev Author: mindless Date: 2007-02-20 08:05:32 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Language update: it 99.6 -> 100% Modified Paths: -------------- trunk/gallery2/modules/core/locale/it/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/it.po trunk/gallery2/modules/httpauth/locale/it/LC_MESSAGES/modules_httpauth.mo trunk/gallery2/modules/httpauth/po/it.po trunk/gallery2/modules/itemadd/locale/it/LC_MESSAGES/modules_itemadd.mo trunk/gallery2/modules/itemadd/po/it.po trunk/gallery2/modules/webdav/locale/it/LC_MESSAGES/modules_webdav.mo trunk/gallery2/modules/webdav/po/it.po Modified: trunk/gallery2/modules/core/locale/it/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/it.po =================================================================== --- trunk/gallery2/modules/core/po/it.po 2007-02-20 09:23:35 UTC (rev 15835) +++ trunk/gallery2/modules/core/po/it.po 2007-02-20 16:05:32 UTC (rev 15836) @@ -23,7 +23,7 @@ "Project-Id-Version: Gallery: Core 1.1.29\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-08-25 16:49+0200\n" -"PO-Revision-Date: 2007-01-09 18:32+0100\n" +"PO-Revision-Date: 2007-02-19 12:17+0100\n" "Last-Translator: Ermanno Baschiera <eba...@gm...>\n" "Language-Team: Italian <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -114,9 +114,9 @@ msgid "Updating Packages" msgstr "Aggiornamenti dei Pacchetti in corso" -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Preparazione in corso..." +msgstr "Preparazione in corso di %s" #, c-format msgid "Downloading %s" @@ -129,9 +129,8 @@ msgid "Deleting Language Packs" msgstr "Eliminazione dei Language Packs in corso" -#, fuzzy msgid "Update completed with errors." -msgstr "Aggiornamento completato." +msgstr "Upload completato con errori." msgid "Update complete." msgstr "Aggiornamento completato." @@ -1906,12 +1905,15 @@ "Your local copy of the repository was broken and has been fixed. Please download the plugin " "list again." msgstr "" +"La tua copia locale del deposito era danneggiata ed è stata riparata. Scarica di nuovo la " +"lista dei plugin." #, c-format msgid "" "Failed to download the %s plugin because the following files/directories could not be " "modified:" msgstr "" +"Il download del plugin %s è fallito perché i file/cartelle non possono essere modificati:" msgid "The repository index has been successfully updated." msgstr "L'indice del deposito è stato aggiornato con successo." Modified: trunk/gallery2/modules/httpauth/locale/it/LC_MESSAGES/modules_httpauth.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/httpauth/po/it.po =================================================================== --- trunk/gallery2/modules/httpauth/po/it.po 2007-02-20 09:23:35 UTC (rev 15835) +++ trunk/gallery2/modules/httpauth/po/it.po 2007-02-20 16:05:32 UTC (rev 15836) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: HTTP Auth 0.5.1\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2007-01-03 14:05+0100\n" -"PO-Revision-Date: 2007-01-08 18:11+0100\n" +"PO-Revision-Date: 2007-02-19 12:25+0100\n" "Last-Translator: Ermanno Baschiera <eba...@gm...>\n" "Language-Team: Italian <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -162,10 +162,10 @@ msgstr "Usa Autenticazione del Server Web:" msgid "By default HTTP authentication is only enabled for specific modules." -msgstr "" +msgstr "Per default l'atenticazione HTTP è attiva solo per moduli specifici." msgid "Use the authentication plugins for all modules:" -msgstr "" +msgstr "Usa i plugin di autenticazione per tutti i moduli:" #, c-format msgid "" Modified: trunk/gallery2/modules/itemadd/locale/it/LC_MESSAGES/modules_itemadd.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/itemadd/po/it.po =================================================================== --- trunk/gallery2/modules/itemadd/po/it.po 2007-02-20 09:23:35 UTC (rev 15835) +++ trunk/gallery2/modules/itemadd/po/it.po 2007-02-20 16:05:32 UTC (rev 15836) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: Add Items 0.9.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-08-25 16:49+0200\n" -"PO-Revision-Date: 2007-01-08 18:23+0100\n" +"PO-Revision-Date: 2007-02-19 12:23+0100\n" "Last-Translator: Ermanno Baschiera <eba...@gm...>\n" "Language-Team: Italian <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -240,7 +240,7 @@ msgstr "Aggiungi Da Server" msgid "Security Warning" -msgstr "" +msgstr "Warning di Sicurezza" msgid "" "\"Add From Web\" can be abused to attack other websites in your name. For the attacked " @@ -248,6 +248,11 @@ "their website because your Gallery acts on behalf of your users. Therefore it is " "recommended to enable \"Add From Web\" only for trusted users." msgstr "" +"\"Aggiungi dal Web\" può essere soggetto di abusi per attaccare altri siti web nel tuo nome. " +"Alla parte attaccata sembrerà che tu, l'amministratore di questa Gallery, abbia " +"deliberatamente attaccato il loro sito web perché la tua Gallery agisce fidandosi dei tuoi " +"utenti. Per questo è raccomandato di attivare \"Aggiungi dal Web\" solo per gli utenti " +"fidati." msgid "Local Server Upload Paths" msgstr "Path per l'upload sul server locale" Modified: trunk/gallery2/modules/webdav/locale/it/LC_MESSAGES/modules_webdav.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/webdav/po/it.po =================================================================== --- trunk/gallery2/modules/webdav/po/it.po 2007-02-20 09:23:35 UTC (rev 15835) +++ trunk/gallery2/modules/webdav/po/it.po 2007-02-20 16:05:32 UTC (rev 15836) @@ -22,7 +22,7 @@ "Project-Id-Version: Gallery: WebDAV 0.7.3\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2007-01-03 14:05+0100\n" -"PO-Revision-Date: 2007-01-09 13:15+0100\n" +"PO-Revision-Date: 2007-02-19 12:30+0100\n" "Last-Translator: Ermanno Baschiera <eba...@gm...>\n" "Language-Team: Italian <gal...@li...>\n" "MIME-Version: 1.0\n" @@ -67,20 +67,19 @@ msgid "Redirect OPTIONS requests so we can set DAV headers." msgstr "Redireziona le richieste OPTIONS in modo da poter impostare gli headers DAV." -#, fuzzy msgid "WebDAV Mount Instructions" -msgstr "Configurazione WebDAV" +msgstr "Istruzioni Montaggio WebDAV" -#, fuzzy, c-format +#, c-format msgid "" "%sClick here%s to mount Gallery on your desktop with a WebDAV client. Documentation on " "mounting Gallery with WebDAV is in the %sGallery Codex%s." msgstr "" -"Puoi montare Gallery sulla tua scrivania con un client WebDAV. La documentazione sul " -"montaggio di Gallery con WebDAV si trova presso %sGallery Codex%s." +"%sClicca qui%s per montare Gallery sul tuo desktop con un client WebDAV. La documentazione " +"sul montaggio di Gallery con WebDAV si trova presso %sGallery Codex%s." msgid "Alternatively, you can enter the following URL in your WebDAV client:" -msgstr "" +msgstr "Altrimenti, puoi inserire l'URL che segue nel tuo client WebDAV:" msgid "WebDAV Settings" msgstr "Configurazione WebDAV" @@ -111,14 +110,14 @@ "documentazione per la risoluzione dei problemi si trova presso %sGallery Codex%s." msgid "WebDAV requests not handled" -msgstr "" +msgstr "Richiesta WebDAV non gestita" -#, fuzzy, c-format +#, c-format msgid "" "You can't connect with WebDAV because this server doesn't pass WebDAV requests to Gallery. " "Troubleshooting documentation is in the %sGallery Codex%s." msgstr "" -"Non puoi connetterti con WebDAV perché PHP non ha supporto a XML in questo server. La " +"Non puoi connetterti con WebDAV perché il server non passa le richieste WebDAV a Gallery. La " "documentazione per la risoluzione dei problemi si trova presso %sGallery Codex%s." msgid "HTTP auth module disabled" @@ -136,11 +135,9 @@ "sAmministrazione Sito opzione Plugins%s. La documentazione per la risoluzione dei problemi " "si trova presso %sGallery Codex%s." -#, fuzzy msgid "HTTP auth plugin disabled" -msgstr "Modulo HTTP auth disabilitato" +msgstr "Plugin HTTP auth disabilitato" -#, fuzzy msgid "" "You can connect with WebDAV anonymously, but you can't do anything which requires you to " "login because neither HTTP authentication nor server authentication are enabled in the HTTP " @@ -148,9 +145,8 @@ "module." msgstr "" "Puoi connetterti con WebDAV in modo anonimo, ma non puoi fare nulla che richieda di essere " -"loggato perché il modulo HTTP auth è disattivato. Devi attivare il modulo HTTP auth in %" -"sAmministrazione Sito opzione Plugins%s. La documentazione per la risoluzione dei problemi " -"si trova presso %sGallery Codex%s." +"loggato perché né il modulo HTTP auth né l'autenticazione server sono attivati. Devi " +"attivare l'autenticazione HTTP nella configurazione del modulo HTTP auth." msgid "'Connect to WebDAV' rule disabled" msgstr "Regola 'Connetti a WebDAV' disabilitata" @@ -248,15 +244,3 @@ msgid "WebDAV URL" msgstr "URL WebDAV" - -#~ msgid "" -#~ "You can mount Gallery on your desktop with a WebDAV client. You can then add items to " -#~ "Gallery by drag and drop. Documentation on mounting Gallery with WebDAV is in the %" -#~ "sGallery Codex%s." -#~ msgstr "" -#~ "Puoi montare Gallery sulla tua scrivania con un client WebDAV. Dopo puoi aggiungere " -#~ "oggetti a Gallery con il drag and drop. La documentazione sul montaggio di Gallery con " -#~ "WebDAV si trova presso %sGallery Codex%s." - -#~ msgid "This album's WebDAV URL is:" -#~ msgstr "L'URL WebDAV di questo album è:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-02-21 19:08:41
|
Revision: 15844 http://svn.sourceforge.net/gallery/?rev=15844&view=rev Author: andy_st Date: 2007-02-21 11:08:38 -0800 (Wed, 21 Feb 2007) Log Message: ----------- Cleanup for r15835 (URL rewrite refactoring). See review 100. * 3 bug fixes: - removing href from httpauth rewrite rule, else the generated target URL has no 'main.php'. - checking for isset($flags) in RewriteHelper since it can be null - removing forceDirect option from rewrite rules (dead / experimental code) * 2 style fixes (reverting regexp style change, typo in comment) * Reverting 'queryString' -> 'match' change. * Reverting watermark/module.inc changes to previous revision (but keeping prefixFormVariables fix) Modified Paths: -------------- trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/rewrite/classes/RewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class trunk/gallery2/modules/rewrite/module.inc trunk/gallery2/modules/watermark/module.inc Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/httpauth/module.inc 2007-02-21 19:08:38 UTC (rev 15844) @@ -289,7 +289,6 @@ 'comment' => $this->translate('Authorization Header'), 'help' => $this->translate( 'Pass the Authorization header to Gallery in a request variable.'), - 'match' => array('href' => ''), 'conditions' => array(array('test' => 'HTTP:Authorization', 'pattern' => '%authorization%'), array('test' => 'QUERY_STRING', Modified: trunk/gallery2/modules/rewrite/classes/RewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-21 19:08:38 UTC (rev 15844) @@ -214,11 +214,13 @@ } /* Build the list of flags to apply to this rule */ - if (isset($rules[$ruleId]['flags'])) { + if (isset($rules[$ruleId]['flags']) && isset($flags)) { $rules[$ruleId]['flags'] = array_merge( $rules[$ruleId]['flags'], $flags['mandatory']); + } else if (isset($flags)){ + $rules[$ruleId]['flags'] = $flags['default']; } else { - $rules[$ruleId]['flags'] = isset($flags) ? $flags['default'] : array(); + $rules[$ruleId]['flags'] = array(); } /* Make sure that there's no subrequest made when we match by the query string */ Modified: trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-21 19:08:38 UTC (rev 15844) @@ -139,8 +139,8 @@ return array(null, true); } - $baseUrlComponents = parse_url(preg_replace( - '/(install|upgrade)\/index\.php.*/', '', $urlGenerator->getCurrentUrlDir(true))); + $baseUrlComponents = parse_url(preg_replace('{(install|upgrade)/index\.php.*}', '', + $urlGenerator->getCurrentUrlDir(true))); $ret = GalleryCoreApi::setPluginParameter( 'module', 'rewrite', 'isapirewrite.galleryLocation', $baseUrlComponents['path']); if ($ret) { Modified: trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/rewrite/classes/parsers/pathinfo/PathInfoHelper.class 2007-02-21 19:08:38 UTC (rev 15844) @@ -88,7 +88,7 @@ /* * Backreference 0 contains the text that matched the full pattern, backreference 1 - * contains the text that matched the first parenthesized subpattern, and so on + * contains the text that matched the first parenthesized subpattern, and so on. */ } else if (count($rule['keywords']) < 2) { $static['/' . $rule['pattern']] = array('queryString' => $rule['queryString']); Modified: trunk/gallery2/modules/rewrite/module.inc =================================================================== --- trunk/gallery2/modules/rewrite/module.inc 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/rewrite/module.inc 2007-02-21 19:08:38 UTC (rev 15844) @@ -299,7 +299,7 @@ 'path' => array( 'pattern' => '([^?]+)', 'ignore' => true)), - 'match' => array('view' => 'rewrite.FileNotFound'), + 'queryString' => array('view' => 'rewrite.FileNotFound'), 'pattern' => '%path%', 'locked' => true); @@ -317,7 +317,7 @@ GalleryUtilities::prefixFormVariable('view') => 'core.DownloadItem', GalleryUtilities::prefixFormVariable('itemId') => '%itemId%'), 'exemptReferer' => true, - 'match' => array('view' => 'rewrite.DownloadItem'), + 'queryString' => array('view' => 'rewrite.DownloadItem'), 'options' => array('forceDirect' => true), 'flags' => array('L'), 'help' => $this->translate('Blocks use of images in other sites (HTML creates broken' Modified: trunk/gallery2/modules/watermark/module.inc =================================================================== --- trunk/gallery2/modules/watermark/module.inc 2007-02-21 17:56:51 UTC (rev 15843) +++ trunk/gallery2/modules/watermark/module.inc 2007-02-21 19:08:38 UTC (rev 15844) @@ -19,7 +19,8 @@ */ /** - * Watermark your images. + * This module provides support for adding watermarks to images + * * @package Watermark * @author Alan Harder <ala...@su...> * @version $Revision$ @@ -171,8 +172,8 @@ case 'end of upgrade path': /* - * Leave this bogus case at the end of the legitimate case statements so that we always - * properly terminate our upgrade path with a break. + * Leave this bogus case at the end of the legitimate case statements so that we + * always properly terminate our upgrade path with a break. */ break; @@ -298,8 +299,9 @@ } /** - * Handler for GalleryEntity::delete event. Get rid of any watermarks for users that are - * deleted. + * Handler for GalleryEntity::delete event. Get rid of any watermarks + * for users that are deleted. + * * @see GalleryEventListener::handleEvent */ function handleEvent($event) { @@ -327,49 +329,42 @@ /** * @see GalleryModule::getRewriteRules - * @todo The explicit URL rewrite module version check can be removed on the next major module - * API version. + * @todo The explicit rewrite module version check can be removed on the next major Module API + * version. */ function getRewriteRules() { - $rules = array(); - $rules[0] = array( - 'comment' => $this->translate('Watermark hotlinked images'), - 'help' => $this->translate( - 'Apply watermark to images downloaded from outside your Gallery.' - . ' Select which watermark to use in Watermark Site Admin.'), - 'restrict' => array( - GalleryUtilities::prefixFormVariable('view') => 'core.DownloadItem', - GalleryUtilities::prefixFormVariable('itemId') => '%itemId%'), - 'exemptReferer' => true, - 'match' => array('view' => 'watermark.DownloadItem'), - 'options' => array('forceDirect' => true), - 'flags' => array('L')); - - /* Check that the URL rewrite module is compatible */ + /* Ensure the rewrite module is compatible, 'pattern' is optional since v1.1.8 of rewrite */ list ($ret, $rewrite) = GalleryCoreApi::loadPlugin('module', 'rewrite', true); if ($ret) { if ($gallery->getDebug()) { $gallery->debug('WatermarkModule::getRewriteRules ingoring error: ' . $ret->getAsText()); } - return $rules; + $oldRewriteVersion = false; + } else { + $oldRewriteVersion = version_compare($rewrite->getVersion(), '1.1.8', '<'); } - if (version_compare($rewrite->getVersion(), '1.1.11') < 0) { - /* - * Add a backreference manually since keywords in restrict are parsed since URL - * rewrite module 1.1.11 - */ - $rules[0]['restrict'] = array( - GalleryUtilities::prefixFormVar('view') => 'core.DownloadItem', - GalleryUtilities::prefixFormVar('itemId') => '([0-9]+)'); - $rules[0]['queryString'] = array('itemId' => '%1'); + + $rules = array(); + $rule = array( + 'comment' => $this->translate('Watermark hotlinked images'), + 'restrict' => array( + GalleryUtilities::prefixFormVariable('view') => 'core.DownloadItem', + GalleryUtilities::prefixFormVariable('itemId') => '([0-9]+)'), + 'queryString' => array('view' => 'watermark.DownloadItem', + 'itemId' => '%1'), + 'flags' => array('L'), + 'exemptReferer' => 1, + 'help' => $this->translate( + 'Apply watermark to images downloaded from outside your Gallery. Select ' . + 'which watermark to use in Watermark Site Admin.')); + if ($oldRewriteVersion) { + /* Add a pseudo pattern since it was mandatory until v1.1.8 of the rewrite module. */ + $rule['pattern'] = '.'; + $rule['locked'] = true; + $rule['parser'] = 'preGallery'; } - if (version_compare($rewrite->getVersion(), '1.1.8') < 0) { - /* Add a pseudo pattern, it's optional since URL rewrite module 1.1.8 */ - $rules[0]['pattern'] = '.'; - $rules[0]['locked'] = true; - $rules[0]['parser'] = 'preGallery'; - } + $rules[0] = $rule; return $rules; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <min...@us...> - 2007-02-22 21:47:14
|
Revision: 15856 http://svn.sourceforge.net/gallery/?rev=15856&view=rev Author: mindless Date: 2007-02-22 13:47:12 -0800 (Thu, 22 Feb 2007) Log Message: ----------- Language update: hu 40->42.1% Modified Paths: -------------- trunk/gallery2/modules/albumselect/locale/hu/LC_MESSAGES/modules_albumselect.mo trunk/gallery2/modules/albumselect/po/hu.po trunk/gallery2/modules/comment/locale/hu/LC_MESSAGES/modules_comment.mo trunk/gallery2/modules/comment/po/hu.po trunk/gallery2/modules/core/locale/hu/LC_MESSAGES/modules_core.mo trunk/gallery2/modules/core/po/hu.po trunk/gallery2/modules/imageblock/locale/hu/LC_MESSAGES/modules_imageblock.mo trunk/gallery2/modules/imageblock/po/hu.po trunk/gallery2/modules/imageframe/locale/hu/LC_MESSAGES/modules_imageframe.mo trunk/gallery2/modules/imageframe/po/hu.po trunk/gallery2/modules/quotas/locale/hu/LC_MESSAGES/modules_quotas.mo trunk/gallery2/modules/quotas/po/hu.po trunk/gallery2/modules/rearrange/locale/hu/LC_MESSAGES/modules_rearrange.mo trunk/gallery2/modules/rearrange/po/hu.po trunk/gallery2/modules/rewrite/locale/hu/LC_MESSAGES/modules_rewrite.mo trunk/gallery2/modules/rewrite/po/hu.po trunk/gallery2/modules/search/locale/hu/LC_MESSAGES/modules_search.mo trunk/gallery2/modules/search/po/hu.po trunk/gallery2/modules/slideshow/locale/hu/LC_MESSAGES/modules_slideshow.mo trunk/gallery2/modules/slideshow/po/hu.po trunk/gallery2/modules/useralbum/locale/hu/LC_MESSAGES/modules_useralbum.mo trunk/gallery2/modules/useralbum/po/hu.po Modified: trunk/gallery2/modules/albumselect/locale/hu/LC_MESSAGES/modules_albumselect.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/albumselect/po/hu.po =================================================================== --- trunk/gallery2/modules/albumselect/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/albumselect/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -18,7 +18,8 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # # Previous translators (as far as known, add yourself here, please): -# - Gergely Dömsödi <do...@uh...> +# - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # # , fuzzy # @@ -28,82 +29,82 @@ "Project-Id-Version: Gallery: Album Select 1.0.5\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:37-0800\n" -"PO-Revision-Date: 2006-01-06 16:47+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" +"PO-Revision-Date: 2007-02-15 16:47+0100\n" +"Last-Translator: Sándor Dibuz <ha...@dw...>\n" "Language-Team: Hungarian <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" msgid "Album Select" -msgstr "Albumkiválasztás" +msgstr "Albumkiválasztás" msgid "Jump directly to any album using a select box or tree view" -msgstr "Ugrás bármely albumra egy kiválasztó mező vagy faszerkezet segítségével" +msgstr "Ugrás bármely albumra egy kiválasztó mezÅ vagy faszerkezet segÃtségével" msgid "Blocks" msgstr "Blokkok" msgid "Album Select Settings" -msgstr "Albumkiválasztás beállításai" +msgstr "Albumkiválasztás beállÃtásai" msgid "Settings saved successfully" -msgstr "Beállítások sikeresen elmentve" +msgstr "BeállÃtások sikeresen elmentve" msgid "Albums can be displayed in a simple list box or a dynamic tree." -msgstr "Az albumok megjeleníthetőek egy egyszerű listában vagy faszerkezetben is." +msgstr "Az albumok megjelenÃthetÅek egy egyszerű listában vagy faszerkezetben is." msgid "Sort order" -msgstr "Rendezési sorrend" +msgstr "Rendezési sorrend" msgid "Use manual sort order of albums" -msgstr "Albumok kézi rendezése" +msgstr "Albumok kézi rendezése" msgid "Sort albums by title" -msgstr "Albumok rendezése cím szerint" +msgstr "Albumok rendezése cÃm szerint" msgid "Use sort order defined in each album (affects performance)" -msgstr "Albumonként megadott rendezés használata (kihat a teljesítményre)" +msgstr "Albumonként megadott rendezés használata (kihat a teljesÃtményre)" msgid "Tree" msgstr "Fa" msgid "Connect tree branches with lines" -msgstr "Faágak összekötése vonalakkal" +msgstr "Faágak összekötése vonalakkal" msgid "Show folder icons" -msgstr "Mappaikonok mutatása" +msgstr "Mappaikonok mutatása" msgid "Use cookies to remember which branches are open" -msgstr "Használjon sütit a nyitott ágak tárolására" +msgstr "Használjon sütit a nyitott ágak tárolására" msgid "Show expand-all and collapse-all options" -msgstr "Összes szétnyitása és összes összecsukása opciók mutatása" +msgstr "Ãsszes szétnyitása és összes összecsukása opciók mutatása" msgid "" "Only one branch within a parent can be expanded at the same time. Expand/collapse functions " "are disabled with this option." msgstr "" -"Csak egy ág fejthető ki egy szülőből egyidejűleg. Az összes szétnyitása/összecsukása opciók " -"ilyenkor tiltva vannak." +"Csak egy ág fejthetÅ ki egy szülÅbÅl egyidejűleg. Az összes szétnyitása/összecsukása " +"opciók ilyenkor tiltva vannak." msgid "Save" -msgstr "Mentés" +msgstr "Mentés" msgid "Reset" -msgstr "Visszaállítás" +msgstr "VisszaállÃtás" msgid "« Jump to Album »" -msgstr "«·Albumra ugrás·»" +msgstr "«Â·Albumra ugrás·»" msgid "Expand" -msgstr "Szétnyitás" +msgstr "Szétnyitás" msgid "Collapse" -msgstr "Összecsukás" +msgstr "Ãsszecsukás" msgid "Album quick links (DHTML)" msgstr "Albumgyorslinkek (DHTML)" msgid "Album quick links (Dropdown)" -msgstr "Albumgyorslinkek (Legördülő)" +msgstr "Albumgyorslinkek (LegördülÅ)" Modified: trunk/gallery2/modules/comment/locale/hu/LC_MESSAGES/modules_comment.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/comment/po/hu.po =================================================================== --- trunk/gallery2/modules/comment/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/comment/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -19,24 +19,24 @@ # # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # -# , fuzzy -# -# msgid "" msgstr "" "Project-Id-Version: Gallery: Comments 1.1.2\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-19 11:56-0800\n" -"PO-Revision-Date: 2006-01-06 16:57+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-17 17:41+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Add Comment" -msgstr "Megjegyzés hozzáadása" +msgstr "Megjegyzés hozzáfűzése" msgid "add comment" msgstr "megjegyzés hozzáadása" @@ -66,21 +66,20 @@ msgstr "[megjegyzés] Megjegyzések megtekintése" msgid "[comment] All access" -msgstr "[megjegyzés] Mindenféle hozzáférés" +msgstr "[megjegyzés] Teljes hozzáférés" msgid "View Latest Comments" -msgstr "Legfrissebb Hozzászólások" +msgstr "Legújabb megjegyzések" msgid "View Comments" -msgstr "Megjegyzések megnézése" +msgstr "Megjegyzések megtekintése" #, c-format msgid "Comments: %d" msgstr "Megjegyzések: %d" -#, fuzzy msgid "Guest Comments" -msgstr "Legfrissebb Hozzászólások" +msgstr "Vendég hozzászólások" msgid "Comment Module" msgstr "Megjegyzés modul" @@ -97,9 +96,8 @@ msgid "Commenter" msgstr "Megjegyzés írója" -#, fuzzy msgid "guest" -msgstr "Mégse" +msgstr "vendég" msgid "Comment Preview" msgstr "Megjegyzés előnézete" @@ -115,10 +113,10 @@ msgstr "%s (%s)" msgid "(required)" -msgstr "(szükséges)" +msgstr "(megadása kötelező)" msgid "You must enter a comment!" -msgstr "Írjon megjegyzést!" +msgstr "Írjál megjegyzést!" msgid "Preview" msgstr "Előnézet" @@ -136,10 +134,10 @@ msgstr "törlés" msgid "show full" -msgstr "teljes mutatása" +msgstr "bővebben" msgid "show summary" -msgstr "összegzés megjelenítése" +msgstr "rövidítve" #, c-format msgid "Posted by %s on %s (%s)" @@ -149,19 +147,19 @@ msgid "Posted by %s on %s" msgstr "Beküldte %s %s" -#, fuzzy, c-format +#, c-format msgid "Posted by %s (guest) on %s (%s)" -msgstr "Beküldte %s %s (%s)" +msgstr "Beküldte %s (vendég) ekkor: %s (%s)" -#, fuzzy, c-format +#, c-format msgid "Posted by %s (guest) on %s" -msgstr "Beküldte %s %s" +msgstr "Beküldte %s (vendég) ekkor: %s" msgid "Comment change confirmation" msgstr "Megjegyzés megváltoztatásának megerősítése" msgid "Comment added successfully" -msgstr "Megjegyzés sikeresen hozzáadva" +msgstr "Megjegyzés sikeresen hozzáfűzve" msgid "Comment deleted successfully" msgstr "Megjegyzés sikeresen törölve" @@ -183,22 +181,22 @@ msgstr "Hivatkozások a legrégebbi hozzászólásokra:" msgid "Number of comments on Latest Comments page:" -msgstr "Hozzászélások száma a legrégebbi hivatkozások oldalán:" +msgstr "Hozzászólások száma a legújabb hozzászólások oldalán:" msgid "Invalid value" msgstr "Érvénytelen érték" msgid "Reset" -msgstr "Mégse" +msgstr "Visszaállítás" msgid "Delete this comment?" -msgstr "Megjegyzés törlése?" +msgstr "Töröljem ezt a megjegyzést?" msgid "Are you sure?" -msgstr "Biztos benne?" +msgstr "Biztos?" msgid "Delete this comment? There is no undo!" -msgstr "Megjegyzés törlése? Nincs visszaút!" +msgstr "Ha egyszer törlöd ezt a megjegyzést, nincs visszaállítási lehetőség!" msgid "Delete" msgstr "Törlés" @@ -225,7 +223,7 @@ msgstr "Megjegyzés sikeresen megváltoztatva" msgid "There are no comments for this item" -msgstr "Ehhez az elemhez nem tartozik megjegyzés" +msgstr "Ehhez az elemhez még nincs megjegyzés." msgid "Recent comments" msgstr "Friss megjegyzések" @@ -275,24 +273,3 @@ msgid "Show a text box that expands into the full form" msgstr "" - -#~ msgid "Date" -#~ msgstr "Dátum" - -#~ msgid "The date you entered is invalid." -#~ msgstr "A beírt dátum nem megfelelő." - -#~ msgid "You must enter a date" -#~ msgstr "Írjon be dátumot" - -#~ msgid "You must enter a subject!" -#~ msgstr "Írjon be tárgyat!" - -#~ msgid "You must enter a subject" -#~ msgstr "Írjon be tárgyat" - -#~ msgid "Use Captcha for guest comments:" -#~ msgstr "Captcha használata a vendéghozzászólásokhoz:" - -#~ msgid "[comment] Search comments" -#~ msgstr "[megjegyzés] Keresés a megjegyzések között" Modified: trunk/gallery2/modules/core/locale/hu/LC_MESSAGES/modules_core.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/core/po/hu.po =================================================================== --- trunk/gallery2/modules/core/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/core/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,25 +16,23 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # -# , fuzzy -# -# msgid "" msgstr "" "Project-Id-Version: Gallery: Core 1.1.29\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-11-04 20:08+0100\n" -"PO-Revision-Date: 2006-01-06 17:02+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-20 15:55+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "Gallery Email Test" msgstr "Galéria Emailteszt" @@ -131,9 +129,8 @@ msgid "Activating %s" msgstr "Műveletek" -#, fuzzy msgid "Deleting Language Packs" -msgstr "Alapértelmezett nyelv" +msgstr "Nyelvi csomagok törlése" #, fuzzy msgid "Update completed with errors." @@ -273,10 +270,10 @@ msgstr "Régi jogosultsági táblák törlése" msgid "add items" -msgstr "Elemek hozzáadása" +msgstr "Elemek feltöltése" msgid "Album created successfully." -msgstr "Album sikeresen létrehozva" +msgstr "Album sikeresen létrehozva." msgid "add sub-album" msgstr "Belső album hozzáadása" @@ -339,7 +336,7 @@ #, c-format msgid "edit %s" -msgstr "%s szerkeztése" +msgstr "%s szerkesztése" msgid "Settings saved successfully." msgstr "Beállítások sikeresen elmentve" @@ -463,7 +460,7 @@ msgstr "%s jogainak szerkesztése" msgid "reorder items" -msgstr "elemek újrarendezése" +msgstr "elemek mozgatása albumok között" msgid "Maintenance" msgstr "Karbantartás" @@ -481,7 +478,7 @@ msgstr "jelszó megváltoztatása" msgid "your account" -msgstr "a Te fiókod" +msgstr "hozzáférési adataid" msgid "Password Recovery" msgstr "Jelszó Pótlása" @@ -496,16 +493,16 @@ msgstr "Elemek hozzáadása" msgid "Edit Album" -msgstr "Album szerkeztése" +msgstr "Album szerkesztése" msgid "Edit Photo" -msgstr "Fénykép szerkeztése" +msgstr "Fénykép szerkesztése" msgid "Edit Movie" -msgstr "Videó szerkeztése" +msgstr "Videó szerkesztése" msgid "Add Album" -msgstr "Album Hozzáadása" +msgstr "Album létrehozása" msgid "Edit Permissions" msgstr "Jogok szerkesztése" @@ -517,44 +514,43 @@ msgstr "Album törlése" msgid "Delete Photo" -msgstr "Fénykép Törlése" +msgstr "Fénykép törlése" msgid "Delete Movie" -msgstr "Videó Törlése" +msgstr "Videó törlése" msgid "Move Album" msgstr "Album mozgatása" msgid "Move Photo" -msgstr "Fénykép Mozgatása" +msgstr "Fénykép mozgatása" msgid "Move Movie" -msgstr "Videó Mozgatása" +msgstr "Videó mozgatása" msgid "Edit Captions" msgstr "Feliratok szerkesztése" msgid "Make Highlight" -msgstr "Kiemelés" +msgstr "Kiemelés az album borítójára" msgid "Reorder Items" -msgstr "Elemek újrarendezése" +msgstr "Elemek mozgatása albumok között" msgid "Site Admin" -msgstr "Oldal adminisztrátor" +msgstr "Oldal adminisztráció" msgid "Login" -msgstr "Belépés" +msgstr "Bejelentkezés" msgid "Your Account" -msgstr "A Te fiókod" +msgstr "Hozzáférési adataid" msgid "Logout" msgstr "Kilépés" -#, fuzzy msgid "Plugins" -msgstr "belépés" +msgstr "Modulok" msgid "Users" msgstr "Felhasználók" @@ -563,10 +559,10 @@ msgstr "Csoportok" msgid "Performance" -msgstr "" +msgstr "Teljesítmény" msgid "Toolkit Priority" -msgstr "Kezelőkészlt prioritása" +msgstr "Kezelőkészlet prioritása" msgid "Graphics Toolkits" msgstr "Grafikus eszköztár" @@ -579,7 +575,7 @@ #, c-format msgid "Edit %s" -msgstr "%s szerkeztése" +msgstr "%s szerkesztése" #, c-format msgid "Delete %s" @@ -718,13 +714,11 @@ msgid "Owner" msgstr "Tulaj" -#, fuzzy msgid "Dynamic Album" -msgstr "Album szerkeztése" +msgstr "Dinamikus album" -#, fuzzy msgid "dynamic album" -msgstr "Album szerkeztése" +msgstr "dinamikus album" msgid "Group" msgstr "Csoport" @@ -851,13 +845,13 @@ msgstr "" msgid "Show image owners" -msgstr "Kép tulajdonosának mutatása" +msgstr "Kép tulajdonosának megjelenítése" msgid "Show album owners" -msgstr "Album tulajdonosának mutatása" +msgstr "Album tulajdonosának megjelenítése" msgid "Show micro navigation thumbnails" -msgstr "Kis navigációs előnézeti képek mutatása" +msgstr "Kis navigációs előnézeti képek megjelenítése" msgid "Blocks to show in the sidebar" msgstr "Az oldalpanelen megjelenítendő blokkok" @@ -871,9 +865,8 @@ msgid "Thumbnail links in dynamic albums" msgstr "" -#, fuzzy msgid "Browse dynamic album" -msgstr "Album szerkeztése" +msgstr "Dinamikus album böngészése" msgid "Jump to original album" msgstr "" @@ -882,13 +875,13 @@ msgstr "" msgid "View Samples" -msgstr "Minták megtekintése" +msgstr "választék megtekintése" msgid "Album Frame" msgstr "Albumkeret" msgid "Item Frame" -msgstr "ElemKeret" +msgstr "Elemkeret" msgid "Photo Frame" msgstr "Fényképkeret" @@ -930,9 +923,8 @@ msgid "spreadsheet" msgstr "" -#, fuzzy msgid "file" -msgstr "Fájl" +msgstr "fájl" msgid "Back" msgstr "Vissza" @@ -1032,9 +1024,8 @@ msgid "gettext" msgstr "gettext" -#, fuzzy msgid "enabled" -msgstr "%d elem sikertelen" +msgstr "engedélyezve" #, fuzzy msgid "disabled" @@ -1309,7 +1300,7 @@ msgstr "Csoportnév" msgid "(required)" -msgstr "(szükséges)" +msgstr "(megadása kötelező)" msgid "You must enter a group name" msgstr "Adj meg egy csoportnevet" @@ -1838,9 +1829,8 @@ msgid "up to date" msgstr "Dátum" -#, fuzzy msgid "upgrade required" -msgstr "(szükséges)" +msgstr "frissítés szükséges" #, fuzzy msgid "not installed" @@ -1998,9 +1988,8 @@ msgid "Latest" msgstr "utolsó" -#, fuzzy msgid "Locked Plugin" -msgstr "belépés" +msgstr "Zárolt modul" #, fuzzy msgid "Incompatible Plugin" @@ -2121,7 +2110,7 @@ msgstr "Felületbeállítások visszaállítva" msgid "Defaults" -msgstr "Alapértelmezettek" +msgstr "Alapértelmezések" msgid "" "These are default display settings for albums in your gallery. They can be overridden in " @@ -2139,9 +2128,8 @@ msgid "New albums" msgstr "Új albumok" -#, fuzzy msgid "Save Defaults" -msgstr "Alapértelmezettek" +msgstr "Alapértelmezések rögzítése" #, c-format msgid "%s Theme Settings" @@ -2166,10 +2154,10 @@ msgstr "Törlés" msgid "Move Up" -msgstr "Mozgatás Fel" +msgstr "Mozgatás felfele" msgid "Move Down" -msgstr "Mozgatás Le" +msgstr "Mozgatás lefele" msgid "Parameter" msgstr "Paraméter" @@ -2180,9 +2168,8 @@ msgid "There are no settings for this theme" msgstr "Ennek a felületnek nincsenek beállításai" -#, fuzzy msgid "Save Theme Settings" -msgstr "%s Felületi Beállítások" +msgstr "Beállítások rögzítése" msgid "" "The toolkits shown below have some overlap in supported operations and mime types. Rank the " @@ -2193,7 +2180,7 @@ msgstr "Eszköztár" msgid "Order" -msgstr "Megrendelés" +msgstr "Sorrend" msgid "up" msgstr "fel" @@ -2250,10 +2237,10 @@ "create them at upload time it makes viewing albums for the first time go faster at the " "expense of a longer upload time." msgstr "" -"A Galéria létre tudja hozni az előnézeti képeket vagy feltöltési időben, vagy amikorelőször " -"meg szeretnénk tekinteni. Bármelyiket is választjuk, egyszer gyártja le és menti el az " -"előnézeti képeket, de ha feltöltési időben gyártja le, az albumok megnézése első " -"alkalommalgyorsabb lesz, viszont hosszabb lesz a feltöltési idő." +"A Galéria létre tudja hozni az előnézeti képeket most, a feltöltéssel egyidőben, vagy " +"később, amikor először meg szeretnénk tekinteni. Bármelyiket is választjuk, egyszer gyártja " +"le és menti el az előnézeti képeket, de ha most gyártja le, akkor az albumok megnézése első " +"alkalommal gyorsabb lesz. Viszont így most hosszabb lesz a feltöltési idő." msgid "Create thumbnails now" msgstr "Előnézeti képek létrehozása most" @@ -2262,7 +2249,7 @@ msgstr "Ez egy tesztemail a Gallery2-ből" msgid "Edit Conflict!" -msgstr "Szerkeztési Konfliktus!" +msgstr "Szerkesztési konfliktus!" msgid "Security Violation" msgstr "Biztonsági hiba" @@ -2380,7 +2367,7 @@ msgstr "Ez az album rövid leírása." msgid "Keywords are not visible, but are searchable." -msgstr "A kulcsszavak nem láthatóak, de kereshetőek" +msgstr "Ezek sehol nem jelennek meg, de használatuk megkönnyíti a keresést." msgid "This is the long description of the album." msgstr "Ez az album hosszabb leírása." @@ -2446,7 +2433,7 @@ "felöltéseket)." msgid "More Upload Boxes..." -msgstr "" +msgstr "További fájlok feltöltése..." msgid "Set item titles from:" msgstr "Elem címének beállítása innen:" @@ -2532,7 +2519,7 @@ msgstr[0] "%d elemet tartalmaz." msgid "There is no undo!" -msgstr "Nincs mit visszavonni!" +msgstr "Nincs visszaállítási lehetőség!" msgid "There was a problem processing your request." msgstr "Hiba történt a kérés feldolgozása közben." @@ -2544,8 +2531,8 @@ "This sets the sort order for the album. This applies to all current items, and any newly " "added items." msgstr "" -"Ezzel állítható az album rendezése. Alkalmazódik minden jelenlegi elemre, és a jövőben " -"hozzáadottakra is." +"Ezzel állítható az album rendezése. Minden jelenlegi elemre, és a jövőben hozzáadottakra is " +"érvényes lesz." #, fuzzy msgid "Apply to all subalbums" @@ -2672,7 +2659,7 @@ "alphanumeric characters, underscores or dashes." msgstr "" "Az elem neve a merevlemezen. Ebben az albumban egyedinek kell lennie. Csak alfanumerikus " -"karatkert (vagyis számokat és betűket), alsóvonást, és vesszőt tartalmazhat." +"karatkert (vagyis számokat és betűket), alsóvonást és vesszőt tartalmazhat." msgid "Your name contains invalid characters. Please choose another." msgstr "A megadott név hibás karaktereket tartalmaz. Kérlek válassz másikat." @@ -2690,10 +2677,10 @@ msgstr "A gyökér albumnak kell cím." msgid "The summary of this item." -msgstr "Az elem rövid leírása" +msgstr "Az elem rövid leírása." msgid "This is the long description of the item." -msgstr "Ez az elem hosszabb leírása" +msgstr "Ez az elem hosszabb leírása." #, c-format msgid "%s Date and Time" @@ -2729,8 +2716,9 @@ "Set the size of the thumbnail. The largest side of the thumbnail will be no larger than " "this value. Leave this field blank if you don't want a thumbnail." msgstr "" -"Előnézeti kép méretének beállítása. Az előnézeti kép legnagyobb oldalának mérete nem " -"lesznagyobb, mint az itt beállított érték. Hagyja üresen, ha nem szeretne előnézeti képet." +"Előnézeti kép méretének beállítása. Az előnézeti kép legnagyobb oldalának mérete nem lesz " +"nagyobb, mint az itt beállított érték. Hagyd üresen, ha nem szeretnél előnézeti képet " +"használni." msgid "" "There are no graphics toolkits enabled that support this type of item, so we cannot create " @@ -2884,35 +2872,35 @@ msgid "Restore original" msgstr "Eredeti visszaállítása" -#, fuzzy msgid "Choose a theme" -msgstr "Válassz egy blokkot" +msgstr "Válassz ki egy felületet" #, c-format msgid "" "Themes control the look and feel of the album. You can choose a different theme for each " "album. If you don't choose a theme, we'll use the %s theme by default." msgstr "" +"Felületen (az eredeti szóhasználat szerint témán) az album kinézetét, megjelenítését értjük. " +"Minden egyes albumhoz külön felület rendelhető. Ha nem élsz ezzel a lehetőséggel, akkor az " +"alapértelmezett %s felületet fogjuk használni." msgid "Use this theme in all subalbums" -msgstr "" +msgstr "Használd ezt a felületet minden további albumban." msgid "Choose Theme" -msgstr "" +msgstr "A választás rögzítése" -#, fuzzy, c-format +#, c-format msgid "Configure the %s theme" -msgstr "Egységtesztelő felület" +msgstr "A %s felület beállításai" -#, fuzzy msgid "These settings only apply to the theme for this album." -msgstr "" -"Ez az album a(z) <b>%s</b> felületet használatára van beállítva. Ezek a beállítások csak az " -"ehhez az albumhoz tartozó felületpéldányra vonatkoznak." +msgstr "A beállított értékek csak a jelen albumra vonatkoznak." #, c-format msgid "Use these settings in all subalbums that use the %s theme" msgstr "" +"Használd ezeket a beállításokat minden további albumban, amely a %s felületet használja" msgid "Album Highlight" msgstr "Albumkiemelés" @@ -3023,14 +3011,14 @@ #, c-format msgid "This item is owned by user: %s" -msgstr "Ezen elem tulajdonosa: %s" +msgstr "Az elem tulajdonosa: %s" #, c-format msgid "This item is owned by user: %s (%s)" -msgstr "Ezen elem tulaja %s (%s)" +msgstr "Az elem tulajdonosa: %s (%s)" msgid "New owner" -msgstr "Új tulaj" +msgstr "Új tulajdonos" msgid "Change" msgstr "Változtat" @@ -3172,9 +3160,8 @@ msgid "image" msgstr "kép" -#, fuzzy msgid "color" -msgstr "mag" +msgstr "szín" #, c-format msgid "You can also use the <a href=\"%s\" target=\"_new\">color name</a> for example: %s" @@ -3288,7 +3275,7 @@ msgstr "" msgid "Login to your account" -msgstr "Lépj be a fiókodba" +msgstr "Bejelentkezés a Galériába" msgid "Your password has been recovered, please login." msgstr "Jelszavad pótoltuk, lépj be." @@ -3301,15 +3288,13 @@ msgstr "" msgid "Your login information is incorrect. Please try again." -msgstr "A belépési információk hibásak. Kérlek próbálkozz újra." +msgstr "Hibás bejelentkezési adatok. Próbáld meg újra." #, c-format msgid "" "Lost or forgotten passwords can be retrieved using the <a href=\"%s\">recover password</a> " "page" -msgstr "" -"Elveszett vagy elfelejtett jelszavak pótolhatóak a <a href=\"%s\">jelszópótló oldalon</a> " -"keresztül" +msgstr "Elvesztett vagy elfelejtett jelszavak pótlásához <a href=\"%s\">kattints ide!</a>" #, c-format msgid "Welcome, %s!" @@ -3528,7 +3513,7 @@ #, c-format msgid "Views: %d" -msgstr "Megtekintés: %d" +msgstr "Megtekintve: %dX" msgid "« album actions »" msgstr "« Albumműveletek »" @@ -3582,7 +3567,7 @@ msgstr "Beállítás" msgid "Use Global" -msgstr "Globális használata" +msgstr "Globális alkalmazás" msgid "Language selector" msgstr "Nyelvválasztó" @@ -3594,196 +3579,7 @@ msgstr "Használd a legördülő menüt" msgid "Login block" -msgstr "Belépési blokk" +msgstr "Bejelentkezési blokk" msgid "Links to album/photo peers" msgstr "Linkek az albumok/fotók oldalaira" - -#~ msgid "Format: [module.BlockName param=value] ..." -#~ msgstr "Formátum: [modul.BlokkNév paraméter=érték] ..." - -#~ msgid "Unit test module" -#~ msgstr "Egységtesztelő modul" - -#~ msgid "[test] A permission" -#~ msgstr "[test] Jogok" - -#~ msgid "[test] A second permission" -#~ msgstr "[test] Egy második jogosultság" - -#~ msgid "Unit test theme" -#~ msgstr "Egységtesztelő felület" - -#, fuzzy -#~ msgid "Lock Account" -#~ msgstr "A Te fiókod" - -#~ msgid "More.." -#~ msgstr "Több.." - -#, fuzzy -#~ msgid "Rebuilding resized images..." -#~ msgstr "Átméretezett képek újragyártása" - -#~ msgid "Choose a theme for this album. (The way the album is arranged on the page)" -#~ msgstr "Válassz elrendezést az albumnak. (ahogy az album az oldalon el legyen rendezve)" - -#~ msgid "Recreate thumbnails and resizes" -#~ msgstr "Előnézeti és átméretezett képek újragyártása" - -#~ msgid "" -#~ "The thumbnail and resized image settings are for all new items. To apply these settings " -#~ "to all the items in your album, check the appropriate box." -#~ msgstr "" -#~ "Az előnézeti- és átméretezett képekhez tartozó beállítások. Az összes képhez tartozó " -#~ "előnézeti- és átméretezett kép újragyártásához jelöld be a kivánt funkciókat." - -#~ msgid "Recreate thumbnails" -#~ msgstr "Előnézeti·képek·újragyártása" - -#~ msgid "Recreate resized images" -#~ msgstr "Átméretezett képek újragyártása" - -#~ msgid "Continue..." -#~ msgstr "Folytat..." - -#, fuzzy -#~ msgid "Performing Maintenance Tasks" -#~ msgstr "Rendszerkarbantartás" - -#~ msgid "Upgrade" -#~ msgstr "Frissítés" - -#, fuzzy -#~ msgid "Plugins directory does not exist." -#~ msgstr "'%s' felhasználó nem létezik." - -#~ msgid "Confirm module uninstall" -#~ msgstr "Modul leszedésének megerősítése" - -#, fuzzy -#~ msgid "This will also remove any permissions and clean up any data created by this module." -#~ msgstr "" -#~ "Ezzel eltávolít minden jogosultságot, és átmeneti fájlt, amit ez a modul hozott létre" - -#~ msgid "Uninstall" -#~ msgstr "Eltávolítás" - -#~ msgid "Modules" -#~ msgstr "Modulok" - -#, fuzzy -#~ msgid "Gallery Up-To-Date" -#~ msgstr "Gallery Core" - -#, fuzzy -#~ msgid "Unit Tests" -#~ msgstr "Egységtesztelő felület" - -#, fuzzy -#~ msgid "Gallery Repository Setup" -#~ msgstr "Galéria verzió" - -#~ msgid "create link" -#~ msgstr "link létrehozása" - -#~ msgid "link an item" -#~ msgstr "egy elem linkelése" - -#~ msgid "Create Link" -#~ msgstr "Link Létrehozása" - -#~ msgid "Link Album" -#~ msgstr "Album Csatolása" - -#~ msgid "Link Photo" -#~ msgstr "Fénykép Csatolása" - -#~ msgid "Link Movie" -#~ msgstr "Videó Csatolása" - -#~ msgid "Link %s" -#~ msgstr "Link %s" - -#~ msgid "Link an Item" -#~ msgstr "Elem linkelése" - -# c-format -#~ msgid "Successfully linked %d item" -#~ msgid_plural "Successfully linked %d items" -#~ msgstr[0] "%d elem sikeresen linkelve" - -#~ msgid "This album contains no items to link." -#~ msgstr "Az az album nem tartalmaz linkelhető elemeket." - -#~ msgid "Choose the items you want to link" -#~ msgstr "Válaszd ki a linkelni kívánt elemeket" - -#~ msgid "No sources chosen" -#~ msgstr "Nincs forrás kiválasztva" - -#~ msgid "Choose a new album for the link" -#~ msgstr "Új album választás a linkhez" - -#~ msgid "Link" -#~ msgstr "Link" - -#~ msgid "Successfully linked" -#~ msgstr "Linkelés sikeres" - -#~ msgid "Successfully installed and auto-configured module %s" -#~ msgstr "%s modul sikeresen telepítve és beállítva" - -#~ msgid "Successfully installed module %s" -#~ msgstr "%s modul sikeresen telepítve" - -#~ msgid "Successfully configured module %s" -#~ msgstr "%s modul sikeresen konfigurálva" - -#~ msgid "Successfully upgraded module %s" -#~ msgstr "%s modul sikeresen frissítve" - -#~ msgid "Successfully activated module %s" -#~ msgstr "%s modul sikeresen aktiválva" - -#~ msgid "Successfully deactivated module %s" -#~ msgstr "%s modul sikeresen kikapcsolva" - -#~ msgid "Successfully uninstalled module %s" -#~ msgstr "%s modul sikeresen eltávolítva" - -#~ msgid "Incompatible module!" -#~ msgstr "Inkompatibilis modul!" - -#~ msgid "Module API Required: %s (available: %s)" -#~ msgstr "Szükséges modul API: %s (jelenleg %s)" - -#~ msgid "All Themes" -#~ msgstr "Minden Felület" - -#~ msgid "Status: Incompatible Theme (Inactive)" -#~ msgstr "Állapot: Inkompatibilis Felület (Inaktív)" - -#~ msgid "Incompatible theme!" -#~ msgstr "Inkompatibilis felület!" - -#~ msgid "Theme API Required: %s (available: %s)" -#~ msgstr "Szükséges Felületi API: %s (jelenlegi: %s)" - -#~ msgid "(default)" -#~ msgstr "(alapértelmezett)" - -#~ msgid "« None »" -#~ msgstr "«·Nincs·»" - -#~ msgid "You did it right!" -#~ msgstr "Jól csináltad!" - -#~ msgid "Unable to delete directory: /templates_c" -#~ msgstr "Nem lehet törölni a könyvtárat: /templates_c" - -#~ msgid "edit permissions" -#~ msgstr "jogok szerkesztése" - -#~ msgid "HDTV 16x9" -#~ msgstr "HDTV 16x9" Modified: trunk/gallery2/modules/imageblock/locale/hu/LC_MESSAGES/modules_imageblock.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/imageblock/po/hu.po =================================================================== --- trunk/gallery2/modules/imageblock/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/imageblock/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,30 +16,29 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # -# , fuzzy -# -# msgid "" msgstr "" "Project-Id-Version: Gallery: Image Block 1.0.11\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-11-04 20:09+0100\n" -"PO-Revision-Date: 2006-01-06 13:43+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-17 23:50+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Image Block" -msgstr "KépBlokk" +msgstr "Képblokk" msgid "Random, Most Recent or Most Viewed Photo or Album" -msgstr "Véletlen, Legfrissebb vagy a Legtöbbször Megtekintett Fotó vagy Album" +msgstr "Véletlen, legfrissebb vagy a legtöbbször megtekintett fotó vagy album" msgid "Blocks" msgstr "Blokkok" @@ -77,8 +76,8 @@ #, fuzzy msgid "Most Viewed Image" msgid_plural "Most Viewed Images" -msgstr[0] "Legtöbbet nézett kép" -msgstr[1] "Legtöbbet nézett kép" +msgstr[0] "Legtöbbször megnézett kép" +msgstr[1] "Legtöbbször megnézett kép" #, fuzzy msgid "Random Album" @@ -95,15 +94,15 @@ #, fuzzy msgid "Most Viewed Album" msgid_plural "Most Viewed Albums" -msgstr[0] "Legtöbbet nézett album" -msgstr[1] "Legtöbbet nézett album" +msgstr[0] "Legtöbbször megnézett album" +msgstr[1] "Legtöbbször megnézett album" msgid "Date:" msgstr "Dátum: " #, c-format msgid "Views: %d" -msgstr "Megtekintés: %d" +msgstr "Megtekintve: %dX" #, c-format msgid "Owner: %s" @@ -116,28 +115,28 @@ msgstr "Képblokk beállításainak alkalmazása a belső albumokra is" msgid "Image Block Settings" -msgstr "KépBlokk Beállításai" +msgstr "Képblokk beállításai" msgid "Settings saved successfully" msgstr "Beállítások sikeresen elmentve" msgid "Show" -msgstr "Megmutat" +msgstr "Megjelenít" msgid "Heading" -msgstr "Fejléc" +msgstr "fejléc" msgid "Title" -msgstr "Cím" +msgstr "cím" msgid "Date" -msgstr "Dátum" +msgstr "dátum" msgid "View Count" -msgstr "Nézettségi Számláló" +msgstr "nézettségi számláló" msgid "Owner" -msgstr "Tulaj" +msgstr "tulajdonos" msgid "Frames" msgstr "Keretek" @@ -146,7 +145,7 @@ msgstr "Minta megtekintése" msgid "Album Frame" -msgstr "Album kerete" +msgstr "Albumkeret" msgid "Photo Frame" msgstr "Fényképkeret" @@ -155,10 +154,10 @@ msgstr "Mentés" msgid "Reset" -msgstr "Alapbeállítása" +msgstr "Alapbeállítás" msgid "External Image Block" -msgstr "Külső KépBlokk" +msgstr "Külső képblokk" msgid "" "Use a PHP block like the one shown below to include an image block in a PHP page outside of " @@ -207,7 +206,7 @@ msgstr "" msgid "Image frame to use around albums" -msgstr "" +msgstr "Az albumokhoz használandó keret" msgid "If a parameter marked with * is omitted then the site default defined above is used." msgstr "" @@ -265,7 +264,7 @@ msgstr "Hónap albuma" msgid "Number of items" -msgstr "" +msgstr "Elemek száma" msgid "Use default settings" msgstr "Alapértelmezett beállítások használata" @@ -284,6 +283,3 @@ msgid "Show owner" msgstr "Tulajdonos mutatása" - -#~ msgid "Random/Popular" -#~ msgstr "Véletlen/Népszerű" Modified: trunk/gallery2/modules/imageframe/locale/hu/LC_MESSAGES/modules_imageframe.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/imageframe/po/hu.po =================================================================== --- trunk/gallery2/modules/imageframe/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/imageframe/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,97 +16,101 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# +# +# Previous translators (as far as known, add yourself here, please): +# - Jozsef R.Nagy <jo...@si...> +# msgid "" msgstr "" "Project-Id-Version: Gallery: ImageFrame 1.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-11-04 20:10+0100\n" -"PO-Revision-Date: 2006-01-06 14:55+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-19 20:01+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "Image Frame Samples" -msgstr "KépKeret minták" +msgstr "Képkeret minták" msgid "ImageFrame" -msgstr "KépKeret" +msgstr "Képkeret" msgid "Render frames around images" -msgstr "Keret elhelyezése a képek körul" +msgstr "Keret elhelyezése a képek körül" msgid "Display" -msgstr "Kijelző" +msgstr "Kijelzés" msgid "Solid" -msgstr "Kitöltés" +msgstr "vonalas" msgid "None" -msgstr "Semmi" +msgstr "nincs keret" msgid "Bamboo" -msgstr "Bambusz" +msgstr "bambusz" msgid "Book" -msgstr "Könyv" +msgstr "könyv" msgid "Branded Wood" -msgstr "Égetett fa" +msgstr "égetett fa" msgid "Dot Apple" -msgstr "Pöttyös Apple" +msgstr "pöttyös/csíkos alma" msgid "Dots" -msgstr "Pontozott" +msgstr "pontozott" msgid "Film Edges" -msgstr "" +msgstr "filmszél" msgid "Flicking" -msgstr "Lapozós" +msgstr "lapozós" msgid "Gold" -msgstr "Aranyozott" +msgstr "aranyozott" msgid "Gold 2" -msgstr "Aranyozott 2" +msgstr "aranyozott 2" msgid "Spiral Notebook" -msgstr "Spirálfüzet" +msgstr "spirálfüzet" -#, fuzzy msgid "Spiral Notebook (square)" -msgstr "Spirálfüzet" +msgstr "spirálfüzet (négyzetes)" msgid "Photo Corners" -msgstr "" +msgstr "fényképsarok" msgid "Photo Corners - Small" -msgstr "" +msgstr "fényképsarok (kicsi)" msgid "Polaroid" -msgstr "Polaroid" +msgstr "polaroid" msgid "Polaroids" -msgstr "Polaroidok" +msgstr "polaroidok" msgid "Postage" -msgstr "" +msgstr "postabélyeg" msgid "Shadow" -msgstr "Árnyék" +msgstr "árnyékolt" msgid "Shells" -msgstr "Kő" +msgstr "kagylós" msgid "Slide" -msgstr "Dia" +msgstr "dia" msgid "Slide (square)" -msgstr "" +msgstr "dia (négyzetes)" msgid "Wood" -msgstr "Fa" +msgstr "fa" Modified: trunk/gallery2/modules/quotas/locale/hu/LC_MESSAGES/modules_quotas.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/quotas/po/hu.po =================================================================== --- trunk/gallery2/modules/quotas/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/quotas/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,154 +16,157 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> -# -# , fuzzy +# - Jozsef R.Nagy <jo...@si...># # -# msgid "" msgstr "" "Project-Id-Version: Gallery: Quotas 1.0.7\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:38-0800\n" -"PO-Revision-Date: 2006-01-06 17:02+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-20 17:16+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: KBabel 1.11.4\n" msgid "KB" -msgstr "" +msgstr "KB" msgid "MB" -msgstr "" +msgstr "MB" msgid "GB" -msgstr "" +msgstr "GB" #, c-format msgid "Warning: You have reached your disk quota (%s %s), this item will not be added." msgstr "" +"Figyelmeztetés: elérted a beállított kvótát (%s %s), ezt az elemet már nem tudom hozzáadni." #, c-format msgid "You are using %s %s of your allotted %s %s." -msgstr "" +msgstr "Felhasználva: %s %s Kiosztott: %s %s" msgid "Quotas" -msgstr "" +msgstr "Kvóták" msgid "User/Group Disk Quotas" -msgstr "" +msgstr "Felhasználói/csoport kvóták" msgid "Gallery" msgstr "Galéria" msgid "Create A New Group Quota" -msgstr "" +msgstr "Új csoportkvóta létrehozása" msgid "Group Name" msgstr "Csoportnév" msgid "(required)" -msgstr "(szükséges)" +msgstr "(megadása kötelező)" #, c-format msgid "Group quota for '%s' already exists" -msgstr "" +msgstr "Már van ilyen csoport kvóta: %s" msgid "Quota Size" -msgstr "" +msgstr "Kvóta méret" msgid "You must enter a quota size." -msgstr "" +msgstr "Kvóta méret megadása kötelező." msgid "Quota size must be less than 2097152 MB (2048 GB)." -msgstr "" +msgstr "A kvóta méret kevesebb kell legyen, mint 2097152MB (2048GB)." msgid "Invalid quota size, positive numbers and decimals only." -msgstr "" +msgstr "Érvénytelen kvóta méret: csak pozitív egész és tört számok használhatók." msgid "Create Group Quota" -msgstr "" +msgstr "Csoport kvóta létrehozása" msgid "Cancel" msgstr "Mégsem" msgid "Create A New User Quota" -msgstr "" +msgstr "Új felhasználói kvóta létrehozása" msgid "User Name" -msgstr "" +msgstr "Felhasználói név" #, c-format msgid "User quota for '%s' already exists" -msgstr "" +msgstr "Már van ilyen felhasználói kvóta: %s" msgid "Create User Quota" -msgstr "" +msgstr "Felhasználói kvóta létrehozása" msgid "Delete A Group Quota" -msgstr "" +msgstr "Csoport kvóta törlése" msgid "Are you sure?" -msgstr "Biztosan?" +msgstr "Biztos?" #, c-format msgid "This will completely remove the %s (%s %s) group quota from Gallery. There is no undo!" msgstr "" +"Ez véglegesen törli a(z) %s (%s %s) csoport kvótát a Galériából. Visszaállítási lehetőség " +"nincs!" msgid "Delete" msgstr "Törlés" msgid "Delete A User Quota" -msgstr "" +msgstr "Felhasználói kvóta törlése" #, c-format msgid "This will completely remove the %s (%s %s) user quota from Gallery. There is no undo!" msgstr "" +"Ez mindenestől törli a(z) %s (%s %s) felhasználói kvótát a Galériából. Visszaállítási " +"lehetőség nincs!" msgid "Edit A Group Quota" -msgstr "" +msgstr "Csoport kvóta szerkesztése" msgid "Save" msgstr "Mentés" msgid "Undo" -msgstr "" +msgstr "Visszaállítás" msgid "Edit A User Quota" -msgstr "" +msgstr "Felhasználói kvóta szerkesztése" msgid "Quotas Administration" -msgstr "" +msgstr "Kvóta adminisztráció" #, c-format msgid "Removed group quota for '%s'" -msgstr "" +msgstr "%s csoport kvóta törölve" #, c-format msgid "Created group quota for '%s'" -msgstr "" +msgstr "%s csoport kvóta létrehozva" #, c-format msgid "Modified group quota for '%s'" -msgstr "" +msgstr "%s csoport kvóta módosítva" #, c-format msgid "Removed user quota for '%s'" -msgstr "" +msgstr "%s felhasználói kvóta törölve" #, c-format msgid "Created user quota for '%s'" -msgstr "" +msgstr "%s felhasználói kvóta létrehozva" #, c-format msgid "Modified user quota for '%s'" -msgstr "" +msgstr "%s felhasználói kvóta módosítva" msgid "" "This system will let you assign disk space quotas to users. By creating a group quota, any " @@ -171,41 +174,45 @@ "the highest quota of all the groups will be assigned. Although, if you create a user quota " "that will override any group quotas." msgstr "" +"Ez a rendszer lehetővé teszi diszk kvóták hozzárendelését az egyes felhasználókhoz. Csoport " +"kvóta létrehozásával a csoport bármelyik felhasználó tagja ezt a kvótát kapja meg. Ha egy " +"felhasználó több csoportnak is tagja, akkor a csoportokhoz rendelt legmagasabb kvótát kapja " +"az adott felhasználó. Felhasználói kvóta létrehozása minden csoport kvótát felülír." #, c-format msgid "There is %d group quota in the system." msgid_plural "There are %d total group quotas in the system." -msgstr[0] "" +msgstr[0] "%d csoport kvóta van a rendszerben." msgid "Group Quotas" -msgstr "" +msgstr "Csoport kvóták" msgid "Create Quota" -msgstr "" +msgstr "Kvóta létrehozása" msgid "Edit Quota" -msgstr "" +msgstr "Kvóta szerkesztése" msgid "Delete Quota" -msgstr "" +msgstr "Kvóta törlése" #, c-format msgid "Group quota for '%s' does not exist. You must create one first." -msgstr "" +msgstr "A(z) %s csoport kvóta még nem létezik, azt előbb létre kell hozni." #, c-format msgid "Group quota for '%s' already exists." -msgstr "" +msgstr "Már van ilyen csoport kvóta: %s" #, c-format msgid "Group '%s' does not exist." -msgstr "Nem létezik a '%s' csoport" +msgstr "A(z) %s csoport nem létezik." msgid "You must enter a group name" msgstr "Adj meg egy csoportnevet" msgid "Edit Group Quotas (by list)" -msgstr "" +msgstr "Csoport kvóták szerkesztése (lista alapján)" msgid "« first" msgstr "«·első" @@ -224,7 +231,7 @@ msgstr "utolsó »" msgid "Quota" -msgstr "" +msgstr "Kvóta" msgid "Action" msgstr "Művelet" @@ -238,46 +245,46 @@ #, c-format msgid "There is %d user quota in the system." msgid_plural "There are %d total user quotas in the system." -msgstr[0] "" +msgstr[0] "%d felhasználói kvóta van a rendszerben." msgid "User Quotas" -msgstr "" +msgstr "Felhasználói kvóták" #, c-format msgid "User quota for '%s' does not exist. You must create one first." -msgstr "" +msgstr "A(z) %s felhasználói kvóta még nem létezik, azt előbb létre kell hozni." #, c-format msgid "User quota for '%s' already exists." -msgstr "" +msgstr "Már van ilyen felhasználói kvóta: %s" #, c-format msgid "User '%s' does not exist." -msgstr "'%s' felhasználó nem létezik." +msgstr "Nincs ilyen felhasználó: %s" msgid "You must enter a username" msgstr "Adj meg egy felhasználónevet" msgid "Edit User Quotas (by list)" -msgstr "" +msgstr "Felhasználói kvóták szerkesztése (lista alapján)" msgid "Username" msgstr "Felhasználónév" #, c-format msgid "Used: %0.2f %s (%s%%)" -msgstr "" +msgstr "Felhasználva: %0.2f %s (%s%%)" #, c-format msgid "Quota: %0.2f %s" -msgstr "" +msgstr "Kvóta: %0.2f %s" #, c-format msgid "Used: %0.2f %s" -msgstr "" +msgstr "Felhasználva: %0.2f %s" msgid "Quota: Unlimited" -msgstr "" +msgstr "Kvóta: korlátlan" msgid "User Quota Block" -msgstr "" +msgstr "Felhasználói kvóta blokk" Modified: trunk/gallery2/modules/rearrange/locale/hu/LC_MESSAGES/modules_rearrange.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/rearrange/po/hu.po =================================================================== --- trunk/gallery2/modules/rearrange/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/rearrange/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -17,59 +17,64 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # +# Previous translators (as far as known, add yourself here, please): +# - Jozsef R.Nagy <jo...@si...> +# msgid "" msgstr "" "Project-Id-Version: Gallery: Rearrange 1.0.4\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:38-0800\n" -"PO-Revision-Date: 2006-01-06 17:15+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-16 21:56+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "rearrange items" -msgstr "Elemek átrendezése (egyszerű)" +msgstr "elemek átrendezése" msgid "Rearrange" msgstr "Átrendezés" msgid "Rearrange the order of album items all at once" -msgstr "Az összes albumelem helyzete egyszerre változtatható" +msgstr "Az összes albumelem helyzetének egyszerre történő megváltoztatása" msgid "Gallery" msgstr "Galéria" msgid "Rearrange Items" -msgstr "Elemek Átrandezés" +msgstr "Elemek sorrendje " msgid "Rearrange Album" -msgstr "Albumok Átrendezése" +msgstr "Az albumon belüli elemek sorrendjének megváltoztatása" msgid "" "This album has an automatic sort order specified, so you cannot change the order of items " "manually. You must remove the automatic sort order to continue." msgstr "" -"Ehhez az albumhoz automatikus rendezés van megadva, így nem tudod manuálisán változtatni az " -"elemek sorrendjét. A változtatáshoz kapcsold ki az automatikus rendezést!" +"Ehhez az albumhoz automatikus rendezés van megadva, így nem tudod manuálisan megváltoztatni " +"az elemek sorrendjét. A változtatáshoz kapcsold ki az automatikus rendezést!" msgid "change" msgstr "változtatás" msgid "Order saved successfully" -msgstr "Sorrend sikeresen elmetve" +msgstr "Sorrend sikeresen elmetve." #, c-format msgid "" "Change the order of the items in this album.%s Click an item to move, then click the new " "location." msgstr "" -"Változtasd meg az elemek sorrendjét ebben az albumban. %s Kattints a mozgatni kívánt képre, " -"majd annak új helyére." +"Az albumon belül most átrendezheted az egyes elemek sorrendjét.%sKattints a mozgatni kívánt " +"elemre, majd annak új helyére." msgid "Save" -msgstr "Mentés" +msgstr "Rögzítés" msgid "Reset" -msgstr "Vissza" +msgstr "Visszaállítás" Modified: trunk/gallery2/modules/rewrite/locale/hu/LC_MESSAGES/modules_rewrite.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/rewrite/po/hu.po =================================================================== --- trunk/gallery2/modules/rewrite/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/rewrite/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -25,7 +25,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Gallery: URL Rewrite 1.1.10\n" +"Project-Id-Version: Gallery: URL Rewrite 1.1.11\n" "Report-Msgid-Bugs-To: gal...@li...\n" "POT-Creation-Date: 2006-12-20 09:38-0800\n" "PO-Revision-Date: 2006-01-06 17:02+0100\n" Modified: trunk/gallery2/modules/search/locale/hu/LC_MESSAGES/modules_search.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/search/po/hu.po =================================================================== --- trunk/gallery2/modules/search/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/search/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,25 +16,28 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# # +# # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # msgid "" msgstr "" "Project-Id-Version: Gallery: Search 1.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-23 11:29+0100\n" -"PO-Revision-Date: 2006-01-06 15:00+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-18 00:07+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Gallery Search" -msgstr "Keresés a galériában" +msgstr "Keresés a Galériában" msgid "Search" msgstr "Keresés" @@ -43,22 +46,22 @@ msgstr "Keresés a Galériádban" msgid "Gallery" -msgstr "Gallery" +msgstr "Galéria" msgid "Search the Gallery" -msgstr "Keresés a galériában" +msgstr "Keresés a Galériában" msgid "You must enter some text to search for!" -msgstr "Adjon meg legalább egy kulcsszót a kereséshez!" +msgstr "Adj meg legalább egy kulcsszót a kereséshez!" msgid "Check All" -msgstr "Mind bekapcsolása" +msgstr "Mindegyik bejelölése" msgid "Uncheck All" -msgstr "Mind kikapcsolása" +msgstr "Mindegyik törlése" msgid "Invert" -msgstr "Megfordít" +msgstr "Fordítva" #, c-format msgid "Results %d - %d" @@ -66,27 +69,27 @@ #, c-format msgid "Show all %d" -msgstr "Mind a(z) %d mutatása" +msgstr "Mind a(z) %d megjelenítése" msgid "No thumbnail" msgstr "Nincs előnézeti kép" msgid "No results found for" -msgstr "Nincs találat a kovetkezőre: " +msgstr "Nincs találat a következőre: " msgid "View these results in a slideshow" -msgstr "Eredmény megjelenítése diavetítéskent" +msgstr "Eredmény megjelenítése diavetítésként" -#, fuzzy, c-format +#, c-format msgid "%s Search Results for " -msgstr "%s Keresési Eredmény a következőre:" +msgstr "%s keresési eredmény a következőre:" msgid "Search All Modules" -msgstr "Keresés Minden Modulban" +msgstr "Keresés minden modulban" #, c-format msgid "Results %d - %d of %d, Page %d of %d" -msgstr "Találat %d - %d/%d, Oldal %d/%d" +msgstr "%d - %d/%d találat, %d/%d oldal" msgid "« Back" msgstr "« Vissza" @@ -94,16 +97,14 @@ msgid "Next »" msgstr "Következő »" -#, fuzzy msgid "Please enter a search term." -msgstr "Adjon meg egy kulcsszót a kereséshez." +msgstr "Adj meg egy kulcsszót a kereséshez." msgid "Advanced Search" -msgstr "Speciális Keresés" +msgstr "Speciális keresés" msgid "Search box" msgstr "Keresési mező" -#, fuzzy msgid "Show advanced link" msgstr "Speciális link megjelenítése" Modified: trunk/gallery2/modules/slideshow/locale/hu/LC_MESSAGES/modules_slideshow.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/slideshow/po/hu.po =================================================================== --- trunk/gallery2/modules/slideshow/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/slideshow/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -16,21 +16,24 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -# +# # Previous translators (as far as known, add yourself here, please): # - Gergely Dömsödi <do...@uh...> +# - Jozsef R.Nagy <jo...@si...> # msgid "" msgstr "" "Project-Id-Version: Gallery: Slideshow 1.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-23 11:29+0100\n" -"PO-Revision-Date: 2006-01-06 16:52+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-16 17:55+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Slideshow" msgstr "Diavetítés" @@ -39,12 +42,11 @@ msgid "Slideshow for %s" msgstr "%s diavetítése" -#, fuzzy msgid "Display" -msgstr "Kijelzés" +msgstr "Megjelenítés" msgid "View Slideshow" -msgstr "Diavetítés Megtekintése" +msgstr "Diavetítés" msgid "Path to an item (eg, /album/image.jpg.html)" msgstr "Egy elem elérési útja (pl: /album/image.jpg.html)" @@ -83,7 +85,6 @@ msgid "Rain" msgstr "Eső" -#, fuzzy msgid "Slide" msgstr "Dia" @@ -100,10 +101,10 @@ msgstr "Véletlenszerű" msgid "This album has no photos to show in a slideshow." -msgstr "Az album nem tartalmaz képeket." +msgstr "Az album nem tartalmaz diavetítővel megjeleníthető képeket." msgid "Back to Album View" -msgstr "Visszalépés az album nézethez" +msgstr "Vissza az album nézethez." #, c-format msgid "Date: %s" @@ -189,6 +190,3 @@ msgid "fade: " msgstr "áthatás: " - -#~ msgid "view slideshow" -#~ msgstr "diavetítés megtekintése" Modified: trunk/gallery2/modules/useralbum/locale/hu/LC_MESSAGES/modules_useralbum.mo =================================================================== (Binary files differ) Modified: trunk/gallery2/modules/useralbum/po/hu.po =================================================================== --- trunk/gallery2/modules/useralbum/po/hu.po 2007-02-22 19:33:08 UTC (rev 15855) +++ trunk/gallery2/modules/useralbum/po/hu.po 2007-02-22 21:47:12 UTC (rev 15856) @@ -17,55 +17,58 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # +# Previous translators (as far as known, add yourself here, please): +# - Jozsef R.Nagy <jo...@si...>\n" +# msgid "" msgstr "" "Project-Id-Version: Gallery: User Albums 1.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-09-02 13:36+0200\n" -"PO-Revision-Date: 2006-01-06 16:02+0100\n" -"Last-Translator: Jozsef R.Nagy <jo...@si...>\n" -"Language-Team: Hungarian <gal...@li...>\n" +"PO-Revision-Date: 2007-02-17 23:41+0100\n" +"Last-Translator: Sandor Dibuz <ha...@dw...>\n" +"Language-Team: magyar <gal...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Hungarian\n" -"X-Poedit-Country: HUNGARY\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "When user is created" -msgstr "Amikor a Felhasználó létrejön" +msgstr "a felhasználó létrehozásakor" msgid "When first accessed" -msgstr "Az első belépéskor" +msgstr "az első belépéskor" msgid "Everybody" -msgstr "Mindenki" +msgstr "mindenki" msgid "Registered Users" -msgstr "Regisztrált Felhasználók" +msgstr "regisztrált felhasználók" msgid "User Only" -msgstr "Csak Felhasználó" +msgstr "csak felhasználó" msgid "Yes" -msgstr "Igen" +msgstr "igen" msgid "No" -msgstr "Nem" +msgstr "nem" msgid "User Albums" -msgstr "Felhasználói Albumok" +msgstr "Felhasználói albumok" msgid "Create an album for each new user" -msgstr "Album létrehozása mindenk új Felhasználóhoz" +msgstr "Album létrehozása minden új felhasználóhoz" msgid "Gallery" msgstr "Galéria" msgid "Your Album" -msgstr "Te albumod" +msgstr "A te albumod" msgid "User Album Settings" -msgstr "Felhasználói Albumok Beállításai" +msgstr "Felhasználói albumbeállítások" msgid "Settings saved successfully" msgstr "Beállítások sikeresen elmentve" @@ -73,17 +76,17 @@ msgid "" "An album will be created for each user. The user will have full permissions on the album." msgstr "" -"Minden Felhasználó számára fog készülni egy album. A Felhasználónak teljes jogosultsága lesz " +"Minden felhasználó részére fog készülni egy album. A felhasználónak teljes jogosultsága lesz " "az albumra." msgid "Create albums" msgstr "Albumok létrehozása" msgid "Albums viewable by" -msgstr "Albumokat megtekintheti:" +msgstr "Albumokat megtekinthetik" msgid "Full size images viewable" -msgstr "Teljesméretű kepeket megtekinthetoek" +msgstr "Teljesméretű képeket megtekinthetik" msgid "Location for new user albums" msgstr "Az új felhasználói albumok helye" @@ -92,16 +95,16 @@ msgstr "Bejelentkező oldal" msgid "Jump to user album after login" -msgstr "Ugrás a Felhasználó albumára bejelentkezés után" +msgstr "ugrás a felhasználó albumára bejelentkezés után" msgid "Link to user album" -msgstr "Link a Felhasználó albumára" +msgstr "Link a felhasználó albumára" msgid "Show link" -msgstr "Link megjelenítése" +msgstr "link megjelenítése" msgid "Save" msgstr "Mentés" msgid "Reset" -msgstr "Alapbeállítás" +msgstr "Visszaállítás" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ... [truncated message content] |
From: <an...@us...> - 2007-02-23 16:25:21
|
Revision: 15865 http://svn.sourceforge.net/gallery/?rev=15865&view=rev Author: andy_st Date: 2007-02-23 08:25:21 -0800 (Fri, 23 Feb 2007) Log Message: ----------- - Add URL 'options' to the rewrite rule format - Fix the httpauth authorization rewrite rule - Refactor isapi_rewrite syntax to use RewriteCond instead of RewriteRule for patterns See review 108, this patch is 99% jablko's work. Details: - rewrite rules can now include generateUrl options. Thus rewrite rules have now full control over the target URL - This feature is used in httpauth's authorization rewrite rule to define the baseUrl of the target as REQUEST_URI. -> The rule now just appends a query param instead of redirecting to main.php. - Moved pattern matching from RewriteRule to RewriteCond in isapi_rewrite. -> isapi_rewrite and mod_rewrite syntax are now much more similar. -> Enables the httpauth authorization rule fix. - Removing duplicatation in generateUrl options by extracting the code and moving it into RewriteHelper. Modified Paths: -------------- trunk/gallery2/modules/httpauth/module.inc trunk/gallery2/modules/rewrite/classes/RewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class trunk/gallery2/modules/rewrite/templates/Httpdini.tpl trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class Modified: trunk/gallery2/modules/httpauth/module.inc =================================================================== --- trunk/gallery2/modules/httpauth/module.inc 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/httpauth/module.inc 2007-02-23 16:25:21 UTC (rev 15865) @@ -294,6 +294,7 @@ array('test' => 'QUERY_STRING', 'pattern' => '!' . GalleryUtilities::prefixFormVariable( 'authorization') . '=')), + 'options' => array('baseUrl' => '%{REQUEST_URI}'), 'flags' => array('QSA'), 'keywords' => array( 'authorization' => array( Modified: trunk/gallery2/modules/rewrite/classes/RewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/rewrite/classes/RewriteHelper.class 2007-02-23 16:25:21 UTC (rev 15865) @@ -213,6 +213,21 @@ $rules[$ruleId]['match'], $rules[$ruleId]['queryString']); } + /* Options */ + if (empty($rules[$ruleId]['options'])) { + $rules[$ruleId]['options'] = array(); + } + + /* Merge with default options. Later values override defaults. */ + $rules[$ruleId]['options'] = array_merge( + array('forceDirect' => isset($rules[$ruleId]['queryString']['view']) + && $rules[$ruleId]['queryString']['view'] == 'watermark.DownloadItem', + 'forceServerRelativeUrl' => true, + 'forceSessionId' => false, + 'htmlEntities' => false, + 'urlEncode' => false, + 'useAuthToken' => false), $rules[$ruleId]['options']); + /* Build the list of flags to apply to this rule */ if (isset($rules[$ruleId]['flags']) && isset($flags)) { $rules[$ruleId]['flags'] = array_merge( @@ -260,6 +275,7 @@ $regexRule = array(); $regexRule['keywords'] = array(); $regexRule['queryString'] = $rule['queryString']; + $regexRule['options'] = $rule['options']; $regexRule['flags'] = $rule['flags']; /* Modified: trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/rewrite/classes/parsers/isapirewrite/IsapiRewriteHelper.class 2007-02-23 16:25:21 UTC (rev 15865) @@ -200,7 +200,7 @@ $Httpdini['baseFile'] = GALLERY_MAIN_PHP; $Httpdini['host'] = preg_quote(GalleryUtilities::getServerVar('SERVER_NAME')); if ($embedded) { - $Htaccess['baseFile'] = $urlGenerator->_file[false]; + $Httpdini['baseFile'] = $urlGenerator->_file[false]; list ($ret, $Httpdini['directory']) = GalleryCoreApi::getPluginParameter( 'module', 'rewrite', 'isapirewrite.embeddedLocation'); if ($ret) { @@ -318,17 +318,12 @@ 'pattern' => $Httpdini['host']); /* Pattern */ - if (empty($regexRule['pattern'])) { - $regexRule['pattern'] = '[^?]*'; + if (!empty($regexRule['pattern'])) { + $regexRule['conditions'][] = array( + 'test' => 'URL', + 'pattern' => $Httpdini['rewriteBase'] . $regexRule['pattern'] . '(?:\\?.*)?'); } - /* - * ISAPI_Rewrite matches the query string, so optionally match it with non-marking - * parentheses and match the query string excluding '?' so it can be appended to the - * substitution. - */ - $regexRule['pattern'] .= '(?:\\?(.*))?'; - /* Substitution */ $params = $regexRule['queryString']; foreach ($regexRule['keywords'] as $reference => $name) { @@ -340,28 +335,32 @@ } $regexRule['substitution'] = $galleryUrlGenerator->generateUrl( - $params, array('forceDirect' => isset($params['view']) - && $params['view'] == 'watermark.DownloadItem', - 'forceServerRelativeUrl' => true, - 'forceSessionId' => false, - 'htmlEntities' => false, - 'urlEncode' => false, - 'useAuthToken' => false)); + $params, $regexRule['options']); /* Convert references from mod_rewrite style to isapi_rewrite style */ $regexRule['substitution'] = preg_replace('/%(\d+)/', '$\1', $regexRule['substitution']); + /* + * ISAPI_Rewrite doesn't support the %{QUERY_STRING} or %{REQUEST_URI} variables but + * the last sub-expression, count($regexRules['keywords'] + 1, matches %{QUERY_STRING} + * and the second last sub-expression, count($regexRules['keywords']), matches + * %{REQUEST_URI} + */ + $regexRule['substitution'] = str_replace('%{REQUEST_URI}', + '$' . count($regexRule['keywords']), $regexRule['substitution']); + $regexRule['substitution'] = str_replace('%{QUERY_STRING}', + '$' . (count($regexRule['keywords']) + 1), $regexRule['substitution']); + /* Flags */ if (!empty($regexRule['flags'])) { /* - * ISAPI_Rewrite doesn't support the 'QSA' flag, but we can append the query string - * by modifying our regular expression. count($regexRule['keywords']) is the last - * sub-expression. + * ISAPI_Rewrite doesn't support the 'QSA' flag but we can append the query string + * with the last sub-expression, count($regexRules['keywords'] + 1 */ if (in_array('QSA', $regexRule['flags'])) { $regexRule['substitution'] .= (strpos($regexRule['substitution'], '?') === false - ? '?' : '&') . '$' . count($regexRule['keywords']); + ? '?' : '&') . '$' . (count($regexRule['keywords']) + 1); } /* Modified: trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class =================================================================== --- trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/rewrite/classes/parsers/modrewrite/ModRewriteHelper.class 2007-02-23 16:25:21 UTC (rev 15865) @@ -296,13 +296,7 @@ } $regexRule['substitution'] = $galleryUrlGenerator->generateUrl( - $params, array('forceDirect' => isset($params['view']) - && $params['view'] == 'watermark.DownloadItem', - 'forceServerRelativeUrl' => true, - 'forceSessionId' => false, - 'htmlEntities' => false, - 'urlEncode' => false, - 'useAuthToken' => false)); + $params, $regexRule['options']); $regexRules[$ruleId] = $regexRule; } Modified: trunk/gallery2/modules/rewrite/templates/Httpdini.tpl =================================================================== --- trunk/gallery2/modules/rewrite/templates/Httpdini.tpl 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/rewrite/templates/Httpdini.tpl 2007-02-23 16:25:21 UTC (rev 15865) @@ -17,7 +17,7 @@ {/foreach} {/if} -RewriteRule {$Httpdini.rewriteBase}{$rule.pattern} {$rule.substitution}{if !empty($rule.flags)} [{$rule.flags|@implode:","}]{/if} +RewriteRule ([^?]*)(?:\?(.*))? {$rule.substitution}{if !empty($rule.flags)} [{$rule.flags|@implode:","}]{/if} {/foreach} Modified: trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class =================================================================== --- trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class 2007-02-23 14:38:16 UTC (rev 15864) +++ trunk/gallery2/modules/rewrite/test/phpunit/RewriteHelperTest.class 2007-02-23 16:25:21 UTC (rev 15865) @@ -91,6 +91,10 @@ print $ret->getAsHtml(); return $this->failWithStatus($ret); } + + $this->_defaultOptions = array('forceDirect' => false, 'forceServerRelativeUrl' => true, + 'forceSessionId' => false, 'htmlEntities' => false, + 'urlEncode' => false, 'useAuthToken' => false); } function tearDown() { @@ -146,6 +150,7 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -159,6 +164,7 @@ $expectedRegexRules[] = array('pattern' => 'php/(.*)', 'keywords' => array(null, 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -177,6 +183,7 @@ $expectedRegexRules[] = array('pattern' => 'php/(.*)', 'keywords' => array(null, 'unit'), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -190,6 +197,7 @@ $expectedRegexRules[] = array('pattern' => 'p/([2])/([1])', 'keywords' => array(null, 'php', 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -208,6 +216,7 @@ 'queryString' => array('view' => 'php.Unit', 'subView' => 'php.Sub', 'static' => 'value'), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -221,6 +230,7 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('F1', 'F2')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('F1', 'F2'))); @@ -234,6 +244,7 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('C1', 'C2', 'F1')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('F1', 'F2'), @@ -248,6 +259,7 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('C1', 'C2')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, array('default' => array('C1', 'C2'), @@ -266,6 +278,7 @@ 'pattern' => '(.+)')), 'keywords' => array(null, 'authorization'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -295,6 +308,7 @@ 'pattern' => '!^$')), 'keywords' => array(null, 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('L')); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -307,6 +321,7 @@ $expectedRegexRules = array(); $expectedRegexRules[] = array('keywords' => array(null), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); @@ -320,10 +335,31 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, $expectedShortUrls, null, $activeRules, null); + /* Options */ + $activeRules = array(); + $activeRules['rewritehelpermock'][12] = array('pattern' => 'optionsTest'); + $expectedActiveRules = $activeRules; + $expectedShortUrls = array(); + $expectedShortUrls[] = array('match' => array('view' => 'php.Unit'), + 'pattern' => 'optionsTest'); + $expectedRegexRules = array(); + $expectedOptions = array('forceDirect' => true, 'forceServerRelativeUrl' => true, + 'forceSessionId' => false, 'htmlEntities' => false, + 'urlEncode' => false, 'useAuthToken' => false, + 'baseUrl' => 'BASE_URL'); + $expectedRegexRules[] = array('pattern' => 'optionsTest', + 'keywords' => array(null), + 'queryString' => array('view' => 'php.Unit'), + 'options' => $expectedOptions, + 'flags' => array()); + $tests[] = array($activeRules, REWRITE_STATUS_OK, $expectedRegexRules, + $expectedShortUrls, null, $activeRules, null); + foreach ($tests as $key => $test) { list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( $test[0], $this->_parser, null, $test[6]); @@ -392,10 +428,12 @@ $expectedRegexRules[] = array('pattern' => 'phpunit2', 'keywords' => array(null), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array()); $expectedRegexRules[] = array('pattern' => 'phpunit1', 'keywords' => array(null), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array()); list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( @@ -439,6 +477,7 @@ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('C1', 'C2')); /* Conditions */ $expectedRegexRules[] = array('conditions' => array( @@ -448,6 +487,7 @@ 'pattern' => '(.+)')), 'keywords' => array(null, 'authorization'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); /* Restrict */ $expectedRegexRules[] = array('conditions' => array( @@ -469,25 +509,30 @@ 'pattern' => '!^$')), 'keywords' => array(null, 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); /* Long pattern */ $expectedRegexRules[] = array('pattern' => 'phpunit', 'keywords' => array(null), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); /* Short pattern */ $expectedRegexRules[] = array('pattern' => 'p', 'keywords' => array(null), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); /* Regex pattern */ $expectedRegexRules[] = array('pattern' => 'php/(.*)', 'keywords' => array(null, 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); /* Empty pattern */ $expectedRegexRules[] = array('keywords' => array(null), 'queryString' => array('view' => 'php.Unit'), + 'options' => $this->_defaultOptions, 'flags' => array('QSA', 'L')); list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( @@ -515,6 +560,7 @@ $expectedRegexRules[] = array('pattern' => 'php\\.-/(.*)', 'keywords' => array(null, 'unit'), 'queryString' => array(), + 'options' => $this->_defaultOptions, 'flags' => array()); list ($ret, $code, $regexRules, $shortUrls, $errno) = RewriteHelper::parseActiveRules( @@ -645,6 +691,11 @@ $rules[9] = array('match' => array('view' => 'php.Unit'), 'pattern' => 'p'); + /* Rule 12: Options */ + $rules[12] = array('match' => array('view' => 'php.Unit'), + 'options' => array('forceDirect' => true, 'baseUrl' => 'BASE_URL'), + 'pattern' => 'optionsTest'); + return $rules; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-02-23 23:47:10
|
Revision: 15867 http://svn.sourceforge.net/gallery/?rev=15867&view=rev Author: andy_st Date: 2007-02-23 15:47:11 -0800 (Fri, 23 Feb 2007) Log Message: ----------- Including LGPL LICENSE file for Flash programs Added Paths: ----------- trunk/gallery2/modules/flashvideo/lib/LICENSE trunk/gallery2/modules/mp3audio/lib/LICENSE Added: trunk/gallery2/modules/flashvideo/lib/LICENSE =================================================================== --- trunk/gallery2/modules/flashvideo/lib/LICENSE (rev 0) +++ trunk/gallery2/modules/flashvideo/lib/LICENSE 2007-02-23 23:47:11 UTC (rev 15867) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Property changes on: trunk/gallery2/modules/flashvideo/lib/LICENSE ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native Added: trunk/gallery2/modules/mp3audio/lib/LICENSE =================================================================== --- trunk/gallery2/modules/mp3audio/lib/LICENSE (rev 0) +++ trunk/gallery2/modules/mp3audio/lib/LICENSE 2007-02-23 23:47:11 UTC (rev 15867) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Property changes on: trunk/gallery2/modules/mp3audio/lib/LICENSE ___________________________________________________________________ Name: svn:keywords + Author Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |