[Kita-svn] [2540] i18n

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 8月 9日 (日) 19:45:56 JST


Revision: 2540
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2540
Author:   nogu
Date:     2009-08-09 19:45:56 +0900 (Sun, 09 Aug 2009)

Log Message:
-----------
i18n

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/po/ja.po
    kita/branches/KITA-KDE4/kita/po/kita.pot
    kita/branches/KITA-KDE4/kita/src/bbsview.cpp
    kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
    kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
    kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
    kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
    kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
    kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp

Modified: kita/branches/KITA-KDE4/kita/po/ja.po
===================================================================
--- kita/branches/KITA-KDE4/kita/po/ja.po	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/po/ja.po	2009-08-09 10:45:56 UTC (rev 2540)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-09 19:02+0900\n"
+"POT-Creation-Date: 2009-08-09 19:44+0900\n"
 "PO-Revision-Date: 2009-07-27 06:35+0900\n"
 "Language-Team: 日本語 <kde-i****@kde*****>\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/bbsview.cpp:181
+#: ../src/bbsview.cpp:185
 msgid ""
 "\n"
 "Please create the backup of those caches.\n"
@@ -76,19 +76,28 @@
 msgstr "あぼーん単語一覧。"
 
 #: ../src/kitaui/tabwidgetbase.cpp:147
+msgctxt "@action:inmenu"
 msgid "Activate Next Tab"
 msgstr "次のタブをアクティブにする"
 
-#: ../src/kitaui/tabwidgetbase.cpp:152
+#: ../src/kitaui/tabwidgetbase.cpp:153
+msgctxt "@action:inmenu"
 msgid "Activate Previous Tab"
 msgstr "前のタブをアクティブにする"
 
 #: ../src/htmlpart.cpp:782
 #, kde-format
+msgctxt "@action:inmenu"
 msgid "Add '%1' to abone list"
 msgstr "'%1'をあぼーん一覧に追加"
 
-#: ../src/bbsview.cpp:91 ../src/threadlistview.cpp:202
+#: ../src/htmlpart.cpp:1220
+msgctxt "@action:inmenu"
+msgid "Add Id to Abone List"
+msgstr "ID をあぼーん一覧に追加"
+
+#: ../src/bbsview.cpp:95 ../src/threadlistview.cpp:204
+msgctxt "@action:inmenu"
 msgid "Add to Favorites"
 msgstr "お気に入りに追加"
 
@@ -231,23 +240,28 @@
 msgid "Close"
 msgstr "閉じる"
 
-#: ../src/kitaui/tabwidgetbase.cpp:183
+#: ../src/kitaui/tabwidgetbase.cpp:186
+msgctxt "@action:inmenu"
 msgid "Close All Tabs"
 msgstr "すべてのタブを閉じる"
 
-#: ../src/boardtabwidget.cpp:174 ../src/kitaui/tabwidgetbase.cpp:177
+#: ../src/boardtabwidget.cpp:177 ../src/kitaui/tabwidgetbase.cpp:180
+msgctxt "@action:inmenu"
 msgid "Close Left Tabs"
 msgstr "左のタブすべてを閉じる"
 
-#: ../src/boardtabwidget.cpp:172 ../src/kitaui/tabwidgetbase.cpp:164
+#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:166
+msgctxt "@action:inmenu"
 msgid "Close Other Tabs"
 msgstr "他のタブを閉じる"
 
-#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:171
+#: ../src/boardtabwidget.cpp:175 ../src/kitaui/tabwidgetbase.cpp:174
+msgctxt "@action:inmenu"
 msgid "Close Right Tabs"
 msgstr "右のタブすべてを閉じる"
 
-#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:157
+#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:158
+msgctxt "@action:inmenu"
 msgid "Close This Tab"
 msgstr "このタブを閉じる(&C)"
 
@@ -259,26 +273,36 @@
 msgstr "タブを閉じる"
 
 #: ../src/kitaui/tabwidgetbase.cpp:138
+msgctxt "@action:inmenu"
 msgid "Configure Shortcuts..."
 msgstr "ショートカットを設定(&H)..."
 
-#: ../src/htmlpart.cpp:771 ../src/bbsview.cpp:190
+#: ../src/htmlpart.cpp:771 ../src/htmlpart.cpp:1113
+msgctxt "@action:inmenu"
 msgid "Copy"
 msgstr "コピー"
 
-#: ../src/htmlpart.cpp:798
+#: ../src/bbsview.cpp:194
+msgid "Copy"
+msgstr "コピー"
+
+#: ../src/htmlpart.cpp:800
+msgctxt "@action:inmenu"
 msgid "Copy Link Location"
 msgstr "リンクの場所をコピー"
 
-#: ../src/boardtabwidget.cpp:177
+#: ../src/boardtabwidget.cpp:183
+msgctxt "@action:inmenu"
 msgid "Copy Title and URL"
 msgstr "タイトルと URL をコピー"
 
-#: ../src/bbsview.cpp:88 ../src/threadlistview.cpp:72
+#: ../src/bbsview.cpp:89 ../src/threadlistview.cpp:72
+msgctxt "@action:inmenu"
 msgid "Copy URL"
 msgstr "URL をコピー"
 
-#: ../src/htmlpart.cpp:1102 ../src/bbsview.cpp:89 ../src/threadlistview.cpp:73
+#: ../src/htmlpart.cpp:1110 ../src/bbsview.cpp:91 ../src/threadlistview.cpp:74
+msgctxt "@action:inmenu"
 msgid "Copy title and URL"
 msgstr "タイトルと URL をコピー"
 
@@ -327,7 +351,8 @@
 msgid "Default name."
 msgstr "標準の名前"
 
-#: ../src/threadtabwidget.cpp:247
+#: ../src/threadtabwidget.cpp:252
+msgctxt "@action:button"
 msgid "Delete"
 msgstr "削除(&D)"
 
@@ -336,7 +361,8 @@
 msgid "Delete"
 msgstr "削除"
 
-#: ../src/threadlistview.cpp:75
+#: ../src/threadlistview.cpp:76
+msgctxt "@action:inmenu"
 msgid "Delete Log"
 msgstr "ログを削除"
 
@@ -353,11 +379,11 @@
 msgid "Display all res"
 msgstr "すべてのレスを表示"
 
-#: ../src/bbsview.cpp:189
+#: ../src/bbsview.cpp:193
 msgid "Do you really want to update board list?"
 msgstr "本当に板一覧を更新しますか?"
 
-#: ../src/htmlpart.cpp:829 ../src/htmlpart.cpp:1176 ../src/htmlpart.cpp:1219
+#: ../src/htmlpart.cpp:831 ../src/htmlpart.cpp:1186 ../src/htmlpart.cpp:1230
 #, kde-format
 msgid "Do you want to add '%1' to abone list?"
 msgstr "'%1'をあぼーん一覧に追加しますか?"
@@ -386,15 +412,15 @@
 msgid "Enables auto login"
 msgstr "自動ログインを有効にする(&E)"
 
