From 1656f196f390efcfdf656a5e8c8db766355dc1c6 Mon Sep 17 00:00:00 2001 From: jtate Date: Sat, 1 Oct 2005 05:48:24 +0000 Subject: [PATCH] Here is support for filtering RSS feeds via authors much like we have been able to do by category for some time. I will put a plugin for displaying the appropriate links soon, but for now they can be accessed using feeds/authors/%idhimBH%realname%.rss. Apologies if I messed up language files. --- include/functions_permalinks.inc.php | 18 +++++ include/tpl/config_local.inc.php | 16 ++++ index.php | 18 +++-- lang/UTF-8/serendipity_lang_bg.inc.php | 4 +- lang/UTF-8/serendipity_lang_cn.inc.php | 4 +- lang/UTF-8/serendipity_lang_cs.inc.php | 4 +- lang/UTF-8/serendipity_lang_cz.inc.php | 4 +- lang/UTF-8/serendipity_lang_da.inc.php | 4 +- lang/UTF-8/serendipity_lang_de.inc.php | 4 +- lang/UTF-8/serendipity_lang_en.inc.php | 4 +- lang/UTF-8/serendipity_lang_es.inc.php | 4 +- lang/UTF-8/serendipity_lang_fa.inc.php | 4 +- lang/UTF-8/serendipity_lang_fi.inc.php | 4 +- lang/UTF-8/serendipity_lang_fr.inc.php | 4 +- lang/UTF-8/serendipity_lang_hu.inc.php | 2 + lang/UTF-8/serendipity_lang_is.inc.php | 4 +- lang/UTF-8/serendipity_lang_it.inc.php | 4 +- lang/UTF-8/serendipity_lang_ja.inc.php | 94 ++++++++++++----------- lang/UTF-8/serendipity_lang_ko.inc.php | 4 +- lang/UTF-8/serendipity_lang_nl.inc.php | 4 +- lang/UTF-8/serendipity_lang_no.inc.php | 4 +- lang/UTF-8/serendipity_lang_pt.inc.php | 4 +- lang/UTF-8/serendipity_lang_pt_PT.inc.php | 2 + lang/UTF-8/serendipity_lang_ro.inc.php | 2 + lang/UTF-8/serendipity_lang_ru.inc.php | 4 +- lang/UTF-8/serendipity_lang_se.inc.php | 2 + lang/UTF-8/serendipity_lang_tn.inc.php | 4 +- lang/UTF-8/serendipity_lang_tw.inc.php | 4 +- lang/UTF-8/serendipity_lang_zh.inc.php | 4 +- lang/serendipity_lang_bg.inc.php | 2 + lang/serendipity_lang_cn.inc.php | 2 + lang/serendipity_lang_cs.inc.php | 2 + lang/serendipity_lang_cz.inc.php | 2 + lang/serendipity_lang_da.inc.php | 2 + lang/serendipity_lang_de.inc.php | 2 + lang/serendipity_lang_en.inc.php | 2 + lang/serendipity_lang_es.inc.php | 2 + lang/serendipity_lang_fa.inc.php | 2 + lang/serendipity_lang_fi.inc.php | 2 + lang/serendipity_lang_fr.inc.php | 2 + lang/serendipity_lang_hu.inc.php | 2 + lang/serendipity_lang_is.inc.php | 2 + lang/serendipity_lang_it.inc.php | 2 + lang/serendipity_lang_ja.inc.php | 2 + lang/serendipity_lang_ko.inc.php | 2 + lang/serendipity_lang_nl.inc.php | 2 + lang/serendipity_lang_no.inc.php | 2 + lang/serendipity_lang_pt.inc.php | 2 + lang/serendipity_lang_pt_PT.inc.php | 2 + lang/serendipity_lang_ro.inc.php | 2 + lang/serendipity_lang_ru.inc.php | 2 + lang/serendipity_lang_se.inc.php | 2 + lang/serendipity_lang_tn.inc.php | 2 + lang/serendipity_lang_tw.inc.php | 2 + lang/serendipity_lang_zh.inc.php | 2 + rss.php | 9 ++- 56 files changed, 226 insertions(+), 73 deletions(-) diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php index 7ba11fb..6a6d189 100644 --- a/include/functions_permalinks.inc.php +++ b/include/functions_permalinks.inc.php @@ -117,6 +117,10 @@ function serendipity_initPermalinks() { $serendipity['permalinkStructure'] = 'archives/%id%-%title%.html'; } + if (!isset($serendipity['permalinkFeedAuthorStructure'])) { + $serendipity['permalinkFeedAuthorStructure'] = 'feeds/authors/%id%-%realname%.rss'; + } + if (!isset($serendipity['permalinkFeedCategoryStructure'])) { $serendipity['permalinkFeedCategoryStructure'] = 'feeds/categories/%id%-%name%.rss'; } @@ -141,6 +145,10 @@ function serendipity_initPermalinks() { $serendipity['permalinkCategoriesPath'] = 'categories'; } + if (!isset($serendipity['permalinkAuthorsPath'])) { + $serendipity['permalinkAuthorsPath'] = 'authors'; + } + if (!isset($serendipity['permalinkUnsubscribePath'])) { $serendipity['permalinkUnsubscribePath'] = 'unsubscribe'; } @@ -216,6 +224,7 @@ function &serendipity_permalinkPatterns($return = false) { $PAT['PERMALINK'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkStructure'], 'entry') . '@i'; $PAT['PERMALINK_CATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkCategoryStructure'], 'category') . '@i'; $PAT['PERMALINK_FEEDCATEGORIES'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkFeedCategoryStructure'], 'category') . '@i'; + $PAT['PERMALINK_FEEDAUTHORS'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkFeedAuthorStructure'], 'author') . '@i'; $PAT['PERMALINK_AUTHORS'] = '@' . serendipity_makePermalinkRegex($serendipity['permalinkAuthorStructure'], 'author') . '@i'; if ($return) { @@ -477,6 +486,15 @@ function serendipity_feedCategoryURL(&$data, $key = 'baseURL', $checkrewrite = t return $path; } +function serendipity_feedAuthorURL(&$data, $key = 'baseURL', $checkrewrite = true) { + global $serendipity; + $path = serendipity_makePermalink($serendipity['permalinkFeedAuthorStructure'], $data, 'author'); + if ($checkrewrite) { + $path = serendipity_rewriteURL($path, $key); + } + return $path; +} + function serendipity_archiveDateUrl($range, $summary=false, $key='baseURL') { return serendipity_rewriteURL(PATH_ARCHIVES . '/' . $range . ($summary ? '/summary' : '') . '.html', $key); } diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php index e340102..0888a56 100644 --- a/include/tpl/config_local.inc.php +++ b/include/tpl/config_local.inc.php @@ -162,6 +162,14 @@ 'permission' => 'siteConfiguration', 'flags' => array('ifEmpty')), + array('var' => 'permalinkFeedAuthorStructure', + 'title' => INSTALL_PERMALINK_FEEDAUTHOR, + 'description' => INSTALL_PERMALINK_FEEDAUTHOR_DESC, + 'type' => 'string', + 'default' => 'feeds/authors/%id%-%realname%.rss', + 'permission' => 'siteConfiguration', + 'flags' => array('ifEmpty')), + array('var' => 'permalinkArchivesPath', 'title' => INSTALL_PERMALINK_ARCHIVESPATH, 'description' => '', @@ -186,6 +194,14 @@ 'permission' => 'siteConfiguration', 'flags' => array('ifEmpty')), + array('var' => 'permalinkAuthorsPath', + 'title' => INSTALL_PERMALINK_CATEGORIESPATH, + 'description' => '', + 'type' => 'string', + 'default' => 'authors', + 'permission' => 'siteConfiguration', + 'flags' => array('ifEmpty')), + array('var' => 'permalinkUnsubscribePath', 'title' => INSTALL_PERMALINK_UNSUBSCRIBEPATH, 'description' => '', diff --git a/index.php b/index.php index 94a73e7..61143ad 100644 --- a/index.php +++ b/index.php @@ -237,7 +237,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range fclose($fp); } print $data; -} elseif (preg_match(PAT_PERMALINK_FEEDCATEGORIES, $uri, $matches) || preg_match(PAT_FEEDS, $uri)) { +} elseif (preg_match(PAT_PERMALINK_FEEDCATEGORIES, $uri, $matches) || preg_match(PAT_PERMALINK_FEEDAUTHORS, $uri, $matches) || preg_match(PAT_FEEDS, $uri)) { header('Content-Type: text/html; charset=utf-8'); if (preg_match('@/(index|atom[0-9]*|rss|comments|opml)\.(rss[0-9]?|rdf|rss|xml|atom)@', $uri, $vmatches)) { @@ -245,10 +245,18 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range } if (is_array($matches)) { - $uri = preg_replace('@(/?' . preg_quote(PATH_FEEDS, '@') . '/)(.+)\.rss@i', '\2', $uri); - $catid = serendipity_searchPermalink($serendipity['permalinkFeedCategoryStructure'], $uri, $matches[1], 'category'); - if (is_numeric($catid) && $catid > 0) { - $_GET['category'] = $catid; + $uri = preg_replace('@(/?' . $serendipity['serendipityHTTPPath'] . preg_quote(PATH_FEEDS, '@') . '/)(.+)\.rss@i', '\2', $uri); + if (strpos($uri, $serendipity['permalinkCategoriesPath']) === 0) { + $catid = serendipity_searchPermalink($serendipity['permalinkFeedCategoryStructure'], $uri, $matches[1], 'category'); + if (is_numeric($catid) && $catid > 0) { + $_GET['category'] = $catid; + } + } + elseif (strpos($uri, $serendipity['permalinkAuthorsPath']) === 0) { + $authorid = serendipity_searchPermalink($serendipity['permalinkFeedAuthorStructure'], $uri, $matches[1], 'author'); + if (is_numeric($authorid) && $authorid > 0) { + $_GET['viewAuthor'] = $authorid; + } } } diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index f68cbe4..1da8712 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -1,4 +1,4 @@ - @@ -770,3 +770,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index 85fa12c..e0706b2 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index 1f700b1..47feb08 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index 397fe51..a867595 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -1,4 +1,4 @@ - @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 2234452..5ca0684 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1,4 +1,4 @@ -, @@ -797,3 +797,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php index 7600b11..dd01e56 100644 --- a/lang/UTF-8/serendipity_lang_fa.inc.php +++ b/lang/UTF-8/serendipity_lang_fa.inc.php @@ -1,4 +1,4 @@ - @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php index 1fc4bc5..5629175 100644 --- a/lang/UTF-8/serendipity_lang_fi.inc.php +++ b/lang/UTF-8/serendipity_lang_fi.inc.php @@ -1,4 +1,4 @@ - @@ -790,3 +790,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php index 0eb97a1..1cd5dfa 100644 --- a/lang/UTF-8/serendipity_lang_hu.inc.php +++ b/lang/UTF-8/serendipity_lang_hu.inc.php @@ -784,3 +784,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php index f20ca93..235b58b 100644 --- a/lang/UTF-8/serendipity_lang_is.inc.php +++ b/lang/UTF-8/serendipity_lang_is.inc.php @@ -1,4 +1,4 @@ - @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php index ab93cb0..280e2f1 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. @@ -29,10 +29,10 @@ @define('SAVE', '保存'); @define('NAME', '名前'); @define('CREATE_NEW_CAT', '新規カテゴリを作成する'); -@define('I_WANT_THUMB', 'エントリ内ではサムネイルを使用する'); -@define('I_WANT_BIG_IMAGE', 'エントリ内では大きな画像を使用する'); -@define('I_WANT_NO_LINK', 'ただの画像として表示する'); -@define('I_WANT_IT_TO_LINK', '画像はこの URL へのリンクとして表示する:'); +@define('I_WANT_THUMB', 'エントリ中でサムネイルを使用したい'); +@define('I_WANT_BIG_IMAGE', 'エントリの中で大きな画像を使用したい'); +@define('I_WANT_NO_LINK', ' 画像としてそれを表示したい'); +@define('I_WANT_IT_TO_LINK', 'それをこの URL へのリンクとして表示したい:'); @define('BACK', '戻る'); @define('FORWARD', '転送'); @define('ANONYMOUS', '匿名'); @@ -52,7 +52,7 @@ @define('ENTRIES', 'エントリ'); @define('NEW_ENTRY', '新規エントリ追加'); @define('EDIT_ENTRIES', 'エントリ編集'); -@define('CATEGORIES', 'カテゴリ一覧'); +@define('CATEGORIES', 'カテゴリ管理'); @define('WARNING_THIS_BLAHBLAH', "警告:\\nサムネイルなしの画像が多い場合、長時間かかるかもしれません。"); @define('CREATE_THUMBS', 'サムネイル再構築'); @define('MANAGE_IMAGES', '画像管理'); @@ -75,8 +75,8 @@ @define('EXTENDED_BODY', '拡張本文'); @define('CATEGORY', 'カテゴリ'); @define('EDIT', '編集'); -@define('NO_ENTRIES_BLAHBLAH', 'キーワード %s はどのエントリにも見つけられませんでした。' . "\n"); -@define('YOUR_SEARCH_RETURNED_BLAHBLAH', '%s の検索結果は %s 個あります:'); +@define('NO_ENTRIES_BLAHBLAH', 'キーワード「%s」はどのエントリでも見つけられませんでした。' . "\n"); +@define('YOUR_SEARCH_RETURNED_BLAHBLAH', '「%s」の検索結果は %s 個あります:'); @define('IMAGE', '画像'); @define('ERROR_FILE_NOT_EXISTS', 'エラー: 古いファイル名が存在しません!'); @define('ERROR_FILE_EXISTS', 'エラー: 既に新しいファイル名が使用されています。別の名前を指定してください!'); @@ -89,7 +89,7 @@ @define('NEWSIZE', '新規サイズ: '); @define('RESIZE_BLAHBLAH', 'リサイズ %s

'); @define('ORIGINAL_SIZE', '元サイズ: %sx%s ピクセル'); -@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '

Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key -- I\'ll automatically calculate the new size so the image proportions don\'t get messed up

'); +@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '

ここで、画像サイズを調節することができます。画像の比率を変えずにサイズ変更をしたい場合は、2 つの入力ボックスのうちの 1 つにだけ値入力して、TAB キーを押してください - 自動的に新しいサイズを計算します。したがって、イメージは台無しになりません。

'); @define('QUICKJUMP_CALENDAR', 'カレンダークイックジャンプ'); @define('QUICKSEARCH', 'クイックサーチ'); @define('SEARCH_FOR_ENTRY', 'エントリの検索'); @@ -97,16 +97,16 @@ @define('BROWSE_ARCHIVES', '月単位の書庫表示'); @define('TOP_REFERRER', 'トップリファラ一覧'); @define('SHOWS_TOP_SITES', 'あなたのブログにリンクしたサイトのトップを表示します。'); -@define('TOP_EXITS', 'Top Exits'); +@define('TOP_EXITS', 'トップ退出一覧'); @define('SHOWS_TOP_EXIT', 'あなたのブログから退出したリンクのトップを表示します。'); -@define('SYNDICATION', 'Syndication'); -@define('SHOWS_RSS_BLAHBLAH', 'RSS syndication リンクを表示します。'); +@define('SYNDICATION', '配信'); +@define('SHOWS_RSS_BLAHBLAH', 'RSS 配信のリンクを表示します。'); @define('ADVERTISES_BLAHBLAH', 'ブログの元を宣伝します。'); @define('HTML_NUGGET', 'HTML ナゲット'); @define('HOLDS_A_BLAHBLAH', 'サイドバーに HTML の情報(ナゲット)を保持します。'); @define('TITLE_FOR_NUGGET', 'ナゲットの題名'); @define('THE_NUGGET', 'HTML の塊です!'); -@define('SYNDICATE_THIS_BLOG', 'このブログと Syndicate'); +@define('SYNDICATE_THIS_BLOG', 'このブログの配信'); @define('YOU_CHOSE', 'あなたは %s を選択しました。'); @define('IMAGE_ROTATE_LEFT', '左回り(時計と反対回り)に 90 度回転する'); @define('IMAGE_ROTATE_RIGHT', '右回り(時計回り)に 90 度回転する'); @@ -128,14 +128,14 @@ @define('LINK_TO_REMOTE_ENTRY', 'リモートエントリへのリンク'); @define('IP_ADDRESS', 'IP アドレス'); @define('USER', 'ユーザー'); -@define('THUMBNAIL_USING_OWN', 'Using %s as it\'s own thumbnail because it is so small already.'); -@define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!'); +@define('THUMBNAIL_USING_OWN', '既に非常に小さいので、自分がサムネイルとして %s を使用します。'); +@define('THUMBNAIL_FAILED_COPY', '自分自身をサムネイルとして %s を使いたかったのですが、コピーに失敗しました!'); @define('AUTHOR', '執筆者'); @define('LAST_UPDATED', '最終更新日'); @define('TRACKBACK_SPECIFIC', 'このエントリのトラックバック URI を指定する'); @define('DIRECT_LINK', 'このエントリへのダイレクトリンク'); @define('COMMENT_ADDED', 'コメントの追加に成功しました。'); -@define('COMMENT_ADDED_CLICK', '%s戻る%s をクリックするとコメントに戻ります。%s閉じる%s ウィンドウを閉じます。'); +@define('COMMENT_ADDED_CLICK', '%sここ%s をクリックするとコメントに戻ります。%sここ%s をクリックするとウィンドウを閉じます。'); @define('COMMENT_NOT_ADDED', 'このエントリへのコメントが無効になったのでコメントは追加できませんでした。'); @define('COMMENT_NOT_ADDED_CLICK', '%s戻る%s でコメントに戻ります。%s閉じる%s でウィンドウを閉じます。'); @define('COMMENTS_DISABLE', 'このエントリのコメントを許可しない'); @@ -188,7 +188,7 @@ @define('FILE_WRITE_ERROR', 'ファイル %s の書き込みができませんでした。'); @define('FILE_CREATE_YOURSELF', '自分でファイルを作成するか、パーミッションを調べてください'); @define('COPY_CODE_BELOW', '
* Just copy the code below and place it in %s in your %s folder:
%s
' . "\n"); -@define('WWW_USER', 'Change www to the user apache runs as (i.e. nobody).'); +@define('WWW_USER', 'apache を実行しているユーザーに www を変更します(例えば nobody)'); @define('BROWSER_RELOAD', '一度これを実行してにはブラウザーの「再読み込み」ボタンをクリックします。'); @define('DIAGNOSTIC_ERROR', 'あなたの入力した情報の診断を実行する間にいくつかのエラーを検知しました:'); @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity はまだインストールされていません。今からインストール してください。'); @@ -196,11 +196,11 @@ @define('DATABASE_ERROR', 'serendipity エラー: データベースに接続できませんでした - 終了します。'); @define('CREATE_DATABASE', 'デフォルトデータベースセットアップの作成中...'); @define('ATTEMPT_WRITE_FILE', 'ファイル %s の書き込みを試みます...'); -@define('WRITTEN_N_SAVED', '設定の書き込みと保存をしました。'); -@define('IMAGE_ALIGNMENT', '画像位置あわせ'); +@define('WRITTEN_N_SAVED', '設定の書き込みと保存を行いました。'); +@define('IMAGE_ALIGNMENT', '画像の位置あわせ'); @define('ENTER_NEW_NAME', '新規名称の入力: '); -@define('RESIZING', 'リサイズ中'); -@define('RESIZE_DONE', '終了しました (%s このイメージをリサイズしました)'); +@define('RESIZING', 'サイズ変更中'); +@define('RESIZE_DONE', '終了しました (%s このイメージをサイズ変更しました)'); @define('SYNCING', 'データベースと画像フォルダーの同期中'); @define('SYNC_DONE', '終了しました (%s この画像を同期しました)'); @define('FILE_NOT_FOUND', '%s とタイトルをつけられたファイルは既に削除されたため、恐らく見つけることができません。'); @@ -218,7 +218,7 @@ @define('UNSUBSCRIBE_OK', "%s は今、このエントリの購読を取り消しました。"); @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', '購読済エントリ "%s" に新規コメントです'); @define('SUBSCRIPTION_MAIL', "こんにちは %s さん。\n監視中のエントリに新しいコメントが作成されました。\n\nブログ名:\n%s\nエントリ名:\n%s\n\n下記でエントリを見つけることができます:\n%s\n\n下記のリンクをクリックすると購読解除することができます:\n%s\n"); -@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nここでエントリを探すことができます:\n%s\n\nこのリンクをクリックすると購読をやめることが出来ます:\n%s\n"); +@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nここでエントリを探すことができます:\n%s\n\nこのリンクをクリックすると購読をやめることができます:\n%s\n"); @define('SIGNATURE', "\n-- \n%s は Serendipityを使っています。\n最良の blog を探しているなら を見てください。"); @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 フィード'); @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 フォード'); @@ -238,7 +238,7 @@ @define('SYNDICATION_PLUGIN_TTL', '"ttl" フィールド(生存期間)'); @define('SYNDICATION_PLUGIN_TTL_DESC', 'Amount of minutes after which your blog should not be cached any more by foreign sites/applications (empty: hidden) [RSS 2.0]'); @define('SYNDICATION_PLUGIN_PUBDATE', '"pubDate" フィールド'); -@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Should the "pubDate"-field be embedded for a RSS-channel, to show the date of the latest entry?'); +@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'RSS チャンネルに最新のエントリの日付を表すために「pubDate」項目を組み込みますか?'); @define('CONTENT', '内容'); @define('TYPE', '種類'); @define('DRAFT', '草稿'); @@ -261,7 +261,7 @@ @define('ERROR_TEMPLATE_FILE', 'テンプレートファイルを開けません。serendipity をアップデートしてください!'); @define('ADVANCED_OPTIONS', '高度なオプション'); @define('EDIT_ENTRY', 'エントリ編集'); -@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this:
  %s
