From: garvinhicking Date: Sat, 10 Dec 2005 21:11:44 +0000 (+0000) Subject: * Fix MoveableType importer to better import comments (garvinhicking) * Allow... X-Git-Tag: 1.0~239 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3549b0d0fdc37905e311b81ff7a8b21f4784da7b;p=s9y.git * Fix MoveableType importer to better import comments (garvinhicking) * Allow category sidebar plugin to hide the parent category, if the plugin is configured to only show a leaf of a category tree (garvinhicking) --- diff --git a/docs/NEWS b/docs/NEWS index ee72e38..eb4339d 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,12 @@ Version 1.0 () ------------------------------------------------------------------------ + * Fix MoveableType importer to better import comments (garvinhicking) + + * Allow category sidebar plugin to hide the parent category, if + the plugin is configured to only show a leaf of a category tree + (garvinhicking) + * Allow to restrict not showing entries from special category via $serendipity['GET']['hide_category']. (garvinhicking) diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php index b7592f9..f03915d 100644 --- a/include/admin/import.inc.php +++ b/include/admin/import.inc.php @@ -230,7 +230,7 @@ if (isset($serendipity['GET']['importFrom']) && serendipity_checkFormToken()) { $dir = opendir($importpath); $list = array(); while (($file = readdir($dir)) !== false ) { - if (!is_file($importpath . $file)) { + if (!is_file($importpath . $file) || !preg_match('@.php$@', $file)) { continue; } diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php index f49df49..698d6df 100644 --- a/include/admin/importers/movabletype.inc.php +++ b/include/admin/importers/movabletype.inc.php @@ -229,6 +229,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import { } break; + case 'REPLY': case 'TITLE': break; @@ -274,8 +275,10 @@ class Serendipity_Import_MovableType extends Serendipity_Import { $nofetch = false; while (!feof($fh)) { if ($nofetch === false) { + $this->debug('Next line'); $line = $this->decode(fgets($fh, 8192)); } else { + $this->debug('NO Next line'); // Keep line from previous run. $nofetch = false; } @@ -315,6 +318,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import { $is_trackback = false; } elseif (preg_match('/^-----/', $line)) { $this->debug("New section match. Current EL: $el"); + unset($el); # DEBUG! if (empty($el)) { $line = $this->decode(fgets($fh, 8192)); $this->debug("Inspecting next line: $line"); diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php index 7341364..986db8d 100644 --- a/include/plugin_internal.inc.php +++ b/include/plugin_internal.inc.php @@ -1199,7 +1199,7 @@ class serendipity_categories_plugin extends serendipity_plugin { $propbag->add('stackable', true); $propbag->add('author', 'Serendipity Team'); $propbag->add('version', '2.0'); - $propbag->add('configuration', array('title', 'authorid', 'parent_base', 'image', 'sort_order', 'sort_method', 'allow_select', 'hide_parallel', 'show_count', 'smarty')); + $propbag->add('configuration', array('title', 'authorid', 'parent_base', 'hide_parent', 'image', 'sort_order', 'sort_method', 'allow_select', 'hide_parallel', 'show_count', 'smarty')); $propbag->add('groups', array('FRONTEND_VIEWS')); } @@ -1248,6 +1248,13 @@ class serendipity_categories_plugin extends serendipity_plugin { $propbag->add('default', 'all'); break; + case 'hide_parent': + $propbag->add('type', 'boolean'); + $propbag->add('name', CATEGORIES_HIDE_PARENT); + $propbag->add('description', CATEGORIES_HIDE_PARENT_DESC); + $propbag->add('default', false); + break; + case 'hide_parallel': $propbag->add('type', 'boolean'); $propbag->add('name', CATEGORIES_HIDE_PARALLEL); @@ -1357,6 +1364,7 @@ class serendipity_categories_plugin extends serendipity_plugin { $image = (($image == "'none'" || $image == 'none') ? '' : $image); $use_parent = $this->get_config('parent_base'); + $hide_parent = serendipity_db_bool($this->get_config('hide_parent')); $parentdepth = 0; $hide_parallel = serendipity_db_bool($this->get_config('hide_parallel')); @@ -1370,6 +1378,10 @@ class serendipity_categories_plugin extends serendipity_plugin { if ($parentdepth == 0 && $cat['parentid'] != $use_parent && $cat['categoryid'] != $use_parent) { continue; } else { + if ($hide_parent && $cat['categoryid'] == $use_parent) { + continue; + } + if ($cat['depth'] < $parentdepth) { $parentdepth = 0; continue; diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index adf7ec1..870514e 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -1,4 +1,4 @@ - @@ -787,3 +787,5 @@ @define('COMMENT_NOT_ADDED', 'Не можете да добавите коментар, защото са забранени коментарите към тази статия.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index 979d7fa..3243079 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', 'Váš komentář nebyl přidán, protože k tomuto záznamu nejsou komentáře umožněny. %sVraťte se%s zpět ke komentářům nebo %szavřete%s toto okno.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index ee0f369..903b8ed 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', 'Váš komentář nebyl přidán, protože k tomuto záznamu nejsou komentáře umožněny. %sVraťte se%s zpět ke komentářům nebo %szavřete%s toto okno.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index 88aff62..a9c9523 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -1,4 +1,4 @@ - @@ -801,3 +801,5 @@ @define('COMMENT_NOT_ADDED', 'Din kommentar kunne ikke tilføjes fordi kommentarer til denne artikel er blevet deaktiveret.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 4b319b9..5eb8132 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1,4 +1,4 @@ -, @@ -819,3 +819,5 @@ Next constants should be placed with its brothers, right? @define('COMMENT_NOT_ADDED', 'Tu comentario no ha podido ser añadido, la posibilidad de añadir comentarios a esta entrada ha sido desactivada.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php index a037b06..f8b4879 100644 --- a/lang/UTF-8/serendipity_lang_fa.inc.php +++ b/lang/UTF-8/serendipity_lang_fa.inc.php @@ -1,4 +1,4 @@ - @@ -801,3 +801,5 @@ @define('COMMENT_NOT_ADDED', 'به دلیل غیر فعال بودن توضیحات، یا وارد کردن اطلاعات نادرست و یا وارد کردن عبارت اشتباه نوشته شده در تصویر، توانایی افزودن نظر شما وجود ندارد.'); @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php index d4cfc76..466dd93 100644 --- a/lang/UTF-8/serendipity_lang_fi.inc.php +++ b/lang/UTF-8/serendipity_lang_fi.inc.php @@ -1,4 +1,4 @@ - @@ -800,3 +800,5 @@ @define('COMMENT_NOT_ADDED', 'Tämän kirjauksen kommentointi ei ole sallittua. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php index 1fdbdfa..ebc92ad 100644 --- a/lang/UTF-8/serendipity_lang_fr.inc.php +++ b/lang/UTF-8/serendipity_lang_fr.inc.php @@ -1,4 +1,4 @@ - @@ -806,3 +806,5 @@ @define('COMMENT_NOT_ADDED', 'Votre commentaire n\'a pas pû être ajouté, car les commentaires pour ce billet ont été désactivés. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php index 5e3ec92..22e1810 100644 --- a/lang/UTF-8/serendipity_lang_hu.inc.php +++ b/lang/UTF-8/serendipity_lang_hu.inc.php @@ -800,3 +800,5 @@ @define('COMMENT_NOT_ADDED', 'A megjegyzések hozzáfűzése le van tiltva, így nem tudom a tiedet sem hozzáadni. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php index adce73b..ff5dbf9 100644 --- a/lang/UTF-8/serendipity_lang_is.inc.php +++ b/lang/UTF-8/serendipity_lang_is.inc.php @@ -1,4 +1,4 @@ - @@ -392,7 +392,7 @@ @define('INSTALL_XHTML11_DESC', 'Viltu neyða XHTML 1.1 fylgni (getur valdið vandræðum fyrir bak- eða framvinnslu fyrir eldri fjórðukynslóðar vafra)'); @define('INSTALL_POPUP', 'Virkja notkun innskotsglugga'); @define('INSTALL_POPUP_DESC', 'Viltu nota innskotsglugga (popup) fyrir athugasemdir, tilvísanir, o.fl.?'); -@define('INSTALL_EMBED', 'Er Serendipity innifalin?'); +@define('INSTALL_EMBED', 'Er Serendipity innifalið?'); @define('INSTALL_EMBED_DESC', 'Ef þú vilt innifela serendipity á annarri síðu, stilltu þá á "true" að henda öllum hausum, og prenta bara innihaldið. Þú getur nýtt indexFile valmöguleikann til að nota "wrapper class" þar sem þú setur venjulega vefsíðuhausa. Sjá README skrá fyrir meiri upplýsingar.'); @define('INSTALL_TOP_AS_LINKS', 'Sýna topp útgönguleiðir/ávísara sem tengla?'); @define('INSTALL_TOP_AS_LINKS_DESC', '"nei": Útgönguleiðir og ávísarar eru sýnd sem venjulegur texti til að verjast google rusli. "já": Útgönguleiðir og ávísarar eru sýndir sem tenglar. "sjálfgefið": Nota stillingu úr almennum stillingum (ráðlagt).'); @@ -800,3 +800,5 @@ @define('COMMENT_NOT_ADDED', 'Gat ekki bætt athugasemd þinni við, því athugasemdir hafa verið gerðar óvirkar fyrir þessa færslu. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php index fdf2856..45fa96f 100644 --- a/lang/UTF-8/serendipity_lang_it.inc.php +++ b/lang/UTF-8/serendipity_lang_it.inc.php @@ -1,4 +1,4 @@ - @@ -801,3 +801,5 @@ @define('COMMENT_NOT_ADDED', 'Il tuo commento non può essere aggiunto, perché i commenti per questa notizia sono stati disattivati. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php index eca2ae6..a14d521 100644 --- a/lang/UTF-8/serendipity_lang_ja.inc.php +++ b/lang/UTF-8/serendipity_lang_ja.inc.php @@ -1,4 +1,4 @@ -, 2004-2005. @@ -803,3 +803,5 @@ @define('COMMENT_NOT_ADDED', 'このエントリへのコメントが無効になったのでコメントは追加できませんでした。'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php index a294413..546652a 100644 --- a/lang/UTF-8/serendipity_lang_ko.inc.php +++ b/lang/UTF-8/serendipity_lang_ko.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', '덧글 금지가 되어 있어 덧글을 추가하지 못했습니다. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php index 0c8dcee..1f31191 100644 --- a/lang/UTF-8/serendipity_lang_nl.inc.php +++ b/lang/UTF-8/serendipity_lang_nl.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', 'Uw reactie kon niet worden toegevoegd omdat deze functie voor deze inzending is uitgeschakeld. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php index 982159a..592f60b 100644 --- a/lang/UTF-8/serendipity_lang_no.inc.php +++ b/lang/UTF-8/serendipity_lang_no.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', 'Din kommentar kunne ikke legges til fordi kommentarer til denne artikkelen er blitt deaktivert.'); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php index 6af1abb..bd1d814 100644 --- a/lang/UTF-8/serendipity_lang_pt.inc.php +++ b/lang/UTF-8/serendipity_lang_pt.inc.php @@ -1,4 +1,4 @@ - @@ -804,3 +804,5 @@ @define('COMMENT_NOT_ADDED', 'Seus comentários não foram adicionados, porque comentários para este artigo foram desabilitadas. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php index ae1c719..cbb2f8d 100644 --- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php +++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php @@ -808,3 +808,5 @@ @define('COMMENT_NOT_ADDED', 'Os seus comentários não foram adicionados, porque ou comentários para este artigo não estão autorizados, ou introduziu dados inválidos, ou os seus comentários foram interceptados por medidas anti-spam. '); // Retranslation done... @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php index 384fdc1..e2e1426 100644 --- a/lang/UTF-8/serendipity_lang_ro.inc.php +++ b/lang/UTF-8/serendipity_lang_ro.inc.php @@ -800,3 +800,5 @@ @define('COMMENT_NOT_ADDED', 'Comentariul tău nu a putut fi adăugat, deoarece autorul nu permite comentarii la această însemnare. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php index 26f7462..5b1b615 100644 --- a/lang/UTF-8/serendipity_lang_ru.inc.php +++ b/lang/UTF-8/serendipity_lang_ru.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', '您的迴響不能增入因為此篇文章不允許迴響. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php index f97c243..53ca771 100644 --- a/lang/UTF-8/serendipity_lang_tw.inc.php +++ b/lang/UTF-8/serendipity_lang_tw.inc.php @@ -1,4 +1,4 @@ - @@ -802,3 +802,5 @@ @define('COMMENT_NOT_ADDED', '您的迴響不能增入因為此篇文章不允許迴響. '); // Retranslate: 'Your comment could not be added, because comments for this entry have either been disabled, you entered invalid data, or your comment was caught by anti-spam measurements.' @define('INSTALL_TRACKREF', 'Enable referrer tracking?'); @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.'); +@define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?'); +@define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.'); diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php index 8856ca7..8d94621 100644 --- a/lang/UTF-8/serendipity_lang_zh.inc.php +++ b/lang/UTF-8/serendipity_lang_zh.inc.php @@ -1,4 +1,4 @@ -