-#: ../src/htmlpart.cpp:760
+#: ../src/htmlpart.cpp:760 ../src/threadtabwidget.cpp:233
 msgctxt "@action:inmenu"
 msgid "End"
 msgstr "最後(&E)"
 
-#: ../src/threadtabwidget.cpp:229
-msgctxt "@action:intoolbar"
-msgid "End"
-msgstr "最後(&E)"
+#: ../src/htmlpart.cpp:1099
+msgctxt "@action:inmenu"
+msgid "Extract by Name"
+msgstr "名前で抽出"
 
 #: ../src/prefs/preferences.cpp:36
 msgid "Face"
@@ -405,7 +431,7 @@
 msgid "Favorite"
 msgstr "お気に入り(&A)"
 
-#: ../src/bbsview.cpp:407
+#: ../src/bbsview.cpp:411
 msgid "Favorites"
 msgstr "お気に入り"
 
@@ -446,7 +472,8 @@
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/threadtabwidget.cpp:217
+#: ../src/threadtabwidget.cpp:218
+msgctxt "@action:inmenu"
 msgid "Go Back Anchor"
 msgstr "アンカー元に戻る(&G)"
 
@@ -518,12 +545,13 @@
 msgid "Kita - 2ch client for KDE"
 msgstr "Kita - KDE 用の 2ch ブラウザ"
 
-#: ../src/bbsview.cpp:318
+#: ../src/bbsview.cpp:322
 msgid "Kita Board"
 msgstr "Kita 板"
 
 #: ../src/htmlpart.cpp:754
 #, kde-format
+msgctxt "@action:inmenu"
 msgid "Kokomade Yonda (%1)"
 msgstr "ここまで読んだ (%1)"
 
@@ -533,15 +561,17 @@
 msgid "List font."
 msgstr "一覧のフォント。"
 
-#: ../src/mainwindow.cpp:321
+#: ../src/mainwindow.cpp:322
+msgctxt "@action:inmenu"
 msgid "Load Board List"
 msgstr "板一覧の読み込み(&L)"
 
-#: ../src/mainwindow.cpp:308
+#: ../src/mainwindow.cpp:309
+msgctxt "@action:intoolbar"
 msgid "Location Bar"
 msgstr "場所バー"
 
-#: ../src/mainwindow.cpp:326
+#: ../src/mainwindow.cpp:327
 msgctxt "@action:inmenu Login menu"
 msgid "Login"
 msgstr "ログイン(&O)"
@@ -551,10 +581,12 @@
 msgstr "ログイン"
 
 #: ../src/mainwindow.cpp:184
+msgctxt "@info:status"
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
 #: ../src/mainwindow.cpp:182
+msgctxt "@info:status"
 msgid "Login succeeded."
 msgstr "ログインに成功しました。"
 
@@ -570,7 +602,16 @@
 msgid "Mail address of be.2ch.net"
 msgstr "be.2ch.net のメールアドレス"
 
-#: ../src/htmlpart.cpp:734 ../src/htmlpart.cpp:1073
+#: ../src/htmlpart.cpp:734
+msgctxt "@title:menu"
+msgid "Mark"
+msgstr "マーク"
+
+#: ../src/htmlpart.cpp:1075
+msgctxt "@action:inmenu"
+msgid "Mark"
+msgstr "マーク"
+
 #: ../src/threadlistheaderview.cpp:26
 msgid "Mark"
 msgstr "マーク"
@@ -623,7 +664,7 @@
 msgid "Name Completion list."
 msgstr "名前補完一覧。"
 
-#: ../src/bbsview.cpp:171 ../src/bbsview.cpp:194 ../src/bbsview.cpp:254
+#: ../src/bbsview.cpp:175 ../src/bbsview.cpp:198 ../src/bbsview.cpp:258
 msgid ""
 "New boards:\n"
 "\n"
@@ -636,12 +677,12 @@
 msgid "No."
 msgstr "No."
 
-#: ../src/htmlpart.cpp:1477
+#: ../src/htmlpart.cpp:1490
 msgctxt "@label:textbox This is the first reply"
 msgid "None"
 msgstr "なし"
 
-#: ../src/htmlpart.cpp:1497
+#: ../src/htmlpart.cpp:1510
 msgctxt "@label:textbox There is no reply"
 msgid "None"
 msgstr "なし"
@@ -662,9 +703,10 @@
 msgid "OK"
 msgstr "&OK"
 
-#: ../src/htmlpart.cpp:794 ../src/htmlpart.cpp:1081 ../src/htmlpart.cpp:1247
-#: ../src/bbsview.cpp:87 ../src/boardtabwidget.cpp:176
+#: ../src/htmlpart.cpp:795 ../src/htmlpart.cpp:1084 ../src/htmlpart.cpp:1260
+#: ../src/bbsview.cpp:88 ../src/boardtabwidget.cpp:181
 #: ../src/threadlistview.cpp:71
+msgctxt "@action:inmenu"
 msgid "Open with Web Browser"
 msgstr "ウェブブラウザで開く"
 
@@ -704,10 +746,16 @@
 msgid "Popup foreground color."
 msgstr "ポップアップの前景色。"
 
-#: ../src/threadlistview.cpp:77
+#: ../src/threadlistview.cpp:78
+msgctxt "@action:inmenu"
 msgid "Property"
 msgstr "プロパティ"
 
+#: ../src/htmlpart.cpp:1068
+msgctxt "@action:inmenu"
+msgid "Quote This"
+msgstr "引用して書き込む"
+
 #: ../src/threadlistheaderview.cpp:36
 msgctxt "@title:column"
 msgid "ReadNum"
@@ -723,7 +771,8 @@
 msgid "ReadNum"
 msgstr "取得"
 
-#: ../src/threadtabwidget.cpp:235
+#: ../src/threadtabwidget.cpp:240
+msgctxt "@action:button"
 msgid "Reload"
 msgstr "再読み込み(&R)"
 
@@ -750,10 +799,16 @@
 msgid "Reload board"
 msgstr "板の再読み込み"
 
-#: ../src/bbsview.cpp:90 ../src/threadlistview.cpp:202
+#: ../src/bbsview.cpp:93 ../src/threadlistview.cpp:203
+msgctxt "@action:inmenu"
 msgid "Remove from Favorites"
 msgstr "お気に入りから削除"
 
+#: ../src/htmlpart.cpp:1091
+msgctxt "@action:inmenu"
+msgid "Res Tree"
+msgstr "レスをツリー表示"
+
 #: ../src/threadlistheaderview.cpp:34
 msgctxt "@title:column"
 msgid "ResNum"
@@ -769,11 +824,27 @@
 msgid "ResNum"
 msgstr "レス数"
 
-#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:175
+#: ../src/htmlpart.cpp:1095
+msgctxt "@action:inmenu"
+msgid "Reverse Res Tree"
+msgstr "レス元をツリー表示"
+
+#: ../src/htmlpart.cpp:1122
+msgctxt "@action:inmenu"
+msgid "Set Kokomade Yonda"
+msgstr "「ここまで読んだ」をセット"
+
+#: ../src/boardtabwidget.cpp:133
 msgid "Show Old Logs"
 msgstr "古いログを表示(&S)"
 
