Regenerate .pot files and merge .po files with them

1 files changed, 144 insertions, 100 deletions

diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index dce82a9a0..f80e33000 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-08-09 12:48+0200\n"
+"POT-Creation-Date: 2014-08-15 03:51+0200\n"
 "PO-Revision-Date: 2012-07-01 23:43+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -92,53 +92,53 @@ msgstr "SIGWINCH のブロックに失敗しました"
 msgid "failed to set new SIGWINCH sigact"
 msgstr "新しい SIGWINCH sigact のセットに失敗しました"
 
-#: dselect/baselist.cc:136
+#: dselect/baselist.cc:174
 msgid "failed to allocate colour pair"
 msgstr "カラーペアの割り当てに失敗しました"
 
-#: dselect/baselist.cc:165
+#: dselect/baselist.cc:203
 msgid "failed to create title window"
 msgstr "タイトルウィンドウの作成に失敗しました"
 
-#: dselect/baselist.cc:169
+#: dselect/baselist.cc:207
 msgid "failed to create whatinfo window"
 msgstr "情報ウィンドウの作成に失敗しました"
 
-#: dselect/baselist.cc:173
+#: dselect/baselist.cc:211
 msgid "failed to create baselist pad"
 msgstr "基本リストパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:214
 msgid "failed to create heading pad"
 msgstr "ヘディングパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:180
+#: dselect/baselist.cc:218
 msgid "failed to create thisstate pad"
 msgstr "ディスステートパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:184
+#: dselect/baselist.cc:222
 msgid "failed to create info pad"
 msgstr "情報パッドの作成に失敗しました"
 
-#: dselect/baselist.cc:189
+#: dselect/baselist.cc:227
 msgid "failed to create query window"
 msgstr "ディレクトリの作成に失敗しました"
 
-#: dselect/baselist.cc:258
+#: dselect/baselist.cc:298
 msgid "Keybindings"
 msgstr "キーバインド"
 
-#: dselect/baselist.cc:307
+#: dselect/baselist.cc:347
 #, c-format
 msgid "  -- %d%%, press "
 msgstr " -- %d%%、"
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:350
 #, c-format
 msgid "%s for more"
 msgstr "%s でスクロール"
 
-#: dselect/baselist.cc:314
+#: dselect/baselist.cc:354
 #, c-format
 msgid "%s to go back"
 msgstr "%s キーで戻る"
@@ -289,6 +289,38 @@ msgid "Keystrokes"
 msgstr "キー操作"
 
 #: dselect/helpmsgs.cc:29
+#, fuzzy
+#| msgid ""
+#| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
+#| "  j, Down-arrow         k, Up-arrow             move highlight\n"
+#| "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
+#| "  ^n                    ^p                      scroll list by 1 line\n"
+#| "  t, Home               e, End                  jump to top/end of list\n"
+#| "  u                     d                       scroll info by 1 page\n"
+#| "  ^u                    ^d                      scroll info by 1 line\n"
+#| "  B, Left-arrow         F, Right-arrow          pan display by 1/3 "
+#| "screen\n"
+#| "  ^b                    ^f                      pan display by 1 "
+#| "character\n"
+#| "\n"
+#| "Mark packages for later processing:\n"
+#| " +, Insert  install or upgrade      =, H  hold in present state\n"
+#| " -, Delete  remove                  :, G  unhold: upgrade or leave "
+#| "uninstalled\n"
+#| " _          remove & purge config\n"
+#| "                                             Miscellaneous:\n"
+#| "Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+#| "Help)\n"
+#| " Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+#| "displays\n"
+#| "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+#| "options\n"
+#| " X, Esc  eXit, abandoning any changes made    v, V  change status display "
+#| "opts\n"
+#| "   R     Revert to state before this list      ^l   redraw display\n"
+#| "   U     set all to sUggested state             /   search (Return to "
+#| "cancel)\n"
+#| "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -312,7 +344,7 @@ msgid ""
 "displays\n"
 "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
 "options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+" X, Esc  eXit, abandoning any changes made   v, A, V  change status display "
 "opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
