integrate po files

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1682 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/Makefile.am b/kita/Makefile.am
index 3c666c4..c971904 100644 (file)
--- a/kita/Makefile.am
+++ b/kita/Makefile.am
@@ -3,4 +3,3 @@ SUBDIRS = src po doc
 package-messages:
        $(MAKE) -f ../admin/Makefile.common package-messages
        $(MAKE) -C po merge
-       $(MAKE) -C src/part/po merge

diff --git a/kita/po/kita.pot b/kita/po/kita.pot
index 7b5eade..5df2736 100644 (file)
--- a/kita/po/kita.pot
+++ b/kita/po/kita.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-01-25 00:12+0900\n"
+"POT-Creation-Date: 2005-01-25 00:19+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am
index d39e0e1..0db32e1 100644 (file)
--- a/kita/src/Makefile.am
+++ b/kita/src/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kita kita_client
 
 lib_LTLIBRARIES = kita.la
 # set the include path for X, qt and KDE
-INCLUDES = $(all_includes) -Ipart
+INCLUDES = $(all_includes)
 
 # the library search path. 
 kita_la_LDFLAGS = -avoid-version -module $(KDE_RPATH) $(all_libraries)
@@ -34,7 +34,7 @@ kita_client_SOURCES = kita_client.cpp
 METASOURCES = AUTO
 
 messages: rc.cpp
-       $(XGETTEXT) *.cpp prefs/*.cpp -o ../po/kita.pot
+       $(XGETTEXT) *.cpp */*.cpp -o ../po/kita.pot
 
 KDE_ICON = kita
 

diff --git a/kita/src/part/po/Makefile.am b/kita/src/part/po/Makefile.am
deleted file mode 100644 (file)
index b862f60..0000000
--- a/kita/src/part/po/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-POFILES = AUTO
-PACKAGE = kitapart