-#: ../src/mainwindow.cpp:296
+#: ../src/boardtabwidget.cpp:179
+msgctxt "@action:inmenu"
+msgid "Show Old Logs"
+msgstr "古いログを表示(&S)"
+
+#: ../src/mainwindow.cpp:297
+msgctxt "@action:inmenu"
 msgid "Show Toolbar"
 msgstr "ツールバーを表示(&S)"
 
@@ -813,11 +884,13 @@
 msgid "Start"
 msgstr "最初(&S)"
 
-#: ../src/threadtabwidget.cpp:223
+#: ../src/threadtabwidget.cpp:225
+msgctxt "@action:inmenu"
 msgid "Start"
 msgstr "最初(&S)"
 
-#: ../src/threadtabwidget.cpp:241
+#: ../src/threadtabwidget.cpp:246
+msgctxt "@action:inmenu"
 msgid "Stop"
 msgstr "停止(&T)"
 
@@ -845,7 +918,7 @@
 msgid "Text Color"
 msgstr "文字色(&X)"
 
-#: ../src/bbsview.cpp:180 ../src/bbsview.cpp:195 ../src/bbsview.cpp:255
+#: ../src/bbsview.cpp:184 ../src/bbsview.cpp:199 ../src/bbsview.cpp:259
 msgid ""
 "These boards were moved:\n"
 "\n"
@@ -1088,6 +1161,11 @@
 msgid "Write"
 msgstr "書き込み"
 
+#: ../src/htmlpart.cpp:1065
+msgctxt "@action:inmenu"
+msgid "Write Response"
+msgstr "レスを書く"
+
 #. i18n: file: ../src/writedialogbase.ui:16
 #. i18n: ectx: property (windowTitle), widget (QWidget, WriteDialogBase)
 #: rc.cpp:237
@@ -1100,11 +1178,8 @@
 msgid "XX/XX | XXXX/XXXX"
 msgstr "XX/XX | XXXX/XXXX"
 
-#: ../src/htmlpart.cpp:1209
-msgid "add id to abone list"
-msgstr "ID をあぼーん一覧に追加"
-
-#: ../src/htmlpart.cpp:1120
+#: ../src/htmlpart.cpp:1130
+msgctxt "@action:inmenu"
 msgid "add name to abone list"
 msgstr "名前をあぼーん一覧に追加"
 
@@ -1142,18 +1217,11 @@
 msgid "body"
 msgstr "本文"
 
-#: ../src/htmlpart.cpp:1105
-msgid "copy"
-msgstr "コピー"
-
-#: ../src/htmlpart.cpp:1099 ../src/htmlpart.cpp:1244
+#: ../src/htmlpart.cpp:1106 ../src/htmlpart.cpp:1256
+msgctxt "@action:inmenu"
 msgid "copy URL"
 msgstr "URL をコピー"
 
-#: ../src/htmlpart.cpp:1093
-msgid "extract by name"
-msgstr "名前で抽出"
-
 #: ../src/main.cpp:40
 msgid "improvements"
 msgstr "さまざまな改良"
@@ -1191,7 +1259,7 @@
 msgid "name"
 msgstr "名前"
 
-#: ../src/bbsview.cpp:202
+#: ../src/bbsview.cpp:206
 msgid "no new boards"
 msgstr "新しい板はありません"
 
@@ -1199,18 +1267,6 @@
 msgid "quote clipboard"
 msgstr "引用してコピー"
 
-#: ../src/htmlpart.cpp:1066
-msgid "quote this"
-msgstr "引用して書き込む"
-
-#: ../src/htmlpart.cpp:1087
-msgid "res tree"
-msgstr "レスをツリー表示"
-
-#: ../src/htmlpart.cpp:1090
-msgid "reverse res tree"
-msgstr "レス元をツリー表示"
-
 #. i18n: file: ../src/writedialogbase.ui:109
 #. i18n: ectx: property (text), widget (QCheckBox, sageBox)
 #: rc.cpp:255
@@ -1223,10 +1279,6 @@
 msgid "sage checked"
 msgstr "'&sage'を使用"
 
-#: ../src/htmlpart.cpp:1113
-msgid "set Kokomade Yonda"
-msgstr "「ここまで読んだ」をセット"
-
 #. i18n: file: ../src/prefs/faceprefbase.ui:46
 #. i18n: ectx: property (text), widget (QPushButton, listFontButton)
 #. i18n: file: ../src/prefs/faceprefbase.ui:137
@@ -1259,10 +1311,6 @@
 msgid "within "
 msgstr " "
 
-#: ../src/htmlpart.cpp:1063
-msgid "write response"
-msgstr "レスを書く"
-
 #~ msgid " Load Error"
 #~ msgstr " 読み込みエラー"
 
@@ -1287,6 +1335,18 @@
 #~ msgid "Cancel All mosaics"
 #~ msgstr "全てのモザイクを外す"
 
+#~ msgid "Close Left Tabs"
+#~ msgstr "左のタブすべてを閉じる"
+
+#~ msgid "Close Other Tabs"
+#~ msgstr "他のタブを閉じる"
+
+#~ msgid "Close Right Tabs"
+#~ msgstr "右のタブすべてを閉じる"
+
+#~ msgid "Close This Tab"
+#~ msgstr "このタブを閉じる(&C)"
+
 #~ msgid "Close all error tabs"
 #~ msgstr "全てのエラータブを閉じる"
 
@@ -1302,6 +1362,10 @@
 #~ msgid "Do you want to stop loading ?"
 #~ msgstr "読み込みを停止しますか?"
 
+#~ msgctxt "@action:intoolbar"
+#~ msgid "End"
+#~ msgstr "最後(&E)"
+
 #~ msgid "Enter the thread name."
 #~ msgstr "スレ名を入れてください。"
 
@@ -1383,6 +1447,9 @@
 #~ msgid "Open with New Tab"
 #~ msgstr "新しいタブで開く"
 
+#~ msgid "Open with Web Browser"
+#~ msgstr "ウェブブラウザで開く"
+
 #~ msgid "Open with new tab"
 #~ msgstr "新しいタブで開く"
 
@@ -1475,6 +1542,9 @@
 #~ msgid "can't start downloading. try again later."
 #~ msgstr "ダウンロードをスタートできません。後で再度実行してください。"
 
+#~ msgid "copy"
+#~ msgstr "コピー"
+
 #~ msgid "default 1"
 #~ msgstr "デフォルト1"
 