@@ -894,36 +926,36 @@ msgstr "属性:\n"
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "デバッグファイル `%.250s' をオープンできませんでした\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "無効な %s `%s'"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:272
 msgid "screen part"
 msgstr "画面部"
 
-#: dselect/main.cc:279
+#: dselect/main.cc:278
 msgid "null colour specification"
 msgstr "色の指定が空です"
 
-#: dselect/main.cc:287 dselect/main.cc:292
+#: dselect/main.cc:286 dselect/main.cc:291
 msgid "colour"
 msgstr "色"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:299
 msgid "colour attribute"
 msgstr "色属性"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "端末がカーソル割り付けをサポートしていません。\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:335
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "端末がハイライトをサポートしていません。\n"
 
-#: dselect/main.cc:338
+#: dselect/main.cc:337
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -932,11 +964,11 @@ msgstr ""
 "TERM 環境変数を正しく設定してください。高機能な端末を使用するか、\n"
 "もしくはパッケージごとの管理ツール %s を使用しましょう。\n"
 
-#: dselect/main.cc:341
+#: dselect/main.cc:340
 msgid "terminal lacks necessary features, giving up"
 msgstr "必要とする機能がこの端末にはありません。終了します"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -950,7 +982,7 @@ msgstr ""
 "リターンキーで選択項目を決定します。^L で画面を再描画します。\n"
 "\n"
 
-#: dselect/main.cc:431
+#: dselect/main.cc:430
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -958,7 +990,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:437
+#: dselect/main.cc:436
 msgid ""
 "\n"
 "\n"
@@ -968,15 +1000,23 @@ msgstr ""
 "\n"
 "リードオンリーアクセス: 選択プレビューのみ利用できます!"
 
-#: dselect/main.cc:456
+#: dselect/main.cc:455
 msgid "failed to getch in main menu"
 msgstr "メインメニューでの getch に失敗しました"
 
-#: dselect/main.cc:539
+#: dselect/main.cc:538
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不明なアクション文字列 `%.50s' です"
 
+#: dselect/methlist.cc:66
+msgid "Abbrev."
+msgstr "頭文字"
+
+#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+msgid "Description"
+msgstr "説明"
+
 #: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - アクセス方法の一覧"
@@ -986,35 +1026,27 @@ msgstr "dselect - アクセス方法の一覧"
 msgid "Access method `%s'."
 msgstr "アクセス方法 `%s'。"
 
-#: dselect/methlist.cc:116
-msgid "Abbrev."
-msgstr "頭文字"
-
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:293
-msgid "Description"
-msgstr "説明"
-
-#: dselect/methlist.cc:160 dselect/pkglist.cc:585
+#: dselect/methlist.cc:161 dselect/pkglist.cc:587
 msgid "doupdate failed"
 msgstr "doupdate 失敗"
 
-#: dselect/methlist.cc:163 dselect/pkglist.cc:588
+#: dselect/methlist.cc:164 dselect/pkglist.cc:590
 msgid "failed to unblock SIGWINCH"
 msgstr "SIGWINCH のアンブロックに失敗しました"
 
-#: dselect/methlist.cc:168 dselect/pkglist.cc:593
+#: dselect/methlist.cc:169 dselect/pkglist.cc:595
 msgid "failed to re-block SIGWINCH"
 msgstr "SIGWINCH のリブロックに失敗しました"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc:170 dselect/pkglist.cc:597
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:186
+#: dselect/methlist.cc:187
 msgid "Explanation"
 msgstr "説明"
 
-#: dselect/methlist.cc:196
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "説明がありません。"
 
@@ -1403,67 +1435,119 @@ msgstr "導入済み"
 msgid "Purged"
 msgstr "完全削除"
 