diff --git a/kita/src/part/po/ja.po b/kita/src/part/po/ja.po
deleted file mode 100644 (file)
index 79aeebb..0000000
--- a/kita/src/part/po/ja.po
+++ /dev/null
@@ -1,382 +0,0 @@
-# translation of ja.po to 
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to Japanese
-# translation of ja.po to
-# translation of ja.po to
-# translation of ja.po to
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
-# Hideki Ikemoto <ikemo@wakaba.jp>, 2004.
-#
-#, no-wrap
-msgid ""
-msgstr ""
-"Project-Id-Version: ja\n"
-"POT-Creation-Date: 2004-12-30 04:39+0900\n"
-"PO-Revision-Date: 2004-12-30 04:40+0900\n"
-"Last-Translator: Hideki Ikemoto <ikemo@wakaba.jp>\n"
-"Language-Team:  <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
-"X-Generator: KBabel 3.1.5\n"
-
-#: kitahtmlpart.cpp:1060
-msgid "Cancel mosaic"
-msgstr "モザイクをキャンセル"
-
-#: kitahtmlpart.cpp:1062
-#, fuzzy
-msgid "Open with Image viewer"
-msgstr "画像ビューアで開く"
-
-#: kitahtmlpart.cpp:1101 kitahtmlpart.cpp:1527
-msgid "Mark"
-msgstr "マークする"
-
-#: kitahtmlpart.cpp:1111
-msgid "Start"
-msgstr "最初"
-
-#: kitahtmlpart.cpp:1117
-msgid "template"
-msgstr "テンプレート"
-
-#: kitahtmlpart.cpp:1121
-msgid "Kokomade Yonda (%1)"
-msgstr "ここまで読んだ (%1)"
-
-#: kitahtmlpart.cpp:1128
-msgid "End"
-msgstr "最後"
-
-#: kitahtmlpart.cpp:1147
-msgid "Extract by '%1'"
-msgstr "'%1'で抽出"
-
-#: kitahtmlpart.cpp:1148
-msgid "Add '%1' to abone list"
-msgstr "'%1'をあぼーんリストに追加"
-
-#: kitahtmlpart.cpp:1149
-msgid "Search '%1' by Google"
-msgstr "'%1'をGoogleで検索"
-
-#: kitahtmlpart.cpp:1159 kitahtmlpart.cpp:1533
-msgid "Open with Web Browser"
-msgstr "ウェブブラウザで開く"
-
-#: kitahtmlpart.cpp:1161
-msgid "Copy Link Location"
-msgstr "リンクの場所をコピー"
-
-#: kitahtmlpart.cpp:1213 kitahtmlpart.cpp:1643 kitahtmlpart.cpp:1707
-msgid "Do you want to add '%1' to abone list ?"
-msgstr "'%1'をあぼーんリストに追加しますか？"
-
-#: kitahtmlpart.cpp:1372
-msgid "This is a BMP file. It might contain a Troy."
-msgstr "これはBMPファイルです。トロイの木馬が入っている可能性があります。"
-
-#: kitahtmlpart.cpp:1390
-msgid "Do you want to stop loading ?"
-msgstr "読み込みを停止しますか?"
-
-#: kitahtmlpart.cpp:1520
-msgid "write response"
-msgstr "レスを書く"
-
-#: kitahtmlpart.cpp:1521
-msgid "quote this"
-msgstr "引用して書き込む"
-
-#: kitahtmlpart.cpp:1532
-msgid "Open with KitaNavi"
-msgstr "KitaNaviで開く"
-
-#: kitahtmlpart.cpp:1537
-msgid "res tree"
-msgstr "レスをツリー表示"
-
-#: kitahtmlpart.cpp:1538
-msgid "reverse res tree"
-msgstr "レス元をツリー表示"
-
-#: kitahtmlpart.cpp:1539
-msgid "extract by name"
-msgstr "名前で抽出"
-
-#: kitahtmlpart.cpp:1543
-msgid "copy URL"
-msgstr "URLをコピー"
-
-#: kitahtmlpart.cpp:1544 kitathreadview.cpp:405
-msgid "Copy title and URL"
-msgstr "タイトルとURLをコピー"
-
-#: kitahtmlpart.cpp:1545
-msgid "copy"
-msgstr "コピー"
-
-#: kitahtmlpart.cpp:1550
-msgid "set Kokomade Yonda"
-msgstr "「ここまで読んだ」をセット"
-
-#: kitahtmlpart.cpp:1555
-msgid "add name to abone list"
-msgstr "名前をあぼーんリストに追加"
-
-#: kitahtmlpart.cpp:1694
-msgid "extract by ID"
-msgstr "IDで抽出"
-
-#: kitahtmlpart.cpp:1695
-msgid "add id to abone list"
-msgstr "IDをあぼーんリストに追加"
-
-#: kitahtmlpart.cpp:1978 kitahtmlpart.cpp:1993
-msgid "None"
-msgstr ""
-
-#: kitahtmlpart.moc.cpp:34 kitahtmlpart.moc.cpp:42
-msgid "KitaHTMLPart"
-msgstr ""
-
-#: kitahtmlpart.moc.cpp:530 kitahtmlpart.moc.cpp:538
-msgid "Kita::ResPopup"
-msgstr ""
-
-#: kitahtmlview.moc.cpp:34 kitahtmlview.moc.cpp:42
-msgid "KitaHTMLView"
-msgstr ""
-
-#: kitaimgview.moc.cpp:34 kitaimgview.moc.cpp:42
-msgid "KitaImgView"
-msgstr ""
-
-#: kitathreadview.cpp:284
-msgid "goback anchor"
-msgstr "前のアンカーへ戻る"
-
-#: kitathreadview.cpp:404
-msgid "Open with new tab"
-msgstr "新規タブで開く"
-
-#: kitathreadview.cpp:407
-msgid "Remove from Favorites"
-msgstr "お気に入りから削除"
-
-#: kitathreadview.cpp:407
-msgid "Add to Favorites"
-msgstr "お気に入りに追加"
-
-#: kitathreadview.cpp:700
-msgid "kita"
-msgstr ""
-
-#: kitathreadview.cpp:700
-msgid "Not Found"
-msgstr "見つかりません。"
-
-#: kitathreadview.cpp:734
-msgid "Do you want to delete Log ?"
-msgstr "ログを削除しますか?"
-
-#: kitathreadview.moc.cpp:34 kitathreadview.moc.cpp:42
-msgid "KitaThreadView"
-msgstr ""
-
-#: kitathreadview.moc.cpp:635 kitathreadview.moc.cpp:643
-msgid "Kita::KitaSubjectLabel"
-msgstr ""
-
-#: kitathreadviewbase.cpp:112 rc.cpp:1
-msgid "Form1"
-msgstr ""
-
-#: kitathreadviewbase.cpp:114 rc.cpp:3
-msgid "write"
-msgstr "書き込み"
-
-#: kitathreadviewbase.cpp:115 rc.cpp:4
-msgid "Search"
-msgstr ""
-
-#: kitathreadviewbase.cpp:116 rc.cpp:5
-msgid "search word"
-msgstr "単語を検索"
-
-#: kitathreadviewbase.cpp:117 rc.cpp:6
-msgid "HighLight"
-msgstr ""
-
-#: kitathreadviewbase.cpp:118 rc.cpp:7
-msgid "highlight search words"
-msgstr "検索単語をハイライト"
-
-#: kitathreadviewbase.cpp:119 rc.cpp:8
-msgid "Goback"
-msgstr ""
-
-#: kitathreadviewbase.cpp:120 rc.cpp:9
-msgid "go back anchor"
-msgstr "前のアンカーへ戻る"
-
-#: kitathreadviewbase.cpp:121 rc.cpp:10
-msgid "Bookmark"
-msgstr "ブックマーク"
-
-#: kitathreadviewbase.cpp:123 rc.cpp:12
-msgid "add to bookmark"
-msgstr "ブックマークに追加"
-
-#: kitathreadviewbase.cpp:125 rc.cpp:14
-msgid "reload thread"
-msgstr "スレを再読み込み"
-
-#: kitathreadviewbase.cpp:126 rc.cpp:15
-msgid "Del"
-msgstr ""
-
-#: kitathreadviewbase.cpp:127 rc.cpp:16
-msgid "delete log"
-msgstr "ログの削除"
-
-#: kitathreadviewbase.cpp:129 rc.cpp:18
-msgid "close tab"
-msgstr "タブを閉じる"
-
-#: kitawritedialogbase.cpp:121 rc.cpp:19
-msgid "Write in thread"
-msgstr "スレに書き込み"
-
-#: kitawritedialogbase.cpp:122 rc.cpp:20
-msgid "Board:"
-msgstr "板:"
-
-#: kitawritedialogbase.cpp:123 rc.cpp:21
-msgid "board name"
-msgstr "板名"
-
-#: kitawritedialogbase.cpp:124 rc.cpp:22
-msgid "Thread:"
-msgstr "スレッド:"
-
-#: kitawritedialogbase.cpp:125 rc.cpp:23
-msgid "name"
-msgstr "名前"
-
-#: kitawritedialogbase.cpp:126 rc.cpp:24
-msgid "mail"
-msgstr "メール"
-
-#: kitawritedialogbase.cpp:127 rc.cpp:25
-msgid "sage"
-msgstr "sage"
-
-#: kitawritedialogbase.cpp:128 rc.cpp:26
-msgid "body"
-msgstr "本文"
-
-#: kitawritedialogbase.cpp:129 rc.cpp:27
-msgid "XX/XX | XXXX/XXXX"
-msgstr ""
-
-#: kitawriteview.cpp:136
-msgid "preview"
-msgstr "プレビュー"
-
-#: kitawriteview.cpp:235
-msgid "Enter the thread name."
-msgstr "スレ名を入れてください。"
-
-#: kitawriteview.cpp:242
-msgid "fusianasan."
-msgstr ""
-
-#: kitawriteview.cpp:247
-msgid "Body text is too long."
-msgstr "本文が長すぎます。"
-
-#: kitawriteview.cpp:293
-msgid ""
-"If you close this dialog, you will lose text.\n"
-"Do you want to close?"
-msgstr ""
-"このダイアログを閉じると、テキストが破棄されます。\n"
-"閉じますか?"
-
-#: kitawriteview.moc.cpp:34 kitawriteview.moc.cpp:42
-msgid "KitaWriteView"
-msgstr ""
-
-#~ msgid "Board Name:"
-#~ msgstr "板名:"
-
-#~ msgid "Thread Name:"
-#~ msgstr "スレ名:"
-
-#~ msgid ""
-#~ "_: NAME OF TRANSLATORS\n"
-#~ "Your names"
-#~ msgstr "Hideki Ikemoto"
-
-#~ msgid ""
-#~ "_: EMAIL OF TRANSLATORS\n"
-#~ "Your emails"
-#~ msgstr "ikemo@users.sourceforge.jp"
-
-#~ msgid "Close Current Thread Tab"
-#~ msgstr "現在のスレのタブを閉じる"
-
-#~ msgid "Close this tab"
-#~ msgstr "このタブを閉じる"
-
-#~ msgid "Close other tabs"
-#~ msgstr "他のタブを閉じる"
-
-#~ msgid "Close right tabs"
-#~ msgstr "右のタブを閉じる"
-
-#~ msgid "Close left tabs"
-#~ msgstr "左のタブを閉じる"
-
-#~ msgid "Close all tabs"
-#~ msgstr "全てのタブを閉じる"
-
-#~ msgid "thread url"
-#~ msgstr "スレのURL"
-
-#~ msgid "Thread URL:"
-#~ msgstr "スレのURL"
-
-#~ msgid "Find"
-#~ msgstr "検索"
-
-#~ msgid "Can't write to machi BBS in this version."
-#~ msgstr "まちBBSへの書き込みはまだサポート外です。ごめんなさい。"
-
-#~ msgid "Write in %1"
-#~ msgstr "%1に書き込み"
-
-#~ msgid "Back (%1)"
-#~ msgstr "戻る (%1)"
-
-#~ msgid "Clear Log and Reload"
-#~ msgstr "ログをクリア＆リロード"
-
-#~ msgid "Home"
-#~ msgstr "最初"
-