Modified: kita/branches/KITA-KDE4/kita/po/kita.pot
===================================================================
--- kita/branches/KITA-KDE4/kita/po/kita.pot	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/po/kita.pot	2009-08-09 10:45:56 UTC (rev 2540)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-09 19:02+0900\n"
+"POT-Creation-Date: 2009-08-09 19:44+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL @ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL****@li*****>\n"
@@ -17,26 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../src/mainwindow.cpp:182
+msgctxt "@info:status"
 msgid "Login succeeded."
 msgstr ""
 
 #: ../src/mainwindow.cpp:184
+msgctxt "@info:status"
 msgid "Login failed."
 msgstr ""
 
-#: ../src/mainwindow.cpp:296
+#: ../src/mainwindow.cpp:297
+msgctxt "@action:inmenu"
 msgid "Show Toolbar"
 msgstr ""
 
-#: ../src/mainwindow.cpp:308
+#: ../src/mainwindow.cpp:309
+msgctxt "@action:intoolbar"
 msgid "Location Bar"
 msgstr ""
 
-#: ../src/mainwindow.cpp:321
+#: ../src/mainwindow.cpp:322
+msgctxt "@action:inmenu"
 msgid "Load Board List"
 msgstr ""
 
-#: ../src/mainwindow.cpp:326
+#: ../src/mainwindow.cpp:327
 msgctxt "@action:inmenu Login menu"
 msgid "Login"
 msgstr ""
@@ -46,8 +51,8 @@
 msgid "Back"
 msgstr ""
 
-#: ../src/htmlpart.cpp:734 ../src/htmlpart.cpp:1073
-#: ../src/threadlistheaderview.cpp:26
+#: ../src/htmlpart.cpp:734
+msgctxt "@title:menu"
 msgid "Mark"
 msgstr ""
 
@@ -58,88 +63,104 @@
 
 #: ../src/htmlpart.cpp:754
 #, kde-format
+msgctxt "@action:inmenu"
 msgid "Kokomade Yonda (%1)"
 msgstr ""
 
-#: ../src/htmlpart.cpp:760
+#: ../src/htmlpart.cpp:760 ../src/threadtabwidget.cpp:233
 msgctxt "@action:inmenu"
 msgid "End"
 msgstr ""
 
-#: ../src/htmlpart.cpp:771 ../src/bbsview.cpp:190
+#: ../src/htmlpart.cpp:771 ../src/htmlpart.cpp:1113
+msgctxt "@action:inmenu"
 msgid "Copy"
 msgstr ""
 
 #: ../src/htmlpart.cpp:782
 #, kde-format
+msgctxt "@action:inmenu"
 msgid "Add '%1' to abone list"
 msgstr ""
 
-#: ../src/htmlpart.cpp:794 ../src/htmlpart.cpp:1081 ../src/htmlpart.cpp:1247
-#: ../src/bbsview.cpp:87 ../src/boardtabwidget.cpp:176
+#: ../src/htmlpart.cpp:795 ../src/htmlpart.cpp:1084 ../src/htmlpart.cpp:1260
+#: ../src/bbsview.cpp:88 ../src/boardtabwidget.cpp:181
 #: ../src/threadlistview.cpp:71
+msgctxt "@action:inmenu"
 msgid "Open with Web Browser"
 msgstr ""
 
-#: ../src/htmlpart.cpp:798
+#: ../src/htmlpart.cpp:800
+msgctxt "@action:inmenu"
 msgid "Copy Link Location"
 msgstr ""
 
-#: ../src/htmlpart.cpp:829 ../src/htmlpart.cpp:1176 ../src/htmlpart.cpp:1219
+#: ../src/htmlpart.cpp:831 ../src/htmlpart.cpp:1186 ../src/htmlpart.cpp:1230
 #, kde-format
 msgid "Do you want to add '%1' to abone list?"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1063
-msgid "write response"
+#: ../src/htmlpart.cpp:1065
+msgctxt "@action:inmenu"
+msgid "Write Response"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1066
-msgid "quote this"
+#: ../src/htmlpart.cpp:1068
+msgctxt "@action:inmenu"
+msgid "Quote This"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1087
-msgid "res tree"
+#: ../src/htmlpart.cpp:1075
+msgctxt "@action:inmenu"
+msgid "Mark"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1090
-msgid "reverse res tree"
+#: ../src/htmlpart.cpp:1091
+msgctxt "@action:inmenu"
+msgid "Res Tree"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1093
-msgid "extract by name"
+#: ../src/htmlpart.cpp:1095
+msgctxt "@action:inmenu"
+msgid "Reverse Res Tree"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1099 ../src/htmlpart.cpp:1244
+#: ../src/htmlpart.cpp:1099
+msgctxt "@action:inmenu"
+msgid "Extract by Name"
+msgstr ""
+
+#: ../src/htmlpart.cpp:1106 ../src/htmlpart.cpp:1256
+msgctxt "@action:inmenu"
 msgid "copy URL"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1102 ../src/bbsview.cpp:89 ../src/threadlistview.cpp:73
+#: ../src/htmlpart.cpp:1110 ../src/bbsview.cpp:91 ../src/threadlistview.cpp:74
+msgctxt "@action:inmenu"
 msgid "Copy title and URL"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1105
-msgid "copy"
+#: ../src/htmlpart.cpp:1122
+msgctxt "@action:inmenu"
+msgid "Set Kokomade Yonda"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1113
-msgid "set Kokomade Yonda"
-msgstr ""
-
-#: ../src/htmlpart.cpp:1120
+#: ../src/htmlpart.cpp:1130
+msgctxt "@action:inmenu"
 msgid "add name to abone list"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1209
-msgid "add id to abone list"
+#: ../src/htmlpart.cpp:1220
+msgctxt "@action:inmenu"
+msgid "Add Id to Abone List"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1477
+#: ../src/htmlpart.cpp:1490
 msgctxt "@label:textbox This is the first reply"
 msgid "None"
 msgstr ""
 
-#: ../src/htmlpart.cpp:1497
+#: ../src/htmlpart.cpp:1510
 msgctxt "@label:textbox There is no reply"
 msgid "None"
 msgstr ""
@@ -149,28 +170,28 @@
 msgid "Thread"
 msgstr ""
 
-#: ../src/threadtabwidget.cpp:217
+#: ../src/threadtabwidget.cpp:218
+msgctxt "@action:inmenu"
 msgid "Go Back Anchor"
 msgstr ""
 
-#: ../src/threadtabwidget.cpp:223
+#: ../src/threadtabwidget.cpp:225
+msgctxt "@action:inmenu"
 msgid "Start"
 msgstr ""
 
-#: ../src/threadtabwidget.cpp:229
-msgctxt "@action:intoolbar"
-msgid "End"
-msgstr ""
-
-#: ../src/threadtabwidget.cpp:235
+#: ../src/threadtabwidget.cpp:240
+msgctxt "@action:button"
 msgid "Reload"
 msgstr ""
 
-#: ../src/threadtabwidget.cpp:241
+#: ../src/threadtabwidget.cpp:246
+msgctxt "@action:inmenu"
 msgid "Stop"
 msgstr ""
 
-#: ../src/threadtabwidget.cpp:247
+#: ../src/threadtabwidget.cpp:252
+msgctxt "@action:button"
 msgid "Delete"
 msgstr ""
 
