Commit 32eb34e7 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/7.x 35090 to 35187

Conflicts occured during the merge. (hopefully correctly fixed - authors please check - remember: whitespace counts!)
	tiki-edit_draw.php
	lib/setup/prefs.php
	lib/webmail/tikimaillib.php
	lib/prefs/email.php
	templates/tiki-admin_include_general.tpl
parent 0422df6d
......@@ -7623,7 +7623,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -7655,7 +7655,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -13556,7 +13556,7 @@ $lang=Array(
"Expiration Date" => "Data de caducitat",
"all types" => "tots els tipus",
"filter" => "filtra",
"Admin dsn" => "Administrar dsn",
"Admin DSN" => "Administrar dsn",
"Use Admin DSN to define the database to be used by the SQL plugin." => "Empra Admin DSN per definir la base de dades a ser emprada pel connector 'SQL plugin'.",
"Create/edit dsn" => "Crea/edita dsn",
"Create/Edit External Wiki" => "Crea/Edita un Wiki External",
......@@ -13463,7 +13463,7 @@ $lang=Array(
"Remove all cookies" => "移除所有cookies",
"Expiration Date" => "到期日",
"filter" => "过滤器",
"Admin dsn" => "管理 dsn",
"Admin DSN" => "管理 dsn",
"Create/edit dsn" => "创建/编辑 dsn",
"Create/Edit External Wiki" => "创建/编辑外部 Wiki",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (在URL中使用 \$page 来取代 page, 例如: http://www.example.com/tiki-index.php?page=\$page)",
......@@ -11568,7 +11568,7 @@ $lang=Array(
"Upload" => "Nahrát",
"Remove all cookies" => "Odstranit všechny cookies",
"Expiration Date" => "Datum expirace",
"Admin dsn" => "Administrace dsn",
"Admin DSN" => "Administrace dsn",
"Create/edit dsn" => "Vytvořit/upravit dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (použijte \$page pro nahrazení názvem stránky v URL: http://www.example.com/tiki-index.php?page=\$page)",
"ExtWiki" => "Extwiki",
......@@ -7540,7 +7540,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12856,7 +12856,7 @@ $lang=Array(
"Upload Cookies from textfile" => "Upload Cookies fra tekstfil",
"Upload from disk:" => "Upload fra harddisk",
"Remove all cookies" => "Fjern alle cookies",
"Admin dsn" => "Administrér dsn",
"Admin DSN" => "Administrér dsn",
"Create/edit dsn" => "Opret/rediger dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (brug \$page til at få sidens navn i URL eksempel: http://www.eksempel.dk/tiki-index.php?page=\$page)",
"ExtWiki" => "Eksternwiki",
......@@ -7562,7 +7562,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -8803,7 +8803,7 @@ $lang=Array(
"Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
"Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
"Purge" => "Purge",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
"Create/edit dsn" => "Create/edit dsn",
"Local (Tiki database)" => "Local (Tiki database)",
......@@ -7667,7 +7667,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -11389,7 +11389,7 @@ $lang=Array(
"Perso" => "Perso",
"CMS" => "CMS",
"cookie" => "cookie",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Coms" => "Coms",
"Meta Tags" => "Meta Tags",
"Watches" => "Watches",
......@@ -13038,7 +13038,7 @@ $lang=Array(
"Expiration Date" => "تاريخ انقضا",
"all types" => "تمام موارد",
"filter" => "فيلتر",
"Admin dsn" => "مديريت DSNها",
"Admin DSN" => "مديريت DSNها",
"Create/edit dsn" => "ايجاد/ويرايش dsn",
"Create/Edit External Wiki" => "ايجاد/تغيير ويكي‌هاي خارجي‌",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (از \$page براي جايگزيني نام صفحه در URL استفاده كنيد، مانند: http://www.example.com/tiki-index.php?page=\$page)",
......@@ -13233,7 +13233,7 @@ $lang=Array(
"Expiration Date" => "Viimeinen Päivä",
"all types" => "kaikki tyypit",
"filter" => "suodin",
"Admin dsn" => "Ylläpidä dsn",
"Admin DSN" => "Ylläpidä dsn",
"Use Admin DSN to define the database to be used by the SQL plugin." => "Käytä Ylläpidä DSN määrittääksesi tietokannan jota SQL plugin käyttää.",
"Create/edit dsn" => "Luo/muokkaa dsn",
"Create/Edit External Wiki" => "Luo/muuta Ulkoinen Wiki",
......@@ -7513,7 +7513,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -7715,7 +7715,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12938,7 +12938,7 @@ $lang=Array(
"Expiration Date" => "Data de expiración",
"all types" => "todos os tipos",
"filter" => "filtrar",
"Admin dsn" => "Administrar dsn",
"Admin DSN" => "Administrar dsn",
"Create/edit dsn" => "Crear/editar dsn",
"Create/Edit External Wiki" => "Crear/Editar Wiki externo",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (usa \$page para ser substituído polo nome de páxina na URL exemplo: http://www.exemplo.com/tiki-index.php?page=\$page)",
......@@ -7869,7 +7869,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -12720,7 +12720,7 @@ $lang=Array(
"Upload" => "Prenesi",
"Remove all cookies" => "Ukloni sve kolačiće",
"cookie" => "kolačić",
"Admin dsn" => "Administracija dsn",
"Admin DSN" => "Administracija dsn",
"Create/edit dsn" => "Napravi/izmijeni dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (koristite \$page da se zamijeni sa nazivom stranice u URL, primjer: http://www.example.com/tiki-index.php?page=\$page)",
"ExtWiki" => "Vanjski tiki",
......@@ -12430,7 +12430,7 @@ $lang=Array(
"Restore" => "Visszaállítás",
"all types" => "összes típus",
"filter" => "szűrés",
"Admin dsn" => "DSN adatbáziskapcsolatok beállítása",
"Admin DSN" => "DSN adatbáziskapcsolatok beállítása",
"Use Admin DSN to define the database to be used by the SQL plugin." => "DSN (Data Source Name - Adatforrás neve) adatbáziskapcsolatok megadásával lehet megadni az SQL plugin által használt adatbázisokat",
"Create/edit dsn" => "DSN létrehozása/szerkesztése",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (használjon \$lap kifejezést a lap nevével, mint az alábbi példában: http://www.example.com/tiki-index.php?page=\$page)",
......@@ -7712,7 +7712,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -7217,7 +7217,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12191,7 +12191,7 @@ $lang=Array(
"Templates" => "Templates",
"Upload" => "Upload",
"cookie" => "cookie",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Coms" => "Coms",
"Moderator user" => "Moderator user",
"Moderator group" => "Moderator group",
......@@ -7663,7 +7663,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -11964,7 +11964,7 @@ $lang=Array(
"Edit this template:" => "Edit this template:",
"Create new template" => "Create new template",
"Templates" => "Templates",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Create/edit dsn" => "Create/edit dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)",
"Admin Hotwords" => "Admin Hotwords",
......@@ -7929,7 +7929,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -7693,7 +7693,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12894,7 +12894,7 @@ $lang=Array(
"Creation Date" => "Aanmaakdatum",
"Expiration Date" => "Verloopdatum",
"all types" => "alle types",
"Admin dsn" => "Beheer dsn",
"Admin DSN" => "Beheer dsn",
"Create/edit dsn" => "Aanmaken/bewerken dsn",
"Create/Edit External Wiki" => "Maak aan/Bewerk Extern Wiki",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (gebruik \$pagina om deze te laten vervangen door de pagina in de URL, bijv http://www.example.com/tiki-index.php?page=\$pagina)",
......@@ -12059,7 +12059,7 @@ $lang=Array(
"CMS" => "CMS",
"cookie" => "cookie",
"filter" => "filter",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"port" => "port",
"dls" => "dls",
"URL:" => "URL:",
......@@ -11843,7 +11843,7 @@ $lang=Array(
"Upload from disk:" => "Upload from disk:",
"Remove all cookies" => "Remove all cookies",
"cookie" => "cookie",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Create/edit dsn" => "Create/edit dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)",
"Coms" => "Coms",
......@@ -13165,7 +13165,7 @@ $lang=Array(
"Creation Date" => "Data de criação",
"all types" => "todos os tipos",
"filter" => "filtro",
"Admin dsn" => "Administrar DSN",
"Admin DSN" => "Administrar DSN",
"Create/edit dsn" => "Criar/editar dsn",
"Create/Edit External Wiki" => "Criar/editar Wiki Externo",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "Endereço (use \$page para substituir pelo nome da página na URl. Exemplo: http://www.exemplo.com.br/tiki-index.php?page=\$page)",
......@@ -13053,7 +13053,7 @@ $lang=Array(
"Expiration Date" => "Validade",
"all types" => "todos os tipos",
"filter" => "filtro",
"Admin dsn" => "Administrar DSN",
"Admin DSN" => "Administrar DSN",
"Create/edit dsn" => "Criar/editar DSN",
"Create/Edit External Wiki" => "Criar/editar Wiki Externo",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "Endereço (use \$page para substituir pelo nome da página na URl. Exemplo: http://www.exemplo.com.br/tiki-index.php?page=\$page)",
......@@ -7681,7 +7681,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -7709,7 +7709,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12559,7 +12559,7 @@ $lang=Array(
"Upload" => "Закачать",
"Remove all cookies" => "Убрать все cookies",
"filter" => "фильтр",
"Admin dsn" => "Управлять DSN",
"Admin DSN" => "Управлять DSN",
"Create/edit dsn" => "Создать/редактировать DSN",
"Create/Edit External Wiki" => "Создать/Редактировать внешние Wiki",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (Используйте чтобы заменить именем страницы URL пример: http://www.example.com/tiki-index.php?page=)",
......@@ -12269,7 +12269,7 @@ $lang=Array(
"CMS" => "CMS",
"cookie" => "cookie",
"filter" => "filter",
"Admin dsn" => "Admin dsn",
"Admin DSN" => "Admin DSN",
"Coms" => "Coms",
"Age" => "Age",
"Moderator user" => "Moderator user",
......@@ -7663,7 +7663,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12709,7 +12709,7 @@ $lang=Array(
"Upload from disk:" => "Nahrať z disku:",
"Remove all cookies" => "Odstrániť všetky cookies",
"filter" => "filtrovať",
"Admin dsn" => "Administrácia dsn",
"Admin DSN" => "Administrácia dsn",
"Create/edit dsn" => "Vytvoriť/upraviť dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (použite \$page pre výmenu za názov stránky v URL; napr.: http://www.example.com/tiki-index.php?page=\$page)",
"ExtWiki" => "Extwiki",
......@@ -7138,7 +7138,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -7737,7 +7737,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12826,7 +12826,7 @@ $lang=Array(
"Remove all cookies" => "Ukloni sve kolačiće",
"cookie" => "kolačić",
"Expiration Date" => "Datum isticanja",
"Admin dsn" => "Administracija dsn",
"Admin DSN" => "Administracija dsn",
"Create/edit dsn" => "Napravi/izmeni dsn",
"Create/Edit External Wiki" => "Napravi/Izmeni eksterni Wiki",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (koristite \$page da se zameni sa nazivom stranice u URL primeru: http://www.example.com/tiki-index.php?page=\$page)",
......@@ -12839,7 +12839,7 @@ $lang=Array(
"Upload" => "Lägg in",
"Remove all cookies" => "Ta bort alla kakor",
"Expiration Date" => "Förfallodatum",
"Admin dsn" => "Admin. dsn",
"Admin DSN" => "Admin. dsn",
"Create/edit dsn" => "Skapa/redigera dsn",
"Create/Edit External Wiki" => "Skapa/Redigera extern Wiki",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (använd \$page för att ersatta URL exemplet: http://www.example.com/tiki-index.php?page=\$page)",
......@@ -7712,7 +7712,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -7689,7 +7689,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......
......@@ -12826,7 +12826,7 @@ $lang=Array(
"Upload" => "上傳",
"Remove all cookies" => "移除所有cookies",
"filter" => "過濾器",
"Admin dsn" => "管理 dsn",
"Admin DSN" => "管理 dsn",
"Create/edit dsn" => "建立/編輯 dsn",
"URL (use \$page to be replaced by the page name in the URL example: http://www.example.com/tiki-index.php?page=\$page)" => "URL (在URL中使用 \$page 來取代 page, 例如: http://www.example.com/tiki-index.php?page=\$page)",
"ExtWiki" => "外部wiki",
......@@ -8198,7 +8198,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -7252,7 +7252,7 @@ $lang=Array(
// "Display Bar Length Scaling Divisor" => "Display Bar Length Scaling Divisor",
// "Purge Expired and Used Credits (All Users)" => "Purge Expired and Used Credits (All Users)",
// "Purge" => "Purge",
// "Admin dsn" => "Admin dsn",
// "Admin DSN" => "Admin DSN",
// "Use Admin DSN to define the database to be used by the SQL plugin" => "Use Admin DSN to define the database to be used by the SQL plugin",
// "Create/edit dsn" => "Create/edit dsn",
// "Local (Tiki database)" => "Local (Tiki database)",
......@@ -55,6 +55,8 @@ function getHTMLPurifierTikiConfig() {
// Add usemap attribute to img tag
$def->addAttribute('img', 'usemap', 'CDATA');
// rel attribute for anchors
$def->addAttribute('a', 'rel', 'CDATA');
// Add map tag
$map = $def->addElement(
......
......@@ -156,7 +156,11 @@ class LogsLib extends TikiLib
$ip = $this->get_ip_address();
}
if ($client == '') {
$client = NULL;
if (!empty($_SERVER['HTTP_USER_AGENT'])) {
$client = substr($_SERVER['HTTP_USER_AGENT'],0,200);
} else {
$client = NULL;
}
} else {
$client = substr($client,0,200);
}
......
......@@ -178,8 +178,8 @@ function prefs_fgal_list() {
'default' => '',
),
'fgal_keep_fileId' => array(
'name' => tra('Keep fileId for archives'),
'description' => tra('Keep always the same fileId when replacing a file with archive'),
'name' => tra('Keep the same fileId for the latest version of a file'),
'description' => tra('If checked, the fileId of the latest version of a file stays the same. Link to a file will always give you the latest version. If not checked, the fileId is attached to the file for ever, link to file will give you the precise version of a file'),
'type' => 'flag',
'default' => 'n',
),
......
......@@ -62,6 +62,11 @@ function smarty_block_tabset($params, $content, &$smarty, &$repeat) {
setCookieSection( $smarty_tabset_name, $cookietab, 'tabs' ); // too late to set it here as output has started
}
// If the tabset specifies the tab, override any kind of memory
if (isset($params['cookietab'])) {
$cookietab = $params['cookietab'];
}
$smarty_tabset_i_tab = 1;
return;
......
......@@ -51,8 +51,9 @@ function s_f_attachments_actionshandler( $params ) {
global $smarty;
require_once $smarty->_get_plugin_filepath('function', 'query');
$galleryId = $filegallib->get_attachment_gallery( $params['page'], 'wiki page' );
$filegallib->actionHandler( 'uploadFile', array(
'galleryId' => $filegallib->get_attachment_gallery( $params['page'], 'wiki page' ),
'galleryId' => array($galleryId),
'comment' => $params['comment'],
'returnUrl' => smarty_function_query( array(
'_type' => 'absolute_path',
......
......@@ -514,7 +514,7 @@ function insertAt(elementId, replaceString, blockLevel, perLine, replaceSelectio
}
if (!$textarea.length && elementId === "fgal_picker") { // ckeditor file browser
$(".cke_dialog_contents").find("input:first").val(replaceString);
$(".cke_dialog_contents").find("input:first").val(replaceString.replace("&", "&"));
return;
} else if ($textarea.is(":input") && elementId === "fgal_picker_id") {
$textarea.val(replaceString);
......
......@@ -26,12 +26,14 @@ function wikiplugin_snarf_info() {
'name' => tra('Regular Expression Pattern'),
'description' => tra('PCRE-compliant regular expression pattern to find the parts you want changed'),
'default' => '',
'filter' => 'striptags'
),
'regexres' => array(
'required' => false,
'name' => tra('Regular Expression Replacement'),
'description' => tra('PCRE-compliant regular expression replacement syntax showing what the content should be changed to'),
'default' => '',
'filter' => 'striptags'
),
'wrap' => array(
'required' => false,
......@@ -42,13 +44,15 @@ function wikiplugin_snarf_info() {
array('text' => '', 'value' => ''),
array('text' => tra('Yes'), 'value' => 1),
array('text' => tra('No'), 'value' => 0)
)
),
'filter' => 'int',
),
'colors' => array(
'required' => false,
'name' => tra('Colors'),
'description' => tra('Syntax highlighting to use for code snippets. Available: php, html, sql, javascript, css, java, c, doxygen, delphi, ...'),
'default' => NULL
'default' => NULL,
'filter' => 'striptags'
),
'ln' => array(
'required' => false,
......@@ -59,7 +63,8 @@ function wikiplugin_snarf_info() {
array('text' => '', 'value' => ''),
array('text' => tra('Yes'), 'value' => 1),
array('text' => tra('No'), 'value' => 0)
)
),
'filter' => 'int'
),
'wiki' => array(
'required' => false,
......@@ -70,7 +75,8 @@ function wikiplugin_snarf_info() {
array('text' => '', 'value' => ''),
array('text' => tra('Yes'), 'value' => 1),
array('text' => tra('No'), 'value' => 0)
)
),
'filter' => 'int',
),
'rtl' => array(
'required' => false,
......@@ -81,7 +87,8 @@ function wikiplugin_snarf_info() {
array('text' => '', 'value' => ''),
array('text' => tra('Yes'), 'value' => 1),
array('text' => tra('No'), 'value' => 0)
)
),
'filter' => 'int'
),
'ishtml' => array(
'required' => false,
......@@ -92,19 +99,22 @@ function wikiplugin_snarf_info() {
array('text' => '', 'value' => ''),
array('text' => tra('Yes'), 'value' => 1),
array('text' => tra('No'), 'value' => 0)
)
),
'filter' => 'int'
),
'cache' => array(
'required' => false,
'name' => tra('Cache Url'),
'description' => tra('Cache time in minutes. Default is to use site preference, Set to 0 for no cache.'),
'default' => '',
'filter' => 'int'
),
'ajax' => array(
'required' => false,
'name' => tra('Label'),
'description' => tra('Text to click on to fetch the url via ajax'),
'default' => '',
'filter' => 'striptags'
),
),
);
......@@ -129,9 +139,9 @@ function wikiplugin_snarf($data, $params)
continue;
}
if (!empty($params['href'])) {
$params['href'] .= '&';
$params['href'] .= '&';
}
$params['href'] .= $key.'='.$value;
$params['href'] .= $key.'='.urlencode($value);
}
$smarty->assign('snarfParams', $params);
return $smarty->fetch('wiki-plugins/wikiplugin_snarf.tpl');
......
......@@ -1098,7 +1098,8 @@ function wikiplugin_tracker($data, $params)
if (!empty($outputPretty) && in_array($f['fieldId'], $outputPretty)) {
$smarty->assign('f_'.$f['fieldId'], '<span class="outputPretty" id="track_'.$f['fieldId'].'" name="track_'.$f['fieldId'].'">'. wikiplugin_tracker_render_value($f, $item) . '</span>');
} else {
$smarty->assign('f_'.$f['fieldId'], wikiplugin_tracker_render_input($f, $item));
$mand = ($showmandatory == 'y' and $f['isMandatory'] == 'y')? "&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;":'';
$smarty->assign('f_'.$f['fieldId'], wikiplugin_tracker_render_input($f, $item).$mand);
}
} else {
if (in_array($f['fieldId'], $optional)) {
......
......@@ -78,11 +78,13 @@ class HistLib extends TikiLib
$query = "update `tiki_pages` set `data`=?,`lastModif`=?,`user`=?,`comment`=?,`version`=`version`+1,`ip`=?, `description`=?, `is_html`=?";
$bindvars = array($res['data'], $res['lastModif'], $res['user'], $res['comment'], $res['ip'], $res['description'], $res['is_html']);
// handle rolling back once page has been edited in a different editor (wiki or wysiwyg) based on is_html in history
if ($prefs['feature_wysiwyg'] == 'y' && $prefs['wysiwyg_optional'] == 'y' && $prefs['wysiwyg_memo'] == 'y') {
if ($res['is_html'] == 1) {
$bindvars[] = 'y';
// big hack: when you move to wysiwyg you do not come back usually -> wysiwyg should be a column in tiki_history
$info = $this->get_page_info($page);
$bindvars[] = $info['wysiwyg'];
} else {
$bindvars[] = 'n';
}
......
......@@ -8,4 +8,8 @@
require_once ('tiki-setup.php');
include_once('lib/wiki-plugins/wikiplugin_snarf.php');
if ($prefs['wikiplugin_snarf'] != 'y') {
echo tra('Feature disabled');
die;
}
echo wikiplugin_snarf('', $_REQUEST);
......@@ -58,11 +58,11 @@
onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.search_action}').attr('page_selected','');" />
{/if}
{if $smod_params.show_go_button eq 'y'}
<input type="hidden" name="exact_match" />
<input type = "submit" class = "wikiaction tips{if $smod_params.default_button eq 'go'} button_default{/if}"
name = "go" value = "{$smod_params.go_submit}"
title="{tr}Search{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}"
onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.go_action}').attr('page_selected','');" />
<input type="hidden" name="exact_match" value="" />
{/if}
{if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'}
<input type = "submit" class = "wikiaction tips{if $smod_params.default_button eq 'edit'} button_default{/if}"
......@@ -99,7 +99,7 @@ function submitSearch{{$search_mod_usage_counter}}() {
{/jq}
{if $smod_params.use_autocomplete eq 'y'}
{capture name="selectFn"}select: function(event, item) {ldelim}
$('#search-module-form{$search_mod_usage_counter}').attr('page_selected', item.item.value);
$('#search-module-form{$search_mod_usage_counter}').attr('page_selected', item.item.value).find("input[name=exact_match]").val("On");
{rdelim}, open: function(event, item) {ldelim}
$(".search_mod_buttons", "#search-module-form{$search_mod_usage_counter}").hide();
{rdelim}, close: function(event, item) {ldelim}
......
......@@ -50,17 +50,21 @@
</td>
</tr>
<tr>
<td>{tr}Sections:{/tr}</td>
<td colspan="3">
<input id="menu_section" type="text" name="section" value="{$section|escape}" size="34" /><br />
<em>{tr}Separate multiple sections with a comma ( , ) for an AND or a vertical bar ( | ) for an OR.{/tr}</em>
<td>{tr}Type:{/tr}</td>
<td>
<select name="type">
<option value="o" {if $type eq 'o'}selected="selected"{/if}>{tr}option{/tr}</option>
<option value="s" {if $type eq 's'}selected="selected"{/if}>{tr}section level 0{/tr}</option>
<option value='1' {if $type eq '1'}selected="selected"{/if}>{tr}section level 1{/tr}</option>
<option value='2' {if $type eq '2'}selected="selected"{/if}>{tr}section level 2{/tr}</option>
<option value='3' {if $type eq '3'}selected="selected"{/if}>{tr}section level 3{/tr}</option>
<option value="r" {if $type eq 'r'}selected="selected"{/if}>{tr}sorted section level 0{/tr}</option>
<option value="-" {if $type eq '-'}selected="selected"{/if}>{tr}separator{/tr}</option>
</select>
</td>
</tr>
<tr>
<td>{tr}Permissions:{/tr}</td>
<td colspan="3">
<input id="menu_perm" type="text" name="perm" value="{$perm|escape}" size="34" /><br />
<em>{tr}Separate multiple permissions with a comma ( , ) for an AND or a vertical bar ( | ) for an OR.{/tr}</em>
<td>{tr}Position:{/tr}</td>
<td>
<input type="text" name="position" value="{$position|escape}" size="6" />
</td>
</tr>
<tr>
......@@ -75,6 +79,20 @@
{/if}
</td>
</tr>
<tr>
<td>{tr}Sections:{/tr}</td>
<td colspan="3">