-#: dselect/pkgdisplay.cc:193
+#: dselect/pkgdisplay.cc:138
+msgid "Error"
+msgstr "エラー"
+
+#: dselect/pkgdisplay.cc:139
+msgid "Installed?"
+msgstr "導入?"
+
+#: dselect/pkgdisplay.cc:140
+msgid "Old mark"
+msgstr "前回"
+
+#: dselect/pkgdisplay.cc:141
+msgid "Marked for"
+msgstr "今回"
+
+#: dselect/pkgdisplay.cc:143
+msgid "EIOM"
+msgstr "EIOM"
+
+#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+msgid "Section"
+msgstr "分類"
+
+#: dselect/pkgdisplay.cc:148
+msgid "Priority"
+msgstr "優"
+
+#: dselect/pkgdisplay.cc:152
+msgid "Package"
+msgstr "パッケージ"
+
+#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#, fuzzy
+#| msgid "Avail.ver"
+msgid "Avail.arch"
+msgstr "可能Ver"
+
+#: dselect/pkgdisplay.cc:164
+#, fuzzy
+#| msgid "Inst.ver"
+msgid "Inst.arch"
+msgstr "導入Ver"
+
+#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+msgid "Avail.ver"
+msgstr "可能Ver"
+
+#: dselect/pkgdisplay.cc:181
+msgid "Inst.ver"
+msgstr "導入Ver"
+
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr "dselect - 再帰的パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - パッケージ状態の閲覧"
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr "(分類別)"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr "(利用可、分類別)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr "(状態、分類別)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr "(優先度別)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr "(利用可、優先度別)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr "(状態、優先度別)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:238
 msgid " (alphabetically)"
 msgstr "(アルファベット順)"
 
-#: dselect/pkgdisplay.cc:237
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr "(利用可別)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr "(状態別)"
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr "マーク:+/=/- 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr "マーク:+/=/- 詳細:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:262
 msgid " terse:v help:?"
 msgstr " 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:263
 msgid " verbose:v help:?"
 msgstr " 詳細:v ヘルプ:?"
 
@@ -1506,11 +1590,11 @@ msgstr "利用可能な制御ファイル情報"
 msgid "there are no packages"
 msgstr "パッケージがありません"
 
-#: dselect/pkglist.cc:519
+#: dselect/pkglist.cc:521
 msgid "invalid search option given"
 msgstr "無効な検索オプションが指定されました"
 
-#: dselect/pkglist.cc:534
+#: dselect/pkglist.cc:536
 msgid "error in regular expression"
 msgstr "正規表現エラー"
 
@@ -1560,46 +1644,6 @@ msgstr "%3$s セクションの %1$s%2$s パッケージ"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (前回: %s).  %s"
 
-#: dselect/pkgtop.cc:265
-msgid "Error"
-msgstr "エラー"
-
-#: dselect/pkgtop.cc:269
-msgid "Installed?"
-msgstr "導入?"
-
-#: dselect/pkgtop.cc:273
-msgid "Old mark"
-msgstr "前回"
-
-#: dselect/pkgtop.cc:277
-msgid "Marked for"
-msgstr "今回"
-
-#: dselect/pkgtop.cc:280
-msgid "EIOM"
-msgstr "EIOM"
-
-#: dselect/pkgtop.cc:282
-msgid "Section"
-msgstr "分類"
-
-#: dselect/pkgtop.cc:283
-msgid "Priority"
-msgstr "優"
-
-#: dselect/pkgtop.cc:284
-msgid "Package"
-msgstr "パッケージ"
-
-#: dselect/pkgtop.cc:288
-msgid "Inst.ver"
-msgstr "導入Ver"
-
-#: dselect/pkgtop.cc:291
-msgid "Avail.ver"
-msgstr "可能Ver"
-
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "他アーキテクチャが有効ですが、マルチアーキテクチャはサポートされていません"