@@ -193,49 +214,56 @@
 msgid "Board Name"
 msgstr ""
 
-#: ../src/bbsview.cpp:88 ../src/threadlistview.cpp:72
+#: ../src/bbsview.cpp:89 ../src/threadlistview.cpp:72
+msgctxt "@action:inmenu"
 msgid "Copy URL"
 msgstr ""
 
-#: ../src/bbsview.cpp:90 ../src/threadlistview.cpp:202
+#: ../src/bbsview.cpp:93 ../src/threadlistview.cpp:203
+msgctxt "@action:inmenu"
 msgid "Remove from Favorites"
 msgstr ""
 
-#: ../src/bbsview.cpp:91 ../src/threadlistview.cpp:202
+#: ../src/bbsview.cpp:95 ../src/threadlistview.cpp:204
+msgctxt "@action:inmenu"
 msgid "Add to Favorites"
 msgstr ""
 
-#: ../src/bbsview.cpp:171 ../src/bbsview.cpp:194 ../src/bbsview.cpp:254
+#: ../src/bbsview.cpp:175 ../src/bbsview.cpp:198 ../src/bbsview.cpp:258
 msgid ""
 "New boards:\n"
 "\n"
 msgstr ""
 
-#: ../src/bbsview.cpp:180 ../src/bbsview.cpp:195 ../src/bbsview.cpp:255
+#: ../src/bbsview.cpp:184 ../src/bbsview.cpp:199 ../src/bbsview.cpp:259
 msgid ""
 "These boards were moved:\n"
 "\n"
 msgstr ""
 
-#: ../src/bbsview.cpp:181
+#: ../src/bbsview.cpp:185
 msgid ""
 "\n"
 "Please create the backup of those caches.\n"
 msgstr ""
 
-#: ../src/bbsview.cpp:189
+#: ../src/bbsview.cpp:193
 msgid "Do you really want to update board list?"
 msgstr ""
 
-#: ../src/bbsview.cpp:202
+#: ../src/bbsview.cpp:194
+msgid "Copy"
+msgstr ""
+
+#: ../src/bbsview.cpp:206
 msgid "no new boards"
 msgstr ""
 
-#: ../src/bbsview.cpp:318
+#: ../src/bbsview.cpp:322
 msgid "Kita Board"
 msgstr ""
 
-#: ../src/bbsview.cpp:407
+#: ../src/bbsview.cpp:411
 msgid "Favorites"
 msgstr ""
 
@@ -253,27 +281,37 @@
 msgid "Reload"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:175
+#: ../src/boardtabwidget.cpp:133
 msgid "Show Old Logs"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:157
+#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:158
+msgctxt "@action:inmenu"
 msgid "Close This Tab"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:172 ../src/kitaui/tabwidgetbase.cpp:164
+#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:166
+msgctxt "@action:inmenu"
 msgid "Close Other Tabs"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:171
+#: ../src/boardtabwidget.cpp:175 ../src/kitaui/tabwidgetbase.cpp:174
+msgctxt "@action:inmenu"
 msgid "Close Right Tabs"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:174 ../src/kitaui/tabwidgetbase.cpp:177
+#: ../src/boardtabwidget.cpp:177 ../src/kitaui/tabwidgetbase.cpp:180
+msgctxt "@action:inmenu"
 msgid "Close Left Tabs"
 msgstr ""
 
-#: ../src/boardtabwidget.cpp:177
+#: ../src/boardtabwidget.cpp:179
+msgctxt "@action:inmenu"
+msgid "Show Old Logs"
+msgstr ""
+
+#: ../src/boardtabwidget.cpp:183
+msgctxt "@action:inmenu"
 msgid "Copy Title and URL"
 msgstr ""
 
@@ -341,21 +379,29 @@
 msgstr ""
 
 #: ../src/kitaui/tabwidgetbase.cpp:138
+msgctxt "@action:inmenu"
 msgid "Configure Shortcuts..."
 msgstr ""
 
 #: ../src/kitaui/tabwidgetbase.cpp:147
+msgctxt "@action:inmenu"
 msgid "Activate Next Tab"
 msgstr ""
 
-#: ../src/kitaui/tabwidgetbase.cpp:152
+#: ../src/kitaui/tabwidgetbase.cpp:153
+msgctxt "@action:inmenu"
 msgid "Activate Previous Tab"
 msgstr ""
 
-#: ../src/kitaui/tabwidgetbase.cpp:183
+#: ../src/kitaui/tabwidgetbase.cpp:186
+msgctxt "@action:inmenu"
 msgid "Close All Tabs"
 msgstr ""
 
+#: ../src/threadlistheaderview.cpp:26
+msgid "Mark"
+msgstr ""
+
 #: ../src/threadlistheaderview.cpp:28
 msgctxt "@title:column"
 msgid "No."
@@ -561,11 +607,13 @@
 msgid "Broken"
 msgstr ""
 
-#: ../src/threadlistview.cpp:75
+#: ../src/threadlistview.cpp:76
+msgctxt "@action:inmenu"
 msgid "Delete Log"
 msgstr ""
 
-#: ../src/threadlistview.cpp:77
+#: ../src/threadlistview.cpp:78
+msgctxt "@action:inmenu"
 msgid "Property"
 msgstr ""
 

Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -84,11 +84,15 @@
     connect(searchCombo, SIGNAL(textChanged(const QString&)),
              SLOT(filter(const QString&)));
 