and reload this page.'); +@define('HTACCESS_ERROR', 'ローカルのウェブサーバでのインストールを確認するために、serendipity はファイル「.htaccess」を書き込みできる書くことができる必要があります。これは権限エラーのためにできませんでした。このように権限を調整してください:
  %s
そして、このページを再読み込みします。'); @define('SIDEBAR_PLUGINS', 'サイドバープラグイン'); @define('EVENT_PLUGINS', 'イベントプラグイン'); @define('SORT_ORDER', 'ソート順'); @@ -290,8 +290,7 @@ @define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'はい、そうしてください'); @define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'アップグレードの実行を必要としないように見えます。'); @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', '改良された Serendipity にアップグレードしました。'); -@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', ' -Serendipity のアップグレードステージを無視しました。正しいデータベースが確実にインストールされ、スケジュール機能を実行します。'); +@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Serendipity のアップグレードステージを無視しました。正しいデータベースが確実にインストールされ、スケジュール機能を実行します。'); @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'あなたの Serendipity は今バージョン %s にアップグレードしました。'); @define('SERENDIPITY_UPGRADER_RETURN_HERE', '%sここ%s をクリックするとブログに戻ることができます。'); @define('MANAGE_USERS', 'ユーザー管理'); @@ -396,8 +395,8 @@ Serendipity のアップグレードステージを無視しました。正し @define('INSTALL_POPUP_DESC', 'コメントやトラックバックにポップアップウィンドウを使用しますか?'); @define('INSTALL_EMBED', 'serendipity を組み込みで使用しますか?'); @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. より詳しい情報はファイル README を参照してください!'); -@define('INSTALL_TOP_AS_LINKS', 'トップの退出/リファラーのリンクを表示しますか?'); -@define('INSTALL_TOP_AS_LINKS_DESC', '"いいえ": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "デフォルト": 一般設定をの設定を使用します(推奨)'); +@define('INSTALL_TOP_AS_LINKS', 'トップの退出/リファラーをリンクとして表示しますか?'); +@define('INSTALL_TOP_AS_LINKS_DESC', '"いいえ": google スパムを防ぐために退出とリファラーをただのテキストとして表示します。"はい": 退出とリファラーをハイパーリンクとして表示します。"デフォルト": 一般設定をの設定を使用します(推奨)'); @define('INSTALL_BLOCKREF', 'リファラーブロック'); @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? ホスト名の一覧を「;」で列挙し、そのホスト名が部分一致でブロックされることに注意してください!'); @define('INSTALL_REWRITE', 'URL 書き換え'); @@ -407,7 +406,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('INSTALL_CAT_IMAGECONV', '画像変換設定'); @define('INSTALL_CAT_IMAGECONV_DESC', 'serendipity がどのようにイメージを扱わなければならないかに関する一般的な情報を入力します。'); @define('INSTALL_IMAGEMAGICK', 'Imagemagick を使う'); -@define('INSTALL_IMAGEMAGICK_DESC', 'image magick がインストール済で、それを使って画像のリサイズをしたいですか?'); +@define('INSTALL_IMAGEMAGICK_DESC', 'image magick がインストール済で、それを使って画像のリサイズをしますか?'); @define('INSTALL_IMAGEMAGICKPATH', 'convert バイナリへのパス'); @define('INSTALL_IMAGEMAGICKPATH_DESC', 'image magic convert バイナリのフルパスと名前'); @define('INSTALL_THUMBSUFFIX', 'サムネイル接尾辞'); @@ -424,13 +423,13 @@ Serendipity のアップグレードステージを無視しました。正し @define('USERCONF_PASSWORD_DESC', 'ブログにログインするときに使うパスワードを指定します。'); @define('USERCONF_EMAIL', '電子メールアドレス'); @define('USERCONF_EMAIL_DESC', '個人の電子メールアドレスをしていします。'); -@define('USERCONF_SENDCOMMENTS', 'コメントのお知らせを送信しますか?'); -@define('USERCONF_SENDCOMMENTS_DESC', 'エントリがコメントを受けたとき、電子メールを受信しますか?'); +@define('USERCONF_SENDCOMMENTS', 'コメント告知を送信しますか?'); +@define('USERCONF_SENDCOMMENTS_DESC', 'コメントをあなたのエントリが受けたとき、電子メールを受信しますか?'); @define('USERCONF_SENDTRACKBACKS', 'トラックバック告知を送信しますか?'); -@define('USERCONF_SENDTRACKBACKS_DESC', 'エントリがトラックバックを受けたとき、電子メールを受信しますか?'); +@define('USERCONF_SENDTRACKBACKS_DESC', 'トラックバックをあなたのエントリが受けたとき、電子メールを受信しますか?'); @define('USERCONF_ALLOWPUBLISH', '権限: エントリを公開しますか?'); @define('USERCONF_ALLOWPUBLISH_DESC', 'このユーザーがエントリを公開することを許可しますか?'); -@define('SUCCESS', 'Success'); +@define('SUCCESS', '成功'); @define('POWERED_BY_SHOW_TEXT', 'テキストとして "Serendipity" を表示する'); @define('POWERED_BY_SHOW_TEXT_DESC', 'テキストとして "Serendipity Weblog" を表示するでしょう。'); @define('POWERED_BY_SHOW_IMAGE', '"Serendipity" とロゴを表示'); @@ -464,7 +463,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('PLUGIN_SUPERUSER_HTTPS', 'ログインに https を使う'); @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'ログインの https ロケーションへのリンクポイントです。ウェブサーバーがこれをサポートしている必要があります!'); @define('INSTALL_SHOW_EXTERNAL_LINKS', '外部リンクをクリック可能にしますか?'); -@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"いいえ": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "はい": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); +@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"いいえ": google スパムを防ぐために適用可能な未確認外部リンク (トップ退出、トップ入口、ユーザーコメント) はただのテキストとして表示する/しないを指定します (推奨). "はい": 未確認外部リンクはハイパーリンクとして表示します。サイドバープラグインの設定で上書きすることができます!'); @define('PAGE_BROWSE_COMMENTS', 'ページ %s/%s, 合計 %s コメント'); @define('FILTERS', 'フィルター'); @define('FIND_ENTRIES', 'エントリ検索'); @@ -526,7 +525,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('MONTHS', '月'); @define('DAYS', '日'); @define('ARCHIVE_FREQUENCY', 'カレンダー項目の周期'); -@define('ARCHIVE_FREQUENCY_DESC', 'リストの中で各項目間で使用するカレンダーの間隔'); +@define('ARCHIVE_FREQUENCY_DESC', 'リストの中で各項目間で使用するカレンダーの間隔です。'); @define('ARCHIVE_COUNT', '一覧中の項目の数'); @define('ARCHIVE_COUNT_DESC', '表示する月・週または日の合計数'); @define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', '以下にインストール済のプラグインの一覧があります。'); @@ -657,7 +656,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('EMPTY_SETTING', '%s の値が正しく指定されていません!'); @define('USERCONF_REALNAME', '本名'); @define('USERCONF_REALNAME_DESC', '著作者のフルネームです。これは読者に見える名前です。'); -@define('HOTLINK_DONE', 'ファイルをホットリンクしました。
完了です。'); // Translate +@define('HOTLINK_DONE', 'ファイルをホットリンクしました。
完了です。'); @define('ENTER_MEDIA_URL_METHOD', '取得方法:'); @define('ADD_MEDIA_BLAHBLAH_NOTE', '注: ホットリンクは、それらをローカルに格納せずに、リモートのイメージを使用することを可能にします。サーバーへのホットリンクを選択した場合、自分のウェブサイトか指定のウェブサイトへホットリンクする許可を持っていることを確認してください。'); @define('MEDIA_HOTLINKED', 'ホットリンク済'); @@ -708,14 +707,14 @@ Serendipity のアップグレードステージを無視しました。正し @define('DELETE_GROUP', 'グループ番号 #%d の「%s」を削除します。本気ですか?'); @define('USERLEVEL_OBSOLETE', '注意: ユーザーレベル属性は現在プラグインと認証の後方互換性のみに使用されます。ユーザーの特権は現在グループ会員で扱います!'); @define('SYNDICATION_PLUGIN_FEEDBURNERID', 'FeedBurner ID'); -@define('SYNDICATION_PLUGIN_FEEDBURNERID_DESC', 'The ID of the feed you wish to publish'); +@define('SYNDICATION_PLUGIN_FEEDBURNERID_DESC', '公開したい フィードの ID です．'); @define('SYNDICATION_PLUGIN_FEEDBURNERIMG', 'FeedBurner 画像'); @define('SYNDICATION_PLUGIN_FEEDBURNERIMG_DESC', 'Name of image to display (or leave blank for counter), located on feedburner.com, ex: fbapix.gif'); @define('SYNDICATION_PLUGIN_FEEDBURNERTITLE', 'FeedBurner 題名'); @define('SYNDICATION_PLUGIN_FEEDBURNERTITLE_DESC', 'イメージの側に表示するべきタイトルです(もしあれば)'); @define('SYNDICATION_PLUGIN_FEEDBURNERALT', 'FeedBurner 画像のテキスト'); @define('SYNDICATION_PLUGIN_FEEDBURNERALT_DESC', 'Text (if any) to display when hovering the image'); -@define('SEARCH_TOO_SHORT', '検索キーワードはYour search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.'); +@define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.'); @define('INSTALL_DBPORT', 'データベースのポート番号'); @define('INSTALL_DBPORT_DESC', 'データベースサーバーへの接続に使用するポート番号です。'); @define('PLUGIN_GROUP_FRONTEND_EXTERNAL_SERVICES', 'フロントエンド: 外部サービス'); @@ -729,7 +728,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('PLUGIN_GROUP_BACKEND_TEMPLATES', 'バックエンド: テンプレート'); @define('PLUGIN_GROUP_BACKEND_FEATURES', 'バックエンド: 機能'); @define('PLUGIN_GROUP_IMAGES', '画像'); -@define('PLUGIN_GROUP_ANTISPAM', 'アンチ spam'); +@define('PLUGIN_GROUP_ANTISPAM', 'アンチスパム'); @define('PLUGIN_GROUP_MARKUP', 'マークアップ'); @define('PLUGIN_GROUP_STATISTICS', '統計'); @define('PERMISSION_PERSONALCONFIGURATION', '個人設定: 個人設定のアクセス'); @@ -763,8 +762,7 @@ Serendipity のアップグレードステージを無視しました。正し @define('PERMISSION_ADMINCOMMENTS', 'コメント管理: コメント管理'); @define('PERMISSION_ADMINTEMPLATES', 'テンプレート管理: テンプレート管理'); @define('INSTALL_BLOG_EMAIL', 'ブログの電子メールアドレス'); -@define('INSTALL_BLOG_EMAIL_DESC', ' -この設定は送信メールの「From」パートの電子メールアドレスとして使用されます。必ず、ホスト上で使用するメールサーバーで認識するアドレスとしてこれを設定定します - 多くのメールサーバーが、不明の From アドレス後を持っているメッセージを拒絶します。'); +@define('INSTALL_BLOG_EMAIL_DESC', 'この設定は送信メールの「From」パートの電子メールアドレスとして使用されます。必ず、ホスト上で使用するメールサーバーで認識するアドレスとしてこれを設定定します - 多くのメールサーバーが、不明の From アドレス後を持っているメッセージを拒絶します。'); @define('CATEGORIES_PARENT_BASE', 'カテゴリの下のみ表示する...'); @define('CATEGORIES_PARENT_BASE_DESC', '子カテゴリーだけが表示されるように、親カテゴリーを選ぶことができます。'); @define('CATEGORIES_HIDE_PARALLEL', 'カテゴリツリーの一部ではないカテゴリを隠す'); @@ -781,9 +779,13 @@ Serendipity のアップグレードステージを無視しました。正し @define('PERM_DENIED', 'アクセス拒否です。'); @define('INSTALL_ACL', 'カテゴリの読み込み権限を適用する'); -@define('INSTALL_ACL_DESC', 'If enabled, the usergroup permission settings you setup for categories will be applied when logged-in users view your blog. If disabled, the read-permissions of the categories are NOT applied, but the positive effect is a little speedup on your blog. So if you don\'t need multi-user read permissions for your blog, disable this setting.'); -@define('PLUGIN_API_VALIDATE_ERROR', 'Configuration syntax wrong for option "%s". Needs content of type "%s".'); +@define('INSTALL_ACL_DESC', '有効な場合、ログインしたウェブログ閲覧ユーザーユーザーはグループ許可設定のカテゴリ設定が適用されるでしょう。無効な場合、カテゴリの読み込み許可は適用されません。しかし、しかし、前向きな結果はあなたのウェブログ上の小さなスピードアップです。マルチユーザーを必要としない場合ウェブログ読み込み権限は必要なく、これを無効に設定します。'); +@define('PLUGIN_API_VALIDATE_ERROR', 'Configuration syntax wrong for option "%s". 種類「%s」の内容が必要です。'); @define('USERCONF_CHECK_PASSWORD', '古いパスワード'); -@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); -@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); -@define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('USERCONF_CHECK_PASSWORD_DESC', '上の項目でパスワードを変更する場合、この項目に現在のユーザーパスワードを入力する必要があります。'); +@define('USERCONF_CHECK_PASSWORD_ERROR', '正しい古いパスワードを指定せず、新しいパスワードを変更することは許可されていません．設定は保存されませんでした。'); +@define('ERROR_XSRF', 'ブラウザーは有効な HTTP-Referrer 文字列を送信しませんでした。これは誤設定されたブラウザー/プロクシ、あるいはあなたに向けたCross Site Request Forgery(XSRF)を引き起ここすかどちらかかもしれません。要求した操作は完了できませんでした。'); + +?> +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php index f0cdc51..709af32 100644 --- a/lang/UTF-8/serendipity_lang_ko.inc.php +++ b/lang/UTF-8/serendipity_lang_ko.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', '위의 적힌 암호를 변경하려면 여기에 현재 사용중인 암호를 적으십시오.'); @define('USERCONF_CHECK_PASSWORD_ERROR', '이전 암호가 올바르지 않으므로 새 암호로 변경할 권한이 없습니다. 설정이 저장되지 않았습니다.'); @define('ERROR_XSRF', '브라우저가 유효한 HTTP 진입자(referrer) 문자열을 보내지 않았습니다. 브라우저/프록시 설정이 잘못되었거나 당신을 겨냥한 상호 사이트 요청 위조(XSRF) 때문이었을 수 있습니다. 요청한 사항을 처리할 수 없었습니다.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php index bb9c21b..b931452 100644 --- a/lang/UTF-8/serendipity_lang_nl.inc.php +++ b/lang/UTF-8/serendipity_lang_nl.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php index 51b1401..81695e1 100644 --- a/lang/UTF-8/serendipity_lang_no.inc.php +++ b/lang/UTF-8/serendipity_lang_no.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php index a6e129f..0334586 100644 --- a/lang/UTF-8/serendipity_lang_pt.inc.php +++ b/lang/UTF-8/serendipity_lang_pt.inc.php @@ -1,4 +1,4 @@ - @@ -788,3 +788,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php index e954902..fa07159 100644 --- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php +++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php @@ -787,3 +787,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php index edfa39d..0cb3ad9 100644 --- a/lang/UTF-8/serendipity_lang_ro.inc.php +++ b/lang/UTF-8/serendipity_lang_ro.inc.php @@ -783,3 +783,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php index 7c1ea7b..6f67c59 100644 --- a/lang/UTF-8/serendipity_lang_ru.inc.php +++ b/lang/UTF-8/serendipity_lang_ru.inc.php @@ -1,4 +1,4 @@ - @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php index 7c42326..c56f887 100644 --- a/lang/UTF-8/serendipity_lang_tw.inc.php +++ b/lang/UTF-8/serendipity_lang_tw.inc.php @@ -1,4 +1,4 @@ - @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php index 87cbebb..ac62cec 100644 --- a/lang/UTF-8/serendipity_lang_zh.inc.php +++ b/lang/UTF-8/serendipity_lang_zh.inc.php @@ -1,4 +1,4 @@ - +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index 38e7d45..87217ca 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', '위의 적힌 암호를 변경하려면 여기에 현재 사용중인 암호를 적으십시오.'); @define('USERCONF_CHECK_PASSWORD_ERROR', '이전 암호가 올바르지 않으므로 새 암호로 변경할 권한이 없습니다. 설정이 저장되지 않았습니다.'); @define('ERROR_XSRF', '브라우저가 유효한 HTTP 진입자(referrer) 문자열을 보내지 않았습니다. 브라우저/프록시 설정이 잘못되었거나 당신을 겨냥한 상호 사이트 요청 위조(XSRF) 때문이었을 수 있습니다. 요청한 사항을 처리할 수 없었습니다.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index 5375a5c..ca977ac 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index 65d6ae7..a057d02 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index 518d0db..4a8de47 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -788,3 +788,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index b39afdc..323e423 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -787,3 +787,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index edfa39d..0cb3ad9 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -783,3 +783,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index 34f4ac7..1828ea8 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -786,3 +786,5 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index 4abe388..69f2ba5 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index a10cfdc..ae48403 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -786,3 +786,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index 306671f..c9ff2ad 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -785,3 +785,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index 56e36e3..3284cb2 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -784,3 +784,5 @@ @define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.'); @define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.'); @define('ERROR_XSRF', 'Your browser did not sent a valid HTTP-Referrer string. This may have either been caused by a misconfigured browser/proxy or by a Cross Site Request Forgery (XSRF) aimed at you. The action you requested could not be completed.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR_DESC', 'Here you can define the relative URL structure beginning from your base URL to where RSS-feeds from specific users may be viewed. You can use the variables %id%, %realname%, %username%, %email% and any other characters.'); +@define('INSTALL_PERMALINK_FEEDAUTHOR', 'Permalink RSS-Feed Author URL structure'); diff --git a/rss.php b/rss.php index 703edac..fe2a4ef 100644 --- a/rss.php +++ b/rss.php @@ -20,6 +20,10 @@ if (isset($_GET['category'])) { $serendipity['GET']['category'] = $_GET['category']; } +if (isset($_GET['viewAuthor'])) { + $serendipity['GET']['viewAuthor'] = $_GET['viewAuthor']; +} + if (!isset($_GET['type'])) { $_GET['type'] = 'content'; } @@ -31,7 +35,7 @@ if (!isset($_GET['nocache'])) { break; case 'content': default: - $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC', '', false, true); + $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC', '', false, true); break; } @@ -86,6 +90,9 @@ default: if (!empty($serendipity['GET']['category'])) { $cInfo = serendipity_fetchCategoryInfo((int)$serendipity['GET']['category']); $title = serendipity_utf8_encode(htmlspecialchars($title . ' - '. $cInfo['category_name'])); +} elseif (!empty($serendipity['GET']['viewAuthor'])) { + list($aInfo) = serendipity_fetchAuthor((int)$serendipity['GET']['viewAuthor']); + $title = serendipity_utf8_encode(htmlspecialchars($aInfo['realname'] . ' - '. $title )); } else { $title = serendipity_utf8_encode(htmlspecialchars($title)); } -- 2.39.5