diff --git a/kita/src/part/po/kitapart.pot b/kita/src/part/po/kitapart.pot
deleted file mode 100644 (file)
index 3572fb6..0000000
--- a/kita/src/part/po/kitapart.pot
+++ /dev/null
@@ -1,302 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy, no-wrap
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-12-31 12:28+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: kitahtmlpart.cpp:1060
-msgid "Cancel mosaic"
-msgstr ""
-
-#: kitahtmlpart.cpp:1062
-msgid "Open with Image viewer"
-msgstr ""
-
-#: kitahtmlpart.cpp:1101 kitahtmlpart.cpp:1527
-msgid "Mark"
-msgstr ""
-
-#: kitahtmlpart.cpp:1111
-msgid "Start"
-msgstr ""
-
-#: kitahtmlpart.cpp:1117
-msgid "template"
-msgstr ""
-
-#: kitahtmlpart.cpp:1121
-msgid "Kokomade Yonda (%1)"
-msgstr ""
-
-#: kitahtmlpart.cpp:1128
-msgid "End"
-msgstr ""
-
-#: kitahtmlpart.cpp:1147
-msgid "Extract by '%1'"
-msgstr ""
-
-#: kitahtmlpart.cpp:1148
-msgid "Add '%1' to abone list"
-msgstr ""
-
-#: kitahtmlpart.cpp:1149
-msgid "Search '%1' by Google"
-msgstr ""
-
-#: kitahtmlpart.cpp:1159 kitahtmlpart.cpp:1533
-msgid "Open with Web Browser"
-msgstr ""
-
-#: kitahtmlpart.cpp:1161
-msgid "Copy Link Location"
-msgstr ""
-
-#: kitahtmlpart.cpp:1213 kitahtmlpart.cpp:1642 kitahtmlpart.cpp:1706
-msgid "Do you want to add '%1' to abone list ?"
-msgstr ""
-
-#: kitahtmlpart.cpp:1372
-msgid "This is a BMP file. It might contain a Troy."
-msgstr ""
-
-#: kitahtmlpart.cpp:1390
-msgid "Do you want to stop loading ?"
-msgstr ""
-
-#: kitahtmlpart.cpp:1520
-msgid "write response"
-msgstr ""
-
-#: kitahtmlpart.cpp:1521
-msgid "quote this"
-msgstr ""
-
-#: kitahtmlpart.cpp:1532
-msgid "Open with KitaNavi"
-msgstr ""
-
-#: kitahtmlpart.cpp:1537
-msgid "res tree"
-msgstr ""
-
-#: kitahtmlpart.cpp:1538
-msgid "reverse res tree"
-msgstr ""
-
-#: kitahtmlpart.cpp:1539
-msgid "extract by name"
-msgstr ""
-
-#: kitahtmlpart.cpp:1543
-msgid "copy URL"
-msgstr ""
-
-#: kitahtmlpart.cpp:1544 kitathreadview.cpp:405
-msgid "Copy title and URL"
-msgstr ""
-
-#: kitahtmlpart.cpp:1545
-msgid "copy"
-msgstr ""
-
-#: kitahtmlpart.cpp:1550
-msgid "set Kokomade Yonda"
-msgstr ""
-
-#: kitahtmlpart.cpp:1555
-msgid "add name to abone list"
-msgstr ""
-
-#: kitahtmlpart.cpp:1693
-msgid "extract by ID"
-msgstr ""
-
-#: kitahtmlpart.cpp:1694
-msgid "add id to abone list"
-msgstr ""
-
-#: kitahtmlpart.cpp:1977 kitahtmlpart.cpp:1992
-msgid "None"
-msgstr ""
-
-#: kitahtmlpart.moc.cpp:34 kitahtmlpart.moc.cpp:42
-msgid "KitaHTMLPart"
-msgstr ""
-
-#: kitahtmlpart.moc.cpp:530 kitahtmlpart.moc.cpp:538
-msgid "Kita::ResPopup"
-msgstr ""
-
-#: kitahtmlview.moc.cpp:34 kitahtmlview.moc.cpp:42
-msgid "KitaHTMLView"
-msgstr ""
-
-#: kitaimgview.moc.cpp:34 kitaimgview.moc.cpp:42
-msgid "KitaImgView"
-msgstr ""
-
-#: kitathreadview.cpp:284
-msgid "goback anchor"
-msgstr ""
-
-#: kitathreadview.cpp:404
-msgid "Open with new tab"
-msgstr ""
-
-#: kitathreadview.cpp:407
-msgid "Remove from Favorites"
-msgstr ""
-
-#: kitathreadview.cpp:407
-msgid "Add to Favorites"
-msgstr ""
-
-#: kitathreadview.cpp:700
-msgid "kita"
-msgstr ""
-
-#: kitathreadview.cpp:700
-msgid "Not Found"
-msgstr ""
-
-#: kitathreadview.cpp:734
-msgid "Do you want to delete Log ?"
-msgstr ""
-
-#: kitathreadview.moc.cpp:34 kitathreadview.moc.cpp:42
-msgid "KitaThreadView"
-msgstr ""
-
-#: kitathreadview.moc.cpp:635 kitathreadview.moc.cpp:643
-msgid "Kita::KitaSubjectLabel"
-msgstr ""
-
-#: kitathreadviewbase.cpp:112 rc.cpp:1
-msgid "Form1"
-msgstr ""
-
-#: kitathreadviewbase.cpp:114 rc.cpp:3
-msgid "write"
-msgstr ""
-
-#: kitathreadviewbase.cpp:115 rc.cpp:4
-msgid "Search"
-msgstr ""
-
-#: kitathreadviewbase.cpp:116 rc.cpp:5
-msgid "search word"
-msgstr ""
-
-#: kitathreadviewbase.cpp:117 rc.cpp:6
-msgid "HighLight"
-msgstr ""
-
-#: kitathreadviewbase.cpp:118 rc.cpp:7
-msgid "highlight search words"
-msgstr ""
-
-#: kitathreadviewbase.cpp:119 rc.cpp:8
-msgid "Goback"
-msgstr ""
-
-#: kitathreadviewbase.cpp:120 rc.cpp:9
-msgid "go back anchor"
-msgstr ""
-
-#: kitathreadviewbase.cpp:121 rc.cpp:10
-msgid "Bookmark"
-msgstr ""
-
-#: kitathreadviewbase.cpp:123 rc.cpp:12
-msgid "add to bookmark"
-msgstr ""
-
-#: kitathreadviewbase.cpp:125 rc.cpp:14
-msgid "reload thread"
-msgstr ""
-
-#: kitathreadviewbase.cpp:126 rc.cpp:15
-msgid "Del"
-msgstr ""
-
-#: kitathreadviewbase.cpp:127 rc.cpp:16
-msgid "delete log"
-msgstr ""
-
-#: kitathreadviewbase.cpp:129 rc.cpp:18
-msgid "close tab"
-msgstr ""
-
-#: kitawritedialogbase.cpp:121 rc.cpp:19
-msgid "Write in thread"
-msgstr ""
-
-#: kitawritedialogbase.cpp:122 rc.cpp:20
-msgid "Board:"
-msgstr ""
-
-#: kitawritedialogbase.cpp:123 rc.cpp:21
-msgid "board name"
-msgstr ""
-
-#: kitawritedialogbase.cpp:124 rc.cpp:22
-msgid "Thread:"
-msgstr ""
-
-#: kitawritedialogbase.cpp:125 rc.cpp:23
-msgid "name"
-msgstr ""
-
-#: kitawritedialogbase.cpp:126 rc.cpp:24
-msgid "mail"
-msgstr ""
-
-#: kitawritedialogbase.cpp:127 rc.cpp:25
-msgid "sage"
-msgstr ""
-
-#: kitawritedialogbase.cpp:128 rc.cpp:26
-msgid "body"
-msgstr ""
-
-#: kitawritedialogbase.cpp:129 rc.cpp:27
-msgid "XX/XX | XXXX/XXXX"
-msgstr ""
-
-#: kitawriteview.cpp:136
-msgid "preview"
-msgstr ""
-
-#: kitawriteview.cpp:235
-msgid "Enter the thread name."
-msgstr ""
-
-#: kitawriteview.cpp:242
-msgid "fusianasan."
-msgstr ""
-
-#: kitawriteview.cpp:247
-msgid "Body text is too long."
-msgstr ""
-
-#: kitawriteview.cpp:293
-msgid ""
-"If you close this dialog, you will lose text.\n"
-"Do you want to close?"
-msgstr ""
-
-#: kitawriteview.moc.cpp:34 kitawriteview.moc.cpp:42
-msgid "KitaWriteView"
-msgstr ""