-    m_openWithBrowserAct = new KAction(i18n("Open with Web Browser"), this);
-    m_copyUrlAct = new KAction(i18n("Copy URL"), this);
-    m_copyTitleAndUrlAct = new KAction(i18n("Copy title and URL"), this);
-    m_removeFromFavoritesAct = new KAction(i18n("Remove from Favorites"), this);
-    m_addToFavoritesAct = new KAction(i18n("Add to Favorites"), this);
+    m_openWithBrowserAct
+        = new KAction(i18nc("@action:inmenu", "Open with Web Browser"), this);
+    m_copyUrlAct = new KAction(i18nc("@action:inmenu", "Copy URL"), this);
+    m_copyTitleAndUrlAct
+        = new KAction(i18nc("@action:inmenu", "Copy title and URL"), this);
+    m_removeFromFavoritesAct
+        = new KAction(i18nc("@action:inmenu", "Remove from Favorites"), this);
+    m_addToFavoritesAct
+        = new KAction(i18nc("@action:inmenu", "Add to Favorites"), this);
 }
 
 BBSView::~BBSView()

Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -168,13 +168,19 @@
 {
     connect(this, SIGNAL(contextMenu(int, const QPoint&)),
              SLOT(showPopupMenu(int, const QPoint&)));
-    m_closeAct = new KAction(i18n("Close This Tab"), this);
-    m_closeOtherAct = new KAction(i18n("Close Other Tabs"), this);
-    m_closeRightAct = new KAction(i18n("Close Right Tabs"), this);
-    m_closeLeftAct = new KAction(i18n("Close Left Tabs"), this);
-    m_showOldLogsAct = new KAction(i18n("Show Old Logs"), this);
-    m_openBrowserAct = new KAction(i18n("Open with Web Browser"), this);
-    m_copyTitleAct = new KAction(i18n("Copy Title and URL"), this);
+    m_closeAct = new KAction(i18nc("@action:inmenu", "Close This Tab"), this);
+    m_closeOtherAct
+        = new KAction(i18nc("@action:inmenu", "Close Other Tabs"), this);
+    m_closeRightAct
+        = new KAction(i18nc("@action:inmenu", "Close Right Tabs"), this);
+    m_closeLeftAct
+        = new KAction(i18nc("@action:inmenu", "Close Left Tabs"), this);
+    m_showOldLogsAct
+        = new KAction(i18nc("@action:inmenu", "Show Old Logs"), this);
+    m_openBrowserAct
+        = new KAction(i18nc("@action:inmenu", "Open with Web Browser"), this);
+    m_copyTitleAct
+        = new KAction(i18nc("@action:inmenu", "Copy Title and URL"), this);
 }
 
 SubjectTabBar::~SubjectTabBar()

Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -731,7 +731,7 @@
             if (datManager.isMarked(i)) {
                 if (!markSubMenu) {
                     markSubMenu = new KMenu(view());
-                    markSubMenu->setTitle(i18n("Mark"));
+                    markSubMenu->setTitle(i18nc("@title:menu", "Mark"));
                     popupMenu.addMenu(markSubMenu);
                     popupMenu.addSeparator();
                 }
@@ -751,7 +751,7 @@
         if (m_mode == HTMLPART_MODE_MAINPART) {
             int kokoyon = datManager.getViewPos();
             if (kokoyon) {
-                str = i18n("Kokomade Yonda (%1)", kokoyon);
+                str = i18nc("@action:inmenu", "Kokomade Yonda (%1)", kokoyon);
                 kokoLinkAct = new KAction(str, this);
                 popupMenu.addAction(kokoLinkAct);
             }
@@ -768,7 +768,7 @@
         if (showppm) popupMenu.addSeparator();
         showppm = true;
 
-        copyStrAct = new KAction(i18n("Copy"), this);
+        copyStrAct = new KAction(i18nc("@action:inmenu", "Copy"), this);
         popupMenu.addAction(copyStrAct);
 
         // truncated
@@ -778,8 +778,8 @@
             selectedStr.append("...");
         }
 
-        aboneWordAct
-            = new KAction(i18n("Add '%1' to abone list", selectedStr), this);
+        aboneWordAct = new KAction(i18nc("@action:inmenu",
+                    "Add '%1' to abone list", selectedStr), this);
         popupMenu.addAction(aboneWordAct);
     }
 
@@ -791,11 +791,13 @@
         if (showppm) popupMenu.addSeparator();
         showppm = true;
 
-        openBrowserAct = new KAction(i18n("Open with Web Browser"), this);
+        openBrowserAct= new KAction(i18nc("@action:inmenu",
+                    "Open with Web Browser"), this);
         popupMenu.addAction(openBrowserAct);
         popupMenu.addSeparator();
 
-        copyLinkAct = new KAction(i18n("Copy Link Location"), this);
+        copyLinkAct = new KAction(i18nc("@action:inmenu",
+                    "Copy Link Location"), this);
         popupMenu.addAction(copyLinkAct);
     }
 
@@ -1060,17 +1062,17 @@
     KAction* resAct = 0;
     KAction* quoteAct = 0;
     if (m_mode == HTMLPART_MODE_MAINPART) {
-        resAct = new KAction(i18n("write response"), this);
+        resAct = new KAction(i18nc("@action:inmenu", "Write Response"), this);
         popupMenu.addAction(resAct);
         
-        quoteAct = new KAction(i18n("quote this"), this);
+        quoteAct = new KAction(i18nc("@action:inmenu", "Quote This"), this);
         popupMenu.addAction(quoteAct);
 
         popupMenu.addSeparator();
     }
 
     // mark
-    KAction* markAct = new KAction(i18n("Mark"), this);
+    KAction* markAct = new KAction(i18nc("@action:inmenu", "Mark"), this);
     markAct->setCheckable(true);
     markAct->setChecked(datManager.isMarked(resNum));
     popupMenu.addAction(markAct);
@@ -1078,31 +1080,37 @@
     popupMenu.addSeparator();
 
     // open
-    KAction* showBrowserAct = new KAction(i18n("Open with Web Browser"), this);
+    KAction* showBrowserAct
+        = new KAction(i18nc("@action:inmenu", "Open with Web Browser"), this);
     popupMenu.addAction(showBrowserAct);
 
     popupMenu.addSeparator();
 
     // util
-    KAction* resTreeAct = new KAction(i18n("res tree"), this);
+    KAction* resTreeAct
+        = new KAction(i18nc("@action:inmenu", "Res Tree"), this);
     popupMenu.addAction(resTreeAct);
 
-    KAction* reverseResTreeAct = new KAction(i18n("reverse res tree"), this);
+    KAction* reverseResTreeAct
+        = new KAction(i18nc("@action:inmenu", "Reverse Res Tree"), this);
     popupMenu.addAction(reverseResTreeAct);
 
-    KAction* extractNameAct = new KAction(i18n("extract by name"), this);
+    KAction* extractNameAct
+        = new KAction(i18nc("@action:inmenu", "Extract by Name"), this);
     popupMenu.addAction(extractNameAct);
 
     popupMenu.addSeparator();
 
     // copy
-    KAction* copyUrlAct = new KAction(i18n("copy URL"), this);
+    KAction* copyUrlAct
+        = new KAction(i18nc("@action:inmenu", "copy URL"), this);
     popupMenu.addAction(copyUrlAct);
 
-    KAction* copyThreadNameAct = new KAction(i18n("Copy title and URL"), this);
+    KAction* copyThreadNameAct
+        = new KAction(i18nc("@action:inmenu", "Copy title and URL"), this);
     popupMenu.addAction(copyThreadNameAct);
 
-    KAction* copyAct = new KAction(i18n("copy"), this);
+    KAction* copyAct = new KAction(i18nc("@action:inmenu", "Copy"), this);
     popupMenu.addAction(copyAct);
 
     // kokkoma de yonda
@@ -1110,14 +1118,16 @@
     if (m_domtree && m_mode == HTMLPART_MODE_MAINPART) {
         popupMenu.addSeparator();
 
-        setKokoYonAct = new KAction(i18n("set Kokomade Yonda"), this);
+        setKokoYonAct
+            = new KAction(i18nc("@action:inmenu", "Set Kokomade Yonda"), this);
         popupMenu.addAction(setKokoYonAct);
     }
 
     // abone
     popupMenu.addSeparator();
 
