From 2ba015e7c2058481561553ef0ee297c004edd436 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 29 Nov 2008 06:27:23 +0100 Subject: update translations --- locale/ja_JP/LC_MESSAGES/messages.mo | Bin 40284 -> 40284 bytes locale/ja_JP/LC_MESSAGES/messages.po | 258 +++++++++++++++++------------------ 2 files changed, 129 insertions(+), 129 deletions(-) (limited to 'locale/ja_JP/LC_MESSAGES') diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo index 1e40a0eaf..23b1a6dc7 100644 Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po index 8b2fc28ff..4ce20725e 100644 --- a/locale/ja_JP/LC_MESSAGES/messages.po +++ b/locale/ja_JP/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tt-rss unstable\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-15 18:02+0300\n" +"POT-Creation-Date: 2008-11-29 11:27+0300\n" "PO-Revision-Date: 2008-09-25 12:43+0900\n" "Last-Translator: Tadashi Jokagi \n" "Language-Team: Japanese \n" @@ -166,17 +166,17 @@ msgstr "" msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "" -#: functions.php:2590 functions.php:2954 functions.php:3335 functions.php:4196 +#: functions.php:2590 functions.php:2954 functions.php:3335 functions.php:4197 #: help/3.php:57 msgid "Starred articles" msgstr "お気に入りの記事" -#: functions.php:2606 functions.php:2956 functions.php:3338 functions.php:4203 -#: modules/pref-feeds.php:1406 help/3.php:59 +#: functions.php:2606 functions.php:2956 functions.php:3338 functions.php:4204 +#: modules/pref-feeds.php:1408 help/3.php:59 msgid "Published articles" msgstr "公開済みの記事" -#: functions.php:2622 functions.php:2958 functions.php:3341 functions.php:4181 +#: functions.php:2622 functions.php:2958 functions.php:3341 functions.php:4182 #: help/3.php:58 msgid "Fresh articles" msgstr "新しい記事" @@ -186,8 +186,8 @@ msgstr "新しい記事" msgid "All feeds" msgstr "すべてのフィード" -#: functions.php:2905 functions.php:2944 functions.php:3313 functions.php:4357 -#: functions.php:4387 modules/pref-feeds.php:1237 +#: functions.php:2905 functions.php:2944 functions.php:3313 functions.php:4358 +#: functions.php:4388 modules/pref-feeds.php:1239 msgid "Uncategorized" msgstr "カテゴリー割り当てなし" @@ -209,146 +209,146 @@ msgstr "検索結果" msgid "Searched for" msgstr "検索" -#: functions.php:3973 functions.php:4023 functions.php:5375 -#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199 +#: functions.php:3974 functions.php:4024 functions.php:5376 +#: modules/pref-feeds.php:1020 modules/pref-feeds.php:1201 #: modules/pref-filters.php:309 modules/pref-labels.php:275 -#: modules/pref-users.php:407 +#: modules/pref-users.php:408 msgid "Select:" msgstr "選択:" -#: functions.php:3974 functions.php:4024 modules/pref-feeds.php:1019 -#: modules/pref-feeds.php:1200 modules/pref-filters.php:310 -#: modules/pref-labels.php:276 modules/pref-users.php:408 +#: functions.php:3975 functions.php:4025 modules/pref-feeds.php:1021 +#: modules/pref-feeds.php:1202 modules/pref-filters.php:310 +#: modules/pref-labels.php:276 modules/pref-users.php:409 msgid "All" msgstr "すべて" -#: functions.php:3975 functions.php:3981 functions.php:4025 functions.php:4028 +#: functions.php:3976 functions.php:3982 functions.php:4026 functions.php:4029 #: tt-rss.php:196 msgid "Unread" msgstr "未読" -#: functions.php:3976 +#: functions.php:3977 msgid "Invert" msgstr "反転" -#: functions.php:3977 functions.php:4026 modules/pref-feeds.php:1020 -#: modules/pref-feeds.php:1201 modules/pref-filters.php:311 -#: modules/pref-labels.php:277 modules/pref-users.php:409 +#: functions.php:3978 functions.php:4027 modules/pref-feeds.php:1022 +#: modules/pref-feeds.php:1203 modules/pref-filters.php:311 +#: modules/pref-labels.php:277 modules/pref-users.php:410 msgid "None" msgstr "なし" -#: functions.php:3979 tt-rss.php:147 modules/pref-feeds.php:1360 +#: functions.php:3980 tt-rss.php:147 modules/pref-feeds.php:1362 msgid "Actions..." msgstr "操作..." -#: functions.php:3980 +#: functions.php:3981 msgid "Selection toggle:" msgstr "選択の切り替え:" -#: functions.php:3982 functions.php:4029 tt-rss.php:195 +#: functions.php:3983 functions.php:4030 tt-rss.php:195 msgid "Starred" msgstr "お気に入り" -#: functions.php:3983 +#: functions.php:3984 msgid "Published" msgstr "公開済み" -#: functions.php:3985 functions.php:4031 +#: functions.php:3986 functions.php:4032 msgid "Mark as read:" msgstr "既読にする:" -#: functions.php:3986 +#: functions.php:3987 msgid "Selection" msgstr "選択" -#: functions.php:4000 +#: functions.php:4001 msgid "Entire feed" msgstr "フィードの入力" -#: functions.php:4003 tt-rss.php:162 +#: functions.php:4004 tt-rss.php:162 msgid "Other actions:" msgstr "その他の操作:" -#: functions.php:4010 functions.php:4012 +#: functions.php:4011 functions.php:4013 msgid "Search to label" msgstr "ラベルの検索" -#: functions.php:4028 +#: functions.php:4029 msgid "Toggle:" msgstr "トグル" -#: functions.php:4032 +#: functions.php:4033 msgid "Page" msgstr "ページ" -#: functions.php:4033 modules/popup-dialog.php:70 modules/pref-feeds.php:160 -#: modules/pref-feeds.php:408 modules/pref-filters.php:346 +#: functions.php:4034 modules/popup-dialog.php:70 modules/pref-feeds.php:160 +#: modules/pref-feeds.php:410 modules/pref-filters.php:346 msgid "Feed" msgstr "フィード" -#: functions.php:4040 +#: functions.php:4041 msgid "Convert to label" msgstr "ラベルの変換" -#: functions.php:4087 +#: functions.php:4088 msgid "Generated feed" msgstr "生成したフィード" -#: functions.php:4131 +#: functions.php:4132 msgid "Click to collapse category" msgstr "閉じたカテゴリーのクリック" -#: functions.php:4169 +#: functions.php:4170 msgid "Dashboard" msgstr "ダッシュボード" -#: functions.php:4407 +#: functions.php:4408 msgid "No feeds to display." msgstr "表示するフィードがありません。" -#: functions.php:4424 +#: functions.php:4425 msgid "Tags" msgstr "タグ" -#: functions.php:4661 +#: functions.php:4665 msgid " - " msgstr " - " -#: functions.php:4720 functions.php:4721 +#: functions.php:4724 functions.php:4725 msgid "no tags" msgstr "タグがありません" -#: functions.php:4728 +#: functions.php:4732 msgid "Edit tags for this article" msgstr "この記事のタグを編集する" -#: functions.php:4736 +#: functions.php:4740 #, fuzzy msgid "Display original article content" msgstr "記事の内容をスクロールする" -#: functions.php:4743 functions.php:5385 +#: functions.php:4747 functions.php:5386 msgid "Show article summary in new window" msgstr "記事の要約を新しいウィンドウで表示する" -#: functions.php:4778 functions.php:5309 +#: functions.php:4783 functions.php:5310 msgid "unknown type" msgstr "未知の種類" -#: functions.php:4784 functions.php:5315 +#: functions.php:4789 functions.php:5316 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4825 functions.php:5349 +#: functions.php:4825 functions.php:5350 msgid "Attachment:" msgstr "添付: " -#: functions.php:4827 functions.php:5351 +#: functions.php:4827 functions.php:5352 msgid "Attachments:" msgstr "添付:" #: functions.php:4847 modules/help.php:22 modules/popup-dialog.php:52 -#: modules/popup-dialog.php:547 modules/pref-feeds.php:1069 +#: modules/popup-dialog.php:547 modules/pref-feeds.php:1071 msgid "Close this window" msgstr "このウィンドウを閉じる" @@ -370,59 +370,59 @@ msgstr "(クリックで変更)" msgid "Click to expand article" msgstr "開いた記事のクリック" -#: functions.php:5447 +#: functions.php:5448 msgid "No unread articles found to display." msgstr "表示する未読記事が見つかりませんでした。" -#: functions.php:5450 +#: functions.php:5451 msgid "No starred articles found to display." msgstr "表示するお気に入りの記事が見つかりませんでした。" -#: functions.php:5453 +#: functions.php:5454 msgid "No articles found to display." msgstr "表示する記事が見つかりません。" -#: functions.php:5819 +#: functions.php:5820 msgid "Match " msgstr "一致 " -#: functions.php:5827 +#: functions.php:5828 msgid "Unread articles" msgstr "未読記事" -#: functions.php:5828 +#: functions.php:5829 msgid "Updated articles" msgstr "更新済み記事" -#: functions.php:5829 +#: functions.php:5830 msgid "Title contains" msgstr "題名の内容" -#: functions.php:5830 +#: functions.php:5831 msgid "Content contains" msgstr "コンテンツの内容" -#: functions.php:5831 +#: functions.php:5832 msgid "Score equals" msgstr "スコアと同じ" -#: functions.php:5832 +#: functions.php:5833 msgid "Score is greater than" msgstr "スコア以上" -#: functions.php:5833 +#: functions.php:5834 msgid "Score is less than" msgstr "スコア以下" -#: functions.php:5834 +#: functions.php:5835 msgid "Articles newer than X hours" msgstr "記事が X 時間より新しい" -#: functions.php:5835 +#: functions.php:5836 msgid "Articles newer than X days" msgstr "記事が X 日より新しい" -#: functions.php:5844 +#: functions.php:5845 msgid "Add" msgstr "追加" @@ -806,7 +806,7 @@ msgid "Saving feeds..." msgstr "フィードの保存中..." #: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165 -#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273 +#: modules/pref-feeds.php:1214 modules/pref-feeds.php:1275 msgid "Title" msgstr "題名" @@ -1076,12 +1076,12 @@ msgid "Do not show images in articles" msgstr "記事内に画像を表示しない" #: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:290 -#: modules/pref-feeds.php:478 +#: modules/pref-feeds.php:480 msgid "Login:" msgstr "ログイン:" #: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:294 -#: modules/pref-feeds.php:484 +#: modules/pref-feeds.php:486 msgid "Password:" msgstr "パスワード:" @@ -1310,9 +1310,9 @@ msgid "tag cloud" msgstr "タグクラウド" #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152 -#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114 +#: modules/popup-dialog.php:211 modules/pref-feeds.php:1116 #: modules/pref-filters.php:252 modules/pref-labels.php:239 -#: modules/pref-users.php:363 +#: modules/pref-users.php:364 msgid "Search" msgstr "検索" @@ -1408,7 +1408,7 @@ msgstr "スコア" msgid "Limit:" msgstr "制限:" -#: tt-rss.php:235 modules/pref-feeds.php:256 modules/pref-feeds.php:444 +#: tt-rss.php:235 modules/pref-feeds.php:256 modules/pref-feeds.php:446 msgid "Update" msgstr "更新" @@ -1545,17 +1545,17 @@ msgid "Subscribe to Feed" msgstr "フィードを購読する" #: modules/popup-dialog.php:73 modules/pref-feeds.php:176 -#: modules/pref-feeds.php:422 +#: modules/pref-feeds.php:424 msgid "URL:" msgstr "URL:" #: modules/popup-dialog.php:84 modules/pref-feeds.php:188 -#: modules/pref-feeds.php:434 +#: modules/pref-feeds.php:436 msgid "Place in category:" msgstr "カテゴリーの場所:" #: modules/popup-dialog.php:104 modules/pref-feeds.php:285 -#: modules/pref-feeds.php:475 modules/pref-prefs.php:259 +#: modules/pref-feeds.php:477 modules/pref-prefs.php:259 #: modules/pref-users.php:149 msgid "Authentication" msgstr "認証" @@ -1572,7 +1572,7 @@ msgstr "購読" #: modules/popup-dialog.php:133 modules/popup-dialog.php:214 #: modules/popup-dialog.php:279 modules/popup-dialog.php:428 #: modules/popup-dialog.php:523 modules/pref-feeds.php:125 -#: modules/pref-feeds.php:388 modules/pref-feeds.php:539 +#: modules/pref-feeds.php:390 modules/pref-feeds.php:541 #: modules/pref-filters.php:133 modules/pref-users.php:184 msgid "Cancel" msgstr "取り消し" @@ -1650,7 +1650,7 @@ msgid "with parameters:" msgstr "パラメーター:" #: modules/popup-dialog.php:403 modules/pref-feeds.php:303 -#: modules/pref-feeds.php:493 modules/pref-filters.php:90 +#: modules/pref-feeds.php:495 modules/pref-filters.php:90 #: modules/pref-users.php:165 msgid "Options" msgstr "オプション" @@ -1683,8 +1683,8 @@ msgstr "タグを編集する" msgid "Tags for this article (separated by commas):" msgstr "この記事のタグ (カンマで区切ります):" -#: modules/popup-dialog.php:519 modules/pref-feeds.php:386 -#: modules/pref-feeds.php:537 modules/pref-filters.php:129 +#: modules/popup-dialog.php:519 modules/pref-feeds.php:388 +#: modules/pref-feeds.php:539 modules/pref-filters.php:129 #: modules/pref-users.php:181 msgid "Save" msgstr "保存" @@ -1767,166 +1767,166 @@ msgstr "フィードへのリンク:" msgid "Not linked" msgstr "リンクされていません" -#: modules/pref-feeds.php:270 modules/pref-feeds.php:457 +#: modules/pref-feeds.php:270 modules/pref-feeds.php:459 msgid "using" msgstr "" -#: modules/pref-feeds.php:280 modules/pref-feeds.php:467 +#: modules/pref-feeds.php:280 modules/pref-feeds.php:469 msgid "Article purging:" msgstr "記事の削除:" -#: modules/pref-feeds.php:317 modules/pref-feeds.php:499 +#: modules/pref-feeds.php:317 modules/pref-feeds.php:501 msgid "Hide from \"Other Feeds\"" msgstr "「その他のフィード」から隠す" -#: modules/pref-feeds.php:328 modules/pref-feeds.php:504 +#: modules/pref-feeds.php:328 modules/pref-feeds.php:506 msgid "Right-to-left content" msgstr "右から左のコンテンツ" -#: modules/pref-feeds.php:339 modules/pref-feeds.php:509 +#: modules/pref-feeds.php:339 modules/pref-feeds.php:511 msgid "Hide from my feed list" msgstr "自分のフィード一覧から隠す" -#: modules/pref-feeds.php:351 modules/pref-feeds.php:515 +#: modules/pref-feeds.php:351 modules/pref-feeds.php:517 msgid "Include in e-mail digest" msgstr "電子メールダイジェストに含む" -#: modules/pref-feeds.php:372 modules/pref-feeds.php:523 +#: modules/pref-feeds.php:372 modules/pref-feeds.php:525 msgid "Cache images locally" msgstr "ローカルに画像をキャッシュする" -#: modules/pref-feeds.php:383 modules/pref-feeds.php:1367 +#: modules/pref-feeds.php:385 modules/pref-feeds.php:1369 msgid "Unsubscribe" msgstr "購読をやめる" -#: modules/pref-feeds.php:398 +#: modules/pref-feeds.php:400 msgid "Multiple Feed Editor" msgstr "複数フィードエディター" -#: modules/pref-feeds.php:774 modules/pref-feeds.php:821 +#: modules/pref-feeds.php:776 modules/pref-feeds.php:823 msgid "All done." msgstr "すべて終了しました。" -#: modules/pref-feeds.php:852 +#: modules/pref-feeds.php:854 #, php-format msgid "Subscribed to %s." msgstr "%s を購読しました。" -#: modules/pref-feeds.php:854 +#: modules/pref-feeds.php:856 #, php-format msgid "Already subscribed to %s." msgstr "%s は既に購読しています。" -#: modules/pref-feeds.php:936 +#: modules/pref-feeds.php:938 msgid "Category editor" msgstr "カテゴリーエディター" -#: modules/pref-feeds.php:959 +#: modules/pref-feeds.php:961 #, php-format msgid "Category $%s already exists in the database." msgstr "カテゴリー %s はデータベースに既に存在します。" -#: modules/pref-feeds.php:987 +#: modules/pref-feeds.php:989 msgid "Unable to delete non empty feed categories." msgstr "殻でないフィードカテゴリーは削除できません。" -#: modules/pref-feeds.php:1004 +#: modules/pref-feeds.php:1006 msgid "Create category" msgstr "カテゴリーの作成" -#: modules/pref-feeds.php:1064 +#: modules/pref-feeds.php:1066 msgid "No feed categories defined." msgstr "フィードカテゴリーが定義されていません。" -#: modules/pref-feeds.php:1075 modules/pref-filters.php:123 +#: modules/pref-feeds.php:1077 modules/pref-filters.php:123 #: modules/pref-filters.php:415 modules/pref-labels.php:330 -#: modules/pref-users.php:480 +#: modules/pref-users.php:481 msgid "Remove" msgstr "削除" -#: modules/pref-feeds.php:1097 +#: modules/pref-feeds.php:1099 msgid "Some feeds have update errors (click for details)" msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)" -#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22 +#: modules/pref-feeds.php:1121 help/3.php:45 help/4.php:22 msgid "Subscribe to feed" msgstr "フィードを購読する" -#: modules/pref-feeds.php:1124 +#: modules/pref-feeds.php:1126 msgid "Top 25" msgstr "トップ 25" -#: modules/pref-feeds.php:1198 +#: modules/pref-feeds.php:1200 msgid "Show last article times" msgstr "最後の記事の時間を表示する" -#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277 +#: modules/pref-feeds.php:1217 modules/pref-feeds.php:1279 msgid "Last Article" msgstr "最後の記事" -#: modules/pref-feeds.php:1218 modules/pref-feeds.php:1281 +#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1283 msgid "Updated" msgstr "更新日時" -#: modules/pref-feeds.php:1302 modules/pref-filters.php:389 -#: modules/pref-labels.php:310 modules/pref-users.php:455 +#: modules/pref-feeds.php:1304 modules/pref-filters.php:389 +#: modules/pref-labels.php:310 modules/pref-users.php:456 msgid "Click to edit" msgstr "編集するにはクリック" -#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362 +#: modules/pref-feeds.php:1350 modules/pref-feeds.php:1364 msgid "Selection:" msgstr "選択:" -#: modules/pref-feeds.php:1354 +#: modules/pref-feeds.php:1356 msgid "Recategorize" msgstr "カテゴリー再設定" -#: modules/pref-feeds.php:1363 modules/pref-filters.php:413 -#: modules/pref-labels.php:328 modules/pref-users.php:478 +#: modules/pref-feeds.php:1365 modules/pref-filters.php:413 +#: modules/pref-labels.php:328 modules/pref-users.php:479 msgid "Edit" msgstr "編集" -#: modules/pref-feeds.php:1364 +#: modules/pref-feeds.php:1366 msgid "Manual purge" msgstr "手動削除" -#: modules/pref-feeds.php:1365 +#: modules/pref-feeds.php:1367 msgid "Clear feed data" msgstr "フィードデータの消去" -#: modules/pref-feeds.php:1366 modules/pref-filters.php:269 +#: modules/pref-feeds.php:1368 modules/pref-filters.php:269 msgid "Rescore articles" msgstr "記事のスコアの再集計" -#: modules/pref-feeds.php:1372 +#: modules/pref-feeds.php:1374 msgid "Other:" msgstr "その他:" -#: modules/pref-feeds.php:1373 +#: modules/pref-feeds.php:1375 msgid "Edit categories" msgstr "カテゴリーの編集" -#: modules/pref-feeds.php:1380 +#: modules/pref-feeds.php:1382 msgid "OPML" msgstr "OPML" -#: modules/pref-feeds.php:1384 +#: modules/pref-feeds.php:1386 msgid "File:" msgstr "ファイル:" -#: modules/pref-feeds.php:1387 +#: modules/pref-feeds.php:1389 msgid "Import" msgstr "インポート" -#: modules/pref-feeds.php:1394 +#: modules/pref-feeds.php:1396 msgid "Export OPML" msgstr "OPML エクスポート" -#: modules/pref-feeds.php:1397 +#: modules/pref-feeds.php:1399 msgid "Firefox Integration" msgstr "Firefox 統合" -#: modules/pref-feeds.php:1399 +#: modules/pref-feeds.php:1401 msgid "" "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the " "link below." @@ -1934,17 +1934,17 @@ msgstr "" "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny " "Tiny RSS のサイトを使うことができます。" -#: modules/pref-feeds.php:1403 +#: modules/pref-feeds.php:1405 msgid "Click here to register this site as a feed reader." msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。" -#: modules/pref-feeds.php:1412 +#: modules/pref-feeds.php:1414 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." msgstr "" -#: modules/pref-feeds.php:1419 +#: modules/pref-feeds.php:1421 msgid "Generate another link" msgstr "別のリンクを生成する" @@ -2139,7 +2139,7 @@ msgstr "標準に戻す" msgid "Your access level is insufficient to open this tab." msgstr "このタブを開くにはアクセスレベルが不十分です。" -#: modules/pref-users.php:54 modules/pref-users.php:416 +#: modules/pref-users.php:54 modules/pref-users.php:417 msgid "Registered" msgstr "登録済み" @@ -2209,39 +2209,39 @@ msgstr "" msgid "Notifying %s." msgstr "%s の通知中です。" -#: modules/pref-users.php:323 +#: modules/pref-users.php:324 msgid "[tt-rss] Password change notification" msgstr "[tt-rss] パスワード変更通知" -#: modules/pref-users.php:380 help/4.php:27 +#: modules/pref-users.php:381 help/4.php:27 msgid "Create user" msgstr "ユーザーの作成" -#: modules/pref-users.php:414 +#: modules/pref-users.php:415 msgid "Login" msgstr "ログイン" -#: modules/pref-users.php:415 +#: modules/pref-users.php:416 msgid "Access Level" msgstr "アクセスレベル" -#: modules/pref-users.php:417 +#: modules/pref-users.php:418 msgid "Last login" msgstr "最終ログイン" -#: modules/pref-users.php:476 +#: modules/pref-users.php:477 msgid "User details" msgstr "ユーザーの詳細" -#: modules/pref-users.php:482 +#: modules/pref-users.php:483 msgid "Reset password" msgstr "パスワードのリセット" -#: modules/pref-users.php:487 +#: modules/pref-users.php:488 msgid "No users defined." msgstr "ユーザーが定義されていません。" -#: modules/pref-users.php:489 +#: modules/pref-users.php:490 msgid "No matching users found." msgstr "ユーザーが見つかりません。" -- cgit v1.2.3