-    KAction* aboneNameAct = new KAction(i18n("add name to abone list"), this);
+    KAction* aboneNameAct
+        = new KAction(i18nc("@action:inmenu", "add name to abone list"), this);
     popupMenu.addAction(aboneNameAct);
 
 
@@ -1206,7 +1216,8 @@
     else {
         KMenu popupMenu(view());
 
-        KAction* aboneAct = new KAction(i18n("add id to abone list"), this);
+        KAction* aboneAct = new KAction(i18nc("@action:inmenu",
+                    "Add Id to Abone List"), this);
         popupMenu.addAction(aboneAct);
 
         QAction* action = popupMenu.exec(QCursor::pos());
@@ -1241,10 +1252,12 @@
         
         QClipboard * clipboard = QApplication::clipboard();
 
-        KAction* copyUrlAct = new KAction(i18n("copy URL"), this);
+        KAction* copyUrlAct
+            = new KAction(i18nc("@action:inmenu", "copy URL"), this);
         popupMenu.addAction(copyUrlAct);
 
-        KAction* showBrowserAct = new KAction(i18n("Open with Web Browser"), this);
+        KAction* showBrowserAct = new KAction(i18nc("@action:inmenu",
+                    "Open with Web Browser"), this);
 
         // show popup menu
         QAction* action = popupMenu.exec(QCursor::pos());

Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -135,7 +135,7 @@
 {
     actionCollection()->associateWidget(this);
 
-    QString str = i18n("Configure Shortcuts...");
+    QString str = i18nc("@action:inmenu", "Configure Shortcuts...");
     KAction* tabConfigkeysAction
         = actionCollection()->addAction("tab_configkeys");
     tabConfigkeysAction->setText(str);
@@ -144,43 +144,46 @@
 
     KAction* tabNexttabAction
         = actionCollection()->addAction("tab_nexttab");
-    tabNexttabAction->setText(i18n("Activate Next Tab"));
+    tabNexttabAction->setText(i18nc("@action:inmenu", "Activate Next Tab"));
     tabNexttabAction->setShortcut(KStandardShortcut::tabNext());
     connect(tabNexttabAction, SIGNAL(triggered()), this, SLOT(slotNextTab()));
 
     KAction* tabPrevtabAction = actionCollection()->addAction("tab_prevtab");
-    tabPrevtabAction->setText(i18n("Activate Previous Tab"));
+    tabPrevtabAction->setText(i18nc("@action:inmenu",
+                "Activate Previous Tab"));
     tabPrevtabAction->setShortcut(KStandardShortcut::tabPrev());
     connect(tabPrevtabAction, SIGNAL(triggered()), this, SLOT(slotPrevTab()));
 
     KAction* tabClosetabAction = actionCollection()->addAction("tab_closetab");
-    tabClosetabAction->setText(i18n("Close This Tab"));
+    tabClosetabAction->setText(i18nc("@action:inmenu", "Close This Tab"));
     tabClosetabAction->setShortcut(KStandardShortcut::close());
     connect(tabClosetabAction, SIGNAL(triggered()),
             this, SLOT(slotCloseCurrentTab()));
 
     KAction* tabCloseothertabAction
         = actionCollection()->addAction("tab_closetotherab");
-    tabCloseothertabAction->setText(i18n("Close Other Tabs"));
+    tabCloseothertabAction->setText(i18nc("@action:inmenu",
+                "Close Other Tabs"));
     tabCloseothertabAction->setShortcut(KStandardShortcut::close());
     connect(tabCloseothertabAction, SIGNAL(triggered()),
             this, SLOT(slotCloseOtherTab()));
 
     KAction* tabCloserighttabAction
         = actionCollection()->addAction("tab_closetrightab");
-    tabCloserighttabAction->setText(i18n("Close Right Tabs"));
+    tabCloserighttabAction->setText(i18nc("@action:inmenu",
+                "Close Right Tabs"));
     connect(tabCloserighttabAction, SIGNAL(triggered()),
             this, SLOT(slotCloseRightTab()));
 
     KAction* tabCloselefttabAction
         = actionCollection()->addAction("tab_closetleftab");
-    tabCloselefttabAction->setText(i18n("Close Left Tabs"));
+    tabCloselefttabAction->setText(i18nc("@action:inmenu", "Close Left Tabs"));
     connect(tabCloselefttabAction, SIGNAL(triggered()),
             this, SLOT(slotCloseLeftTab()));
 
     KAction* tabClosealltabAction
         = actionCollection()->addAction("tab_closealltab");
-    tabClosealltabAction->setText(i18n("Close All Tabs"));
+    tabClosealltabAction->setText(i18nc("@action:inmenu", "Close All Tabs"));
     connect(tabClosealltabAction, SIGNAL(triggered()),
             this, SLOT(slotCloseAllTab()));
 }

Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -179,9 +179,9 @@
 void MainWindow::login()
 {
     if (Account::login(AccountConfig::userID(), AccountConfig::password())) {
-        setMainStatus(i18n("Login succeeded."));
+        setMainStatus(i18nc("@info:status", "Login succeeded."));
     } else {
-        setMainStatus(i18n("Login failed."));
+        setMainStatus(i18nc("@info:status", "Login failed."));
     }
 }
 
@@ -272,7 +272,7 @@
 void MainWindow::setMainStatus(const QString& statusStr)
 {
     // display the text on the statusbar
-    statusBar() ->showMessage(statusStr);
+    statusBar()->showMessage(statusStr);
 }
 
 void MainWindow::slotUrlLine()
@@ -293,7 +293,8 @@
 
     setStandardToolBarMenuEnabled(true);
 
-    m_toolbarAction = new KToggleAction(i18n("Show Toolbar"), this);
+    m_toolbarAction
+        = new KToggleAction(i18nc("@action:inmenu", "Show Toolbar"), this);
     actionCollection()->addAction("toolBar", m_toolbarAction);
     connect(m_toolbarAction, SIGNAL(toggled(bool)),
             SLOT(optionsShowToolbar()));
@@ -305,7 +306,7 @@
     m_urlLine = new KLineEdit;
     KAction* urlLineAction = new KAction(this);
     urlLineAction->setDefaultWidget(m_urlLine);
-    urlLineAction->setText(i18n("Location Bar"));
+    urlLineAction->setText(i18nc("@action:intoolbar", "Location Bar"));
     actionCollection()->addAction("url_line_action", urlLineAction);
     connect(urlLineAction, SIGNAL(triggered()), this, SLOT(slotUrlLine()));
 
@@ -318,7 +319,7 @@
 
     KAction* loadBoardAction
         = actionCollection()->addAction("load_board_list");
-    loadBoardAction->setText(i18n("Load Board List"));
+    loadBoardAction->setText(i18nc("@action:inmenu", "Load Board List"));
     connect(loadBoardAction, SIGNAL(triggered()),
             m_bbsTab, SLOT(updateBoardList()));
 

Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -68,13 +68,14 @@
              SLOT(slotItemClicked(QTableWidgetItem*)));
 
     m_openWithBrowserAct
-        = new KAction(i18n("Open with Web Browser") , this);
-    m_copyURLAct = new KAction(i18n("Copy URL"), this);
-    m_copyTitleAndURLAct = new KAction(i18n("Copy title and URL"), this);
+        = new KAction(i18nc("@action:inmenu", "Open with Web Browser") , this);
+    m_copyURLAct = new KAction(i18nc("@action:inmenu", "Copy URL"), this);
+    m_copyTitleAndURLAct
+        = new KAction(i18nc("@action:inmenu", "Copy title and URL"), this);
     m_favoritesAct = new KAction(this);
-    m_deleteLogAct = new KAction(i18n("Delete Log"), this);
+    m_deleteLogAct = new KAction(i18nc("@action:inmenu", "Delete Log"), this);
     m_deleteLogAct->setVisible(false);
-    m_propertyAct = new KAction(i18n("Property"), this);
+    m_propertyAct = new KAction(i18nc("@action:inmenu", "Property"), this);
 }
 
 ThreadListView::~ThreadListView() {}
@@ -199,7 +200,8 @@
 
     bool isFavorites = FavoriteThreads::getInstance()->contains(datURL);
     m_favoritesAct->setText(isFavorites
-        ? i18n("Remove from Favorites") : i18n("Add to Favorites"));
+        ? i18nc("@action:inmenu", "Remove from Favorites")
+        : i18nc("@action:inmenu", "Add to Favorites"));
     popup.addAction(m_favoritesAct);
 
     if (datManager.getReadNum()) {

Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-08-09 10:04:39 UTC (rev 2539)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-08-09 10:45:56 UTC (rev 2540)
@@ -205,49 +205,54 @@
 /* private */
 void ThreadTabWidget::setupActions()
 {
-    KStandardAction::copy(this, SLOT(slotCopyText()), actionCollection());
+    KStandardAction::copy(this, SLOT(slotCopyText()),
+            actionCollection());
+    KStandardAction::find(this, SLOT(slotFocusSearchCombo()),
+            actionCollection());
+    KStandardAction::findNext(this, SLOT(slotSearchNext()),
+            actionCollection());
+    KStandardAction::findPrev(this, SLOT(slotSearchPrev()),
+            actionCollection());
 
-    KStandardAction::find(this, SLOT(slotFocusSearchCombo()), actionCollection());
+    KAction* gobackAction = actionCollection()->addAction("threadview_goback");
+    gobackAction->setText(i18nc("@action:inmenu", "Go Back Anchor"));
+    gobackAction->setShortcut(Qt::Key_Backspace);
+    gobackAction->setIcon(SmallIcon("arrow-left-double"));
+    connect(gobackAction, SIGNAL(triggered()), this, SLOT(slotGobackAnchor()));
 
-    KStandardAction::findNext(this, SLOT(slotSearchNext()), actionCollection());
+    KAction* gotoheaderAction
+        = actionCollection()->addAction("threadview_gotoheader");
+    gotoheaderAction->setText(i18nc("@action:inmenu", "Start"));
+    gotoheaderAction->setShortcut(Qt::Key_Home);
+    gotoheaderAction->setIcon(SmallIcon("go-up"));
+    connect(gotoheaderAction, SIGNAL(triggered()),
+            this, SLOT(slotGotoHeader()));
 
-    KStandardAction::findPrev(this, SLOT(slotSearchPrev()), actionCollection());
+    KAction* gotofooterAction
+        = actionCollection()->addAction("threadview_gotofooter");
+    gotofooterAction->setText(i18nc("@action:inmenu", "End"));
+    gotofooterAction->setShortcut(Qt::Key_End);
+    gotofooterAction->setIcon(SmallIcon("go-down"));
+    connect(gotofooterAction, SIGNAL(triggered()), this, SLOT(slotGotoFooter()));
 
-    KAction* goback_action = actionCollection()->addAction("threadview_goback");
-    goback_action->setText(i18n("Go Back Anchor"));
-    goback_action->setShortcut(Qt::Key_Backspace);
-    goback_action->setIcon(SmallIcon("arrow-left-double"));
-    connect(goback_action, SIGNAL(triggered()), this, SLOT(slotGobackAnchor()));
-
-    KAction* gotoheader_action = actionCollection()->addAction("threadview_gotoheader");
-    gotoheader_action->setText(i18n("Start"));
-    gotoheader_action->setShortcut(Qt::Key_Home);
-    gotoheader_action->setIcon(SmallIcon("go-up"));
-    connect(gotoheader_action, SIGNAL(triggered()), this, SLOT(slotGotoHeader()));
-
-    KAction* gotofooter_action = actionCollection()->addAction("threadview_gotofooter");
-    gotofooter_action->setText(i18nc("@action:intoolbar", "End"));
-    gotofooter_action->setShortcut(Qt::Key_End);
-    gotofooter_action->setIcon(SmallIcon("go-down"));
-    connect(gotofooter_action, SIGNAL(triggered()), this, SLOT(slotGotoFooter()));
-
-    KAction* reload_action = actionCollection()->addAction("threadview_reload");
-    reload_action->setText(i18n("Reload"));
+    KAction* reload_action
+        = actionCollection()->addAction("threadview_reload");
+    reload_action->setText(i18nc("@action:button", "Reload"));
     reload_action->setShortcut(KStandardShortcut::reload());
     reload_action->setIcon(SmallIcon("view-refresh"));
     connect(reload_action, SIGNAL(triggered()), this, SLOT(slotReloadButton()));
 
-    KAction* stop_action = actionCollection()->addAction("threadview_stop");
-    stop_action->setText(i18n("Stop"));
-    stop_action->setShortcut(Qt::Key_Escape);
-    stop_action->setIcon(SmallIcon("process-stop"));
-    connect(stop_action, SIGNAL(triggered()), this, SLOT(slotStopLoading()));
+    KAction* stopAction = actionCollection()->addAction("threadview_stop");
+    stopAction->setText(i18nc("@action:inmenu", "Stop"));
+    stopAction->setShortcut(Qt::Key_Escape);
+    stopAction->setIcon(SmallIcon("process-stop"));
+    connect(stopAction, SIGNAL(triggered()), this, SLOT(slotStopLoading()));
 
-    KAction* delete_action = actionCollection()->addAction("threadview_delete");
-    delete_action->setText(i18n("Delete"));
-    delete_action->setShortcut(Qt::Key_Delete);
-    delete_action->setIcon(SmallIcon("trash-empty"));
-    connect(delete_action, SIGNAL(triggered()), this, SLOT(slotDeleteButtonClicked()));
+    KAction* deleteAction = actionCollection()->addAction("threadview_delete");
+    deleteAction->setText(i18nc("@action:button", "Delete"));
+    deleteAction->setShortcut(Qt::Key_Delete);
+    deleteAction->setIcon(SmallIcon("trash-empty"));
+    connect(deleteAction, SIGNAL(triggered()), this, SLOT(slotDeleteButtonClicked()));
 }
 
 




Kita-svn メーリングリストの案内
Back to archive index