Remove composer & viewer plugins, move them entirely to QtMail.

These may have made some sense back when QMF was part of Qtopia (a messaging system customizable for each platform and offering extensible message types), but it makes a lot less sense in the sense of a library offering email-related functionality. This type of functionality belongs in the clients, not in the library, so move it there. This has been performed through a fairly quick hatchet job. It isn't really clean, working code yet, but it is operational. Change-Id: Ic417a5e885034b67b645df238febb30cda88b17c Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
author: Robin Burchell <robin.burchell@jollamobile.com> 2014-01-21 10:19:19 +0100
committer: Robin Burchell <robin+qt@viroteck.net> 2014-01-24 10:21:25 +0100
commit: daa2a0ad8092b3552db8a81a1d076b5a9de84d61 (patch)
tree: f21abebcba59873906a225a5f6a0803013c56b06 /examples/qtmail/app/qtmail-ja.ts
parent: 1d48985c25e4dbf700d65da5761dc2859b5c6cfc (diff)
1 files changed, 1321 insertions, 886 deletions
diff --git a/examples/qtmail/app/qtmail-ja.ts b/examples/qtmail/app/qtmail-ja.ts
index 32c4e650..94de0400 100644
--- a/examples/qtmail/app/qtmail-ja.ts
+++ b/examples/qtmail/app/qtmail-ja.ts
@@ -1,59 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1">
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>
-        <location filename="" line="7471221"/>
         <source>Adding attachments</source>
         <translation type="obsolete">添付を追加中</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Select a sub category to quickly locate the document</source>
         <translation type="obsolete">サブカテゴリを選択してドキュメントを迅速に見つける</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Attach -&gt;</source>
         <translation type="obsolete">添付 -&gt;</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Attach selected document to this mail</source>
         <translation type="obsolete">このメールに選択したドキュメントを添付</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Remove</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Remove selected document from this mail</source>
         <translation type="obsolete">このメールから選択したドキュメントを削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>All</source>
         <translation type="obsolete">すべて</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>A list of the documents available for attaching to the mail.</source>
         <translation type="obsolete">メールに添付できるドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Documents</source>
         <translation type="obsolete">ドキュメント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>A list of the documents attached to the mail.</source>
         <translation type="obsolete">メールに添付されたドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
         <source>Attached</source>
         <translation type="obsolete">添付</translation>
     </message>
@@ -61,7 +51,7 @@
 <context>
     <name>AccountList</name>
     <message>
-        <location filename="accountlist.cpp" line="80"/>
+        <location filename="accountlist.cpp" line="+80"/>
         <source>MMS</source>
         <translation type="obsolete">MMS</translation>
     </message>
@@ -69,92 +59,92 @@
 <context>
     <name>AccountSettings</name>
     <message>
-        <location filename="accountsettings.cpp" line="273"/>
+        <location filename="accountsettings.cpp" line="+273"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="273"/>
+        <location line="+0"/>
         <source>Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="273"/>
+        <location line="+0"/>
         <source>No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="378"/>
+        <location line="+105"/>
         <source>New default account</source>
         <translation>新規のデフォルトアカウント</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="178"/>
+        <location line="-200"/>
         <source>Account settings</source>
         <translation type="unfinished">アカウントの設定</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="219"/>
+        <location line="+41"/>
         <source>Add account...</source>
         <translation>アカウントの追加...</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="222"/>
+        <location line="+3"/>
         <source>Remove account...</source>
         <translation>アカウントの削除...</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="272"/>
+        <location line="+50"/>
         <source>&lt;qt&gt;Delete account: %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;アカウントの削除: %1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="379"/>
+        <location line="+107"/>
         <source>&lt;qt&gt;Your previous default mail account has been unchecked&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;以前のデフォルトのメールアカウントはチェックがはずされています。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="376"/>
+        <location line="-3"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="439"/>
+        <location line="+63"/>
         <source>Deleting messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="404"/>
+        <location line="-35"/>
         <source>Account Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="404"/>
+        <location line="+0"/>
         <source>Account Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="405"/>
+        <location line="+1"/>
         <source>Do you wish to retrieve the folder structure for this account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="408"/>
+        <location line="+3"/>
         <source>Retrieving folders...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="418"/>
+        <location line="+10"/>
         <source>Folders retrieved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="420"/>
+        <location line="+2"/>
         <source>Retrieve Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="accountsettings.cpp" line="421"/>
+        <location line="+1"/>
         <source>%1 - Error retrieving folders: %2</source>
         <comment>%1: account name, %2: error text</comment>
         <translation type="unfinished"></translation>
@@ -163,17 +153,17 @@
 <context>
     <name>ActionFolderModel</name>
     <message>
-        <location filename="actionfoldermodel.cpp" line="83"/>
+        <location filename="actionfoldermodel.cpp" line="+83"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="actionfoldermodel.cpp" line="91"/>
+        <location line="+8"/>
         <source>New message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="actionfoldermodel.cpp" line="104"/>
+        <location line="+13"/>
         <source>Email</source>
         <translation type="unfinished">Email</translation>
     </message>
@@ -181,12 +171,12 @@
 <context>
     <name>ActionListView</name>
     <message>
-        <location filename="actionlistview.cpp" line="179"/>
+        <location filename="actionlistview.cpp" line="+179"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
     <message>
-        <location filename="actionlistview.cpp" line="274"/>
+        <location line="+95"/>
         <source>New MMS</source>
         <translation type="obsolete">新しい MMS</translation>
     </message>
@@ -194,179 +184,194 @@
 <context>
     <name>AddAtt</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470947"/>
         <source>Adding attachments</source>
         <translation type="obsolete">添付を追加中</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Select a sub category to quickly locate the document</source>
         <translation type="obsolete">サブカテゴリを選択してドキュメントを迅速に見つける</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach -&gt;</source>
         <translation type="obsolete">添付 -&gt;</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach selected document to this mail</source>
         <translation type="obsolete">このメールに選択したドキュメントを添付</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Remove</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Remove selected document from this mail</source>
         <translation type="obsolete">このメールから選択したドキュメントを削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>All</source>
         <translation type="obsolete">すべて</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>A list of the documents available for attaching to the mail.</source>
         <translation type="obsolete">メールに添付できるドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Documents</source>
         <translation type="obsolete">ドキュメント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>A list of the documents attached to the mail.</source>
         <translation type="obsolete">メールに添付されたドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attached</source>
         <translation type="obsolete">添付</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Maximum size of a mail is %1 kB
 </source>
         <translation type="obsolete">メール1件の最大サイズは%1kBです
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Size of attached files is %1 kB
 </source>
         <translation type="obsolete">添付ファイルのサイズは%1kBです
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attachments too large</source>
         <translation type="obsolete">添付が大き過ぎます</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attachments</source>
         <translation type="obsolete">添付</translation>
     </message>
+    <message>
+        <location filename="addatt.cpp" line="+69"/>
+        <source>Add Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddAttDialog</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location filename="actionlistview.cpp" line="+0"/>
         <source>Adding attachments</source>
         <translation type="obsolete">添付を追加</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Select a sub category to quickly locate the document</source>
         <translation type="obsolete">ドキュメントを素早く検索するためにサブカテゴリを選択します</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach -&gt;</source>
         <translation type="obsolete">添付 -&gt;</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach selected document to this mail</source>
         <translation type="obsolete">このメールに選択したドキュメントを添付します</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Remove</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Remove selected document from this mail</source>
         <translation type="obsolete">このメールから選択したドキュメントを削除します</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>All</source>
         <translation type="obsolete">すべて</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>A list of the documents available for attaching to the mail.</source>
         <translation type="obsolete">メールに添付できるドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Documents</source>
         <translation type="obsolete">文書</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>A list of the documents attached to the mail.</source>
         <translation type="obsolete">メールに添付されたドキュメントの一覧です。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attached</source>
         <translation type="obsolete">添付されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>&lt;qt&gt;Maximum size of a mail is %1 kB&lt;br&gt;Size of attached files is %1 kB&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;最大サイズは 1 メールに付き %1 kB です。&lt;br&gt;添付ファイルのサイズは %1 kB です。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attachments too large</source>
         <translation type="obsolete">添付が大き過ぎます</translation>
     </message>
     <message>
-        <location filename="addatt.cpp" line="377"/>
+        <location filename="addatt.cpp" line="+308"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="addatt.cpp" line="269"/>
+        <location line="-165"/>
         <source>Attachments</source>
-        <translation type="obsolete">添付</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="addatt.cpp" line="289"/>
+        <location line="+7"/>
+        <source>Remove attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Add attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
         <source>Add Attachment</source>
         <translation type="obsolete">添付の追加</translation>
     </message>
     <message>
-        <location filename="addatt.cpp" line="275"/>
+        <location line="-72"/>
         <source>Attach a document to this mail.</source>
-        <translation type="obsolete">このメールにドキュメントを添付します。</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="addatt.cpp" line="277"/>
+        <location line="+60"/>
         <source>Remove Attachment</source>
         <translation type="obsolete">添付の削除</translation>
     </message>
@@ -374,42 +379,42 @@
 <context>
     <name>AddressPicker</name>
     <message>
-        <location filename="addresslist.cpp" line="509"/>
+        <location filename="addresslist.cpp" line="+509"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="478"/>
+        <location line="-31"/>
         <source>Contacts only</source>
         <translation type="obsolete">連絡先のみ</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="494"/>
+        <location line="+16"/>
         <source>Name</source>
         <translation type="obsolete">名前</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="519"/>
+        <location line="+25"/>
         <source>Add to Contacts</source>
         <translation type="obsolete">連絡先に追加</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="477"/>
+        <location line="-42"/>
         <source>Contacts and Email address list</source>
         <translation type="obsolete">連絡先と Email アドレスの一覧</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="479"/>
+        <location line="+2"/>
         <source>Email address list only</source>
         <translation type="obsolete">Email アドレスの一覧のみ</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="438"/>
+        <location line="-41"/>
         <source>Select Contact</source>
         <translation type="obsolete">連絡先の選択</translation>
     </message>
     <message>
-        <location filename="addresslist.cpp" line="496"/>
+        <location line="+58"/>
         <source> Email </source>
         <translation type="obsolete"> Email </translation>
     </message>
@@ -417,7 +422,7 @@
 <context>
     <name>AudioSelectorDialog</name>
     <message>
-        <location filename="audiosource.cpp" line="43"/>
+        <location filename="audiosource.cpp" line="+43"/>
         <source>Select Audio</source>
         <translation type="obsolete">オーディオの選択</translation>
     </message>
@@ -425,17 +430,17 @@
 <context>
     <name>AudioSourceDialog</name>
     <message>
-        <location filename="audiosource.cpp" line="255"/>
+        <location line="+212"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="audiosource.cpp" line="259"/>
+        <location line="+4"/>
         <source>Cancel</source>
         <translation type="obsolete">取り消し</translation>
     </message>
     <message>
-        <location filename="audiosource.cpp" line="270"/>
+        <location line="+11"/>
         <source>Audio</source>
         <translation type="obsolete">オーディオ</translation>
     </message>
@@ -443,17 +448,17 @@
 <context>
     <name>AudioSourceWidget</name>
     <message>
-        <location filename="audiosource.cpp" line="138"/>
+        <location line="-132"/>
         <source>Remove</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="audiosource.cpp" line="104"/>
+        <location line="-34"/>
         <source>Audio Files</source>
         <translation type="obsolete">オーディオファイル</translation>
     </message>
     <message>
-        <location filename="audiosource.cpp" line="185"/>
+        <location line="+81"/>
         <source>No Audio</source>
         <translation type="obsolete">オーディオなし</translation>
     </message>
@@ -461,32 +466,32 @@
 <context>
     <name>ComposerFactory</name>
     <message>
-        <location filename="composer.cpp" line="128"/>
+        <location filename="composer.cpp" line="+128"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
     <message>
-        <location filename="composer.cpp" line="116"/>
+        <location line="-12"/>
         <source>Multimedia Message</source>
         <translation type="obsolete">マルチメディアメッセージ</translation>
     </message>
     <message>
-        <location filename="composer.cpp" line="139"/>
+        <location line="+23"/>
         <source>EMS</source>
         <translation type="obsolete">EMS</translation>
     </message>
     <message>
-        <location filename="composer.cpp" line="112"/>
+        <location line="-27"/>
         <source>Text Message</source>
         <translation type="obsolete">テキストメッセージ</translation>
     </message>
     <message>
-        <location filename="composer.cpp" line="135"/>
+        <location line="+23"/>
         <source>MMS</source>
         <translation type="obsolete">MMS</translation>
     </message>
     <message>
-        <location filename="composer.cpp" line="131"/>
+        <location line="-4"/>
         <source>Message</source>
         <translation type="obsolete">メッセージ</translation>
     </message>
@@ -494,7 +499,7 @@
 <context>
     <name>Configure</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471090"/>
         <source>Normal</source>
         <translation type="obsolete">標準</translation>
     </message>
@@ -502,37 +507,37 @@
 <context>
     <name>ConfigureBase</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Configure Email</source>
         <translation type="obsolete">電子メールの設定</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Exclude from Get all mail</source>
         <translation type="obsolete">すべてのメールを取得から除外</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Interval check</source>
         <translation type="obsolete">インタバルチェック</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source> minutes</source>
         <translation type="obsolete">分</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Font Size</source>
         <translation type="obsolete">フォントサイズ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Normal</source>
         <translation type="obsolete">標準</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Large</source>
         <translation type="obsolete">大きい</translation>
     </message>
@@ -540,7 +545,7 @@
 <context>
     <name>DeskphoneAccountItemDelegate</name>
     <message>
-        <location filename="accountsettings.cpp" line="84"/>
+        <location filename="accountsettings.cpp" line="-337"/>
         <source>Delete</source>
         <translation type="unfinished">削除</translation>
     </message>
@@ -548,7 +553,7 @@
 <context>
     <name>DetailsLineEdit</name>
     <message>
-        <location filename="detailspage.cpp" line="112"/>
+        <location filename="detailspage.cpp" line="+112"/>
         <source>Send</source>
         <translation type="obsolete">送信</translation>
     </message>
@@ -556,62 +561,62 @@
 <context>
     <name>DetailsPage</name>
     <message>
-        <location filename="detailspage.cpp" line="343"/>
+        <location line="+231"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="133"/>
+        <location line="-210"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="359"/>
+        <location line="+226"/>
         <source>CC</source>
         <translation type="obsolete">CC</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="375"/>
+        <location line="+16"/>
         <source>BCC</source>
         <translation type="obsolete">BCC</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="391"/>
+        <location line="+16"/>
         <source>Subject</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="412"/>
+        <location line="+21"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="581"/>
+        <location line="+169"/>
         <source>(no subject)</source>
         <translation type="obsolete">(件名なし）</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="66"/>
+        <location line="-515"/>
         <source>Edit Recipients</source>
         <translation type="obsolete">受信者の編集</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="330"/>
+        <location line="+264"/>
         <source>Copy</source>
         <translation type="obsolete">コピー</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="332"/>
+        <location line="+2"/>
         <source>Paste</source>
         <translation type="obsolete">貼り付け</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="150"/>
+        <location line="-182"/>
         <source>Delivery Report</source>
         <translation type="obsolete">配信レポート</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="154"/>
+        <location line="+4"/>
         <source>Read Reply</source>
         <translation type="obsolete">開封通知</translation>
     </message>
@@ -619,92 +624,92 @@
 <context>
     <name>EditAccount</name>
     <message>
-        <location filename="editaccount.cpp" line="309"/>
+        <location filename="editaccount.cpp" line="+309"/>
         <source>Synchronized</source>
         <translation type="obsolete">同期されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470912"/>
         <source>Invalid port</source>
         <translation type="obsolete">無効なポート</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Port must be between 1 and 65535
 Reverted to default</source>
         <translation type="obsolete">ポートは1から65535の間にしてください
 デフォルトに戻りました</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="411"/>
+        <location line="-7470810"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470810"/>
         <source>Invalid SMTP port</source>
         <translation type="obsolete">無効なSMTPポート</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Port must be between 1 and 65535
 Reverted to default 25</source>
         <translation type="obsolete">ポートは1から65535の間にしてください
 デフォルトの25へ戻りました</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="319"/>
+        <location line="-7470902"/>
         <source>Sync</source>
         <translation type="obsolete">同期</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="184"/>
+        <location line="-135"/>
         <source>Create new account</source>
         <comment>translation not longer than English</comment>
         <translation type="unfinished">新規アカウントの作成</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="443"/>
+        <location line="+259"/>
         <source>Empty account name</source>
         <translation>アカウント名を空にする</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="444"/>
+        <location line="+1"/>
         <source>&lt;qt&gt;Do you want to continue and discard any changes?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;続行して変更をすべて破棄しますか?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="252"/>
+        <location line="-192"/>
         <source>Incoming</source>
         <translation type="obsolete">受信</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="263"/>
+        <location line="+11"/>
         <source>Outgoing</source>
         <translation type="obsolete">送信</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="231"/>
+        <location line="-32"/>
         <source>Acct</source>
         <translation type="obsolete">アカウント</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="260"/>
+        <location line="+29"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="312"/>
+        <location line="+52"/>
         <source>Signature</source>
         <translation type="unfinished">署名</translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="408"/>
+        <location line="+96"/>
         <source>Interval checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editaccount.cpp" line="410"/>
+        <location line="+2"/>
         <source>&lt;qt&gt;Interval checking may generate a significant amount of data traffic.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,261 +717,261 @@ Reverted to default 25</source>
 <context>
     <name>EditAccountBase</name>
     <message>
-        <location filename="editaccountbasephone.ui" line="22"/>
+        <location filename="editaccountbasephone.ui" line="+22"/>
         <source>Edit Account</source>
         <translation>アカウントの編集</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="41"/>
+        <location line="+19"/>
         <source>Incoming</source>
         <translation type="unfinished">受信</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="77"/>
+        <location line="+36"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="691"/>
+        <location line="+614"/>
         <source>Username</source>
         <translation>ユーザー名</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="720"/>
+        <location line="+29"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="557"/>
+        <location line="-163"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="583"/>
+        <location line="+26"/>
         <source>Port</source>
         <translation>ポート</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="94"/>
+        <location line="-489"/>
         <source>POP</source>
         <translation>POP</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="99"/>
+        <location line="+5"/>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471122"/>
         <source>Synchronized</source>
         <translation type="obsolete">同期されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Delete mail when removed from Trash</source>
         <translation type="obsolete">ゴミ箱から削除した場合、メールは永久削除</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="445"/>
+        <location line="-7470776"/>
         <source>K</source>
         <translation>K</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="359"/>
+        <location line="-86"/>
         <source>Base folder</source>
         <translation>ベースフォルダ</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="399"/>
+        <location line="+40"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="168"/>
+        <location filename="editaccountbase.ui" line="+168"/>
         <source>Synchronize with server</source>
         <translation type="obsolete">サーバーと同期</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="469"/>
+        <location filename="editaccountbasephone.ui" line="+70"/>
         <source>Outgoing</source>
         <translation type="unfinished">送信</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="353"/>
+        <location filename="editaccountbase.ui" line="+185"/>
         <source>Account name</source>
         <translation type="obsolete">アカウント名</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="360"/>
+        <location line="+7"/>
         <source>Your name</source>
         <translation type="obsolete">自分の名前</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="367"/>
+        <location line="+7"/>
         <source>Email address</source>
         <translation type="obsolete">Email アドレス</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="374"/>
+        <location line="+7"/>
         <source>SMTP server</source>
         <translation type="obsolete">SMTP サーバー</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="381"/>
+        <location line="+7"/>
         <source>SMTP port</source>
         <translation type="obsolete">SMTP ポート</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="404"/>
+        <location line="+23"/>
         <source>Use signature</source>
         <translation type="obsolete">署名を使用</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="768"/>
+        <location filename="editaccountbasephone.ui" line="+299"/>
         <source>Set...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="401"/>
+        <location line="-367"/>
         <source>Default mail server</source>
         <translation type="obsolete">デフォルトのメールサーバー</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="483"/>
+        <location filename="editaccountbase.ui" line="+79"/>
         <source>Delete account</source>
         <translation type="obsolete">アカウントの削除</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="186"/>
+        <location line="-297"/>
         <source>Skip mail larger than</source>
         <comment>followed by eg. &quot;5K&quot;</comment>
         <translation type="obsolete">このサイズを越えるメールをスキップする</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="261"/>
+        <location filename="editaccountbasephone.ui" line="-140"/>
         <source>Delete mail</source>
         <translation>メールの削除</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="752"/>
+        <location line="+491"/>
         <source>Signature</source>
         <translation>署名</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="75"/>
+        <location line="-677"/>
         <source>Name</source>
         <translation type="obsolete">名前</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="531"/>
+        <location line="+456"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="614"/>
+        <location line="+83"/>
         <source>Synchronize</source>
         <translation type="obsolete">同期</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470607"/>
         <source>Skip larger</source>
         <comment>followed by eg. &quot;5K&quot;</comment>
         <translation type="obsolete">このサイズ以上をスキップ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Sync</source>
         <translation type="obsolete">同期</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="454"/>
+        <location line="-7470767"/>
         <source>Acct</source>
         <translation type="obsolete">アカウント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470767"/>
         <source>Set...</source>
         <comment>Button for set signature</comment>
         <translation type="obsolete">設定...</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="220"/>
+        <location filename="editaccountbase.ui" line="+34"/>
         <source>Delete mail from server</source>
         <translation type="obsolete">サーバーからメールを削除</translation>
     </message>
     <message>
-        <location filename="editaccountbase.ui" line="199"/>
+        <location line="-21"/>
         <source>K</source>
         <comment>short for Kilobyte</comment>
         <translation type="obsolete">K</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="609"/>
+        <location filename="editaccountbasephone.ui" line="-7470612"/>
         <source>Encryption</source>
         <translation>暗号化</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="650"/>
+        <location line="+41"/>
         <source>Authentication</source>
         <translation>認証</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="667"/>
+        <location line="+17"/>
         <source>None</source>
         <translation>なし</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="631"/>
+        <location line="-36"/>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="636"/>
+        <location line="+5"/>
         <source>TLS</source>
         <translation>TLS</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="672"/>
+        <location line="+36"/>
         <source>Login</source>
         <translation>ログイン</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="677"/>
+        <location line="+5"/>
         <source>Plain</source>
         <translation>プレーン</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="283"/>
+        <location line="-394"/>
         <source>Skip larger</source>
         <translation>このサイズ以上をスキップ</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="324"/>
+        <location line="+41"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="305"/>
+        <location line="-19"/>
         <source>Push Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="505"/>
+        <location line="+200"/>
         <source>From</source>
         <translation type="unfinished">差出人</translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="781"/>
+        <location line="+276"/>
         <source>Default sending account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="346"/>
+        <location line="-435"/>
         <source>Disable when Roaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editaccountbasephone.ui" line="417"/>
+        <location line="+71"/>
         <source>min</source>
         <comment>short for minutes</comment>
         <translation type="unfinished"></translation>
@@ -975,182 +980,182 @@ Reverted to default 25</source>
 <context>
     <name>EmailClient</name>
     <message>
-        <location filename="emailclient.cpp" line="527"/>
+        <location filename="emailclient.cpp" line="+527"/>
         <source>&amp;Mail</source>
         <translation type="obsolete">(&amp;M)メール</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="528"/>
+        <location line="+1"/>
         <source>&amp;Accounts</source>
         <translation type="obsolete">(&amp;A)アカウント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470693"/>
         <source>Send all mail</source>
         <translation type="obsolete">すべてのメールを送信</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Send all mail in the Outbox.</source>
         <translation type="obsolete">送信ボックスにあるすべてのメールを送信します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1340"/>
+        <location line="-7469881"/>
         <source>Get all mail</source>
         <translation>すべてのメールを受信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1342"/>
+        <location line="+2"/>
         <source>Get new mail from all your accounts.</source>
         <translation>すべてのアカウントから新しいメールを受信します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="593"/>
+        <location line="-749"/>
         <source>Get Mail in</source>
         <translation type="obsolete">メールの受信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1350"/>
+        <location line="+757"/>
         <source>Cancel transfer</source>
         <translation>転送の取り消し</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1352"/>
+        <location line="+2"/>
         <source>Abort all transfer of mail.</source>
         <translation>すべてのメール転送を中断します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2140"/>
+        <location line="+788"/>
         <source>Move to</source>
         <translation type="obsolete">移動先</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2141"/>
+        <location line="+1"/>
         <source>Copy to</source>
         <translation type="obsolete">コピー先</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469080"/>
         <source>Compose</source>
         <translation type="obsolete">作成</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="559"/>
+        <location line="-7470662"/>
         <source>Write a new mail.</source>
         <translation type="obsolete">新規メールを作成します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1359"/>
+        <location line="+800"/>
         <source>Search</source>
         <translation>検索</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="563"/>
+        <location line="-796"/>
         <source>Search for mail in your folders.</source>
         <translation type="obsolete">フォルダ内のメールを検索します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4152"/>
+        <location line="+3589"/>
         <source>Folders</source>
         <translation type="obsolete">フォルダ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="244"/>
+        <location line="-3908"/>
         <source>Messages</source>
         <translation type="obsolete">メッセージ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4165"/>
+        <location line="+3921"/>
         <source>A list of your folders.  You can tap Outbox and then tap the Messages tab to see the messages currently in the outbox.</source>
         <translation type="obsolete">フォルダの一覧です。送信ボックスをタップ、次にメッセージタブをタップして送信ボックスに現在あるメッセージを表示します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="692"/>
+        <location line="-3473"/>
         <source>&amp;Options</source>
         <translation type="obsolete">(&amp;O)オプション</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470529"/>
         <source>Configure</source>
         <translation type="obsolete">設定</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2648"/>
+        <location line="-7468573"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7468573"/>
         <source>Subject</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Date</source>
         <translation type="obsolete">日付</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Select the sort order by tapping any of the columns in this header.  Tapping the same column twice will switch between ascending and descending order.</source>
         <translation type="obsolete">このヘッダーにあるコラムのどれかをタップして分類順序を選択します。同じコラムを2回タップすると昇順と降順が切り替わります。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>A list of the messages in your current folder.  Tap a mail to examine it.</source>
         <translation type="obsolete">現在のフォルダ内にあるメッセージの一覧です。メールをタップしてその内容を表示します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="702"/>
+        <location line="-7470519"/>
         <source>Toggle display of the column headers by tapping this icon.</source>
         <translation type="obsolete">このアイコンをタップしてコラムヘッダーの表示を切り替えます。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3693"/>
+        <location line="+2991"/>
         <source>Email</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1875"/>
+        <location line="-1818"/>
         <source>No account selected</source>
         <translation>アカウントが選択されていません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469346"/>
         <source>You must create an account</source>
         <translation type="obsolete">アカウントを作成してください</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3447"/>
+        <location line="-7467774"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1890"/>
+        <location line="-1557"/>
         <source>No SMTP Server</source>
         <translation>SMTP サーバーがありません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469331"/>
         <source>No valid SMTP server defined</source>
         <translation type="obsolete">有効なSMTPサーバーが定義されていません</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1896"/>
+        <location line="-7469325"/>
         <source>No POP or IMAP accounts defined</source>
         <translation>POP アカウントまたは IMAP アカウントが定義されていません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469325"/>
         <source>Get Mail only works with POP or IMAP</source>
         <translation type="obsolete">POPまたはIMAPを使用しているメールのみ受信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1779"/>
+        <location line="-7469442"/>
         <source>Account not defined</source>
         <translation type="obsolete">アカウントが定義されていません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469442"/>
         <source>The following messages have been
 deleted from the server by another
 email client and can not be completed:
@@ -1163,17 +1168,17 @@ email client and can not be completed:
 </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1344"/>
+        <location line="-7469877"/>
         <source>Unresolved mail</source>
         <translation type="obsolete">未解決メール</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469877"/>
         <source>Server: </source>
         <translation type="obsolete">サーバー: </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unexpected response from server:
 
 </source>
@@ -1182,49 +1187,49 @@ email client and can not be completed:
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>host not found</source>
         <translation type="obsolete">ホストが見つかりません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>connection refused</source>
         <translation type="obsolete">接続が拒否されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>socket packet error</source>
         <translation type="obsolete">ソケットパケットのエラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1768"/>
+        <location line="-7469453"/>
         <source>Sending error</source>
         <translation type="obsolete">送信エラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1744"/>
+        <location line="-24"/>
         <source>Aborted by user</source>
         <translation type="obsolete">ユーザーにより中断されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469477"/>
         <source>Login failed
 Check user name and password</source>
         <translation type="obsolete">ログインに失敗しました
 ユーザー名とパスワードを確認してください</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1775"/>
+        <location line="-7469446"/>
         <source>Receiving error</source>
         <translation type="obsolete">受信エラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1802"/>
+        <location line="+27"/>
         <source>Read mail</source>
         <translation type="obsolete">メールを読む</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469419"/>
         <source>Cannot access %1
 Either there is insufficient space, 
 or another program is accessing
@@ -1235,145 +1240,145 @@ the mailbox.</source>
 アクセスしています。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1851"/>
+        <location line="-7469370"/>
         <source>Unable to save mail</source>
         <translation type="obsolete">メールを保存できません</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2001"/>
+        <location line="+150"/>
         <source>New default account</source>
         <translation type="obsolete">新規のデフォルトアカウント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469220"/>
         <source>Your previous default mail account
 has been unchecked</source>
         <translation type="obsolete">前回デフォルトのメールアカウントは
 チェックされていません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Delete account:
 </source>
         <translation type="obsolete">アカウントの削除:
 </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3108"/>
+        <location line="-7468113"/>
         <source>Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3108"/>
+        <location line="+0"/>
         <source>No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2121"/>
+        <location line="-987"/>
         <source>New Account</source>
         <translation type="obsolete">新規アカウント</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3254"/>
+        <location line="+1133"/>
         <source>EMail</source>
         <translation type="obsolete">EMail</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3255"/>
+        <location line="+1"/>
         <source>the mail</source>
         <translation type="obsolete">メール</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2654"/>
+        <location line="-601"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2656"/>
+        <location line="+2"/>
         <source>From/To</source>
         <translation type="obsolete">差出人/宛先</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7468565"/>
         <source>The following commands failed</source>
         <translation type="obsolete">次のコマンドは失敗しました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source> ( %1 new)</source>
         <translation type="obsolete">( %1 新着)  [Translated as &apos;newly arrived&apos;.]</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source> ( %1 unsent)</source>
         <translation type="obsolete">( %1 未送信）</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Email conflict</source>
         <translation type="obsolete">電子メールの不一致</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3114"/>
+        <location line="-7468107"/>
         <source>Autosave failed</source>
         <translation>自動保存の失敗</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3217"/>
+        <location line="+103"/>
         <source>Write mail</source>
         <translation type="obsolete">メールの作成</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3176"/>
+        <location line="-41"/>
         <source>Reply to mail</source>
         <translation type="obsolete">メールの返信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3179"/>
+        <location line="+3"/>
         <source>Reply to all</source>
         <translation type="obsolete">全員へ返信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3182"/>
+        <location line="+3"/>
         <source>Forward mail</source>
         <translation type="obsolete">メールの転送</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3193"/>
+        <location line="+11"/>
         <source>Edit mail</source>
         <translation type="obsolete">メールの編集</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7468028"/>
         <source> Write mail</source>
         <translation type="obsolete">メールの作成</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2146"/>
+        <location line="-7469075"/>
         <source>Delete mail</source>
         <translation type="obsolete">メールの削除</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="568"/>
+        <location line="-1578"/>
         <source>Empty Trash</source>
         <translation type="obsolete">ゴミ箱を空にする</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470653"/>
         <source>You are currently editing a message.
 </source>
         <translation type="obsolete">メッセージを編集しています。
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Autosave failed.
 </source>
         <translation type="obsolete">自動保存が失敗しました。
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Mail was retrieved from account
 %1
 Redefine this account to get this mail</source>
@@ -1382,588 +1387,588 @@ Redefine this account to get this mail</source>
 このアカウントを再定義してこのメールを受信します</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>(%1 new)</source>
         <translation type="obsolete">(%1 新着)</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>%1 unsent</source>
         <translation type="obsolete">%1 未送信</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>%1 unfinished</source>
         <translation type="obsolete">%1 未完了</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3099"/>
+        <location line="-7468122"/>
         <source>was edited externally</source>
         <translation>外部で編集されました</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2833"/>
+        <location line="-266"/>
         <source>Should it be saved in Drafts
 before writing this mail?</source>
         <translation type="obsolete">このメールを作成する前に下書きに保存しますか?</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2883"/>
+        <location line="+50"/>
         <source>all messages in the trash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7468338"/>
         <source>Should it be saved in Drafts
 before viewing this mail?</source>
         <translation type="obsolete">このメールを表示する前に
 下書きに保存しますか?</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1799"/>
+        <location line="-7469422"/>
         <source>View Mail message will be ignored</source>
         <translation type="obsolete">メール表示のメッセージは無視されます</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469422"/>
         <source>Edit Account</source>
         <translation type="obsolete">アカウントの編集</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1648"/>
+        <location line="-7469573"/>
         <source>&lt;qt&gt;You must create an account&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;アカウントを作成してください&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1023"/>
+        <location line="-625"/>
         <source>&lt;qt&gt;No valid SMTP server defined&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;有効な SMTP サーバーが定義されていません&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1033"/>
+        <location line="+10"/>
         <source>&lt;qt&gt;Get Mail only works with POP or IMAP&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;メールの受信は POP または IMAP でしか機能しません&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1778"/>
+        <location line="+745"/>
         <source>&lt;qt&gt;Mail was retrieved from account %1&lt;br&gt;Redefine this account to get this mail&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;メールは %1 アカウントから回収されました&lt;br&gt;このメールを受け取るようにこのアカウントを再定義します&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1329"/>
+        <location line="-449"/>
         <source>&lt;qt&gt;%1&lt;br&gt;The following messages have been deleted from the server by another email client and can not be completed:&lt;br&gt;</source>
         <translation type="obsolete">&lt;qt&gt;%1&lt;br&gt;次のメッセージは別の email クライアントによりサーバーから削除されているため完了できません:&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1712"/>
+        <location line="+383"/>
         <source>&lt;qt&gt;Server: </source>
         <translation type="obsolete">&lt;qt&gt;サーバー: </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1715"/>
+        <location line="+3"/>
         <source>Unexpected response from server:&lt;br&gt;&lt;br&gt;</source>
         <translation type="obsolete">サーバーからの予期しない応答:&lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1693"/>
+        <location line="-22"/>
         <source>Host not found</source>
         <translation type="obsolete">ホストが見つかりません</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1691"/>
+        <location line="-2"/>
         <source>Connection refused</source>
         <translation type="obsolete">接続が拒否されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469530"/>
         <source>Socket packet error</source>
         <translation type="obsolete">ソケットパケットエラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1688"/>
+        <location line="-7469533"/>
         <source>Login failed. Check user name and password</source>
         <translation type="obsolete">ログインに失敗しました。ユーザー名とパスワードを確認して下さい</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2427"/>
+        <location line="+739"/>
         <source>&lt;qt&gt;Cannot access %1. Either there is insufficient space, or another program is accessing the mailbox.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1 にアクセスできません。十分な空きがないためか、別のプログラムがメールボックスにアクセスしています。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2034"/>
+        <location line="-393"/>
         <source>&lt;qt&gt;Delete account: %1&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;アカウントの削除: %1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2954"/>
+        <location line="+920"/>
         <source>&lt;qt&gt;The following commands failed:&lt;br&gt;%1&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;次のコマンドが失敗しました:&lt;br&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3106"/>
+        <location line="+152"/>
         <source>&lt;qt&gt;You are currently editing a message:&lt;br&gt;%1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;現在、メッセージを編集しています:&lt;br&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3115"/>
+        <location line="+9"/>
         <source>&lt;qt&gt;Autosave failed:&lt;br&gt;%1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;自動保存が失敗しました:&lt;br&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1891"/>
+        <location line="-1224"/>
         <source>&lt;qt&gt;No valid SMTP server defined.&lt;br&gt;&lt;br&gt;No emails could be sent.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;有効な SMTP サーバーが定義されていません。&lt;br&gt;&lt;br&gt;メール送信ができませんでした。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1355"/>
+        <location line="-536"/>
         <source>New</source>
         <translation>新規</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469866"/>
         <source>Read from socket failed</source>
         <translation type="obsolete">ソケットからの読み込みに失敗</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2903"/>
+        <location line="-7468318"/>
         <source>Should this mail be saved in Drafts before writing the new mail?</source>
         <translation type="obsolete">新規メールを作成する前にこのメールを下書きに保存しますか?</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1239"/>
+        <location line="-1664"/>
         <source>&apos;View Mail&apos; message will be ignored</source>
         <translation type="unfinished">&apos;メールの表示&apos; メッセージは無視されます</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3188"/>
+        <location line="+1949"/>
         <source>&apos;Write SMS&apos; message will be ignored</source>
         <translation>&apos;SMS の作成&apos; メッセージは無視されます</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3225"/>
+        <location line="+37"/>
         <source>&apos;Write Mail&apos; message will be ignored</source>
         <translation>&apos;メールの作成&apos; メッセージは無視されます</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1798"/>
+        <location line="-1427"/>
         <source>Should this mail be saved in Drafts before viewing the new mail?</source>
         <translation type="obsolete">新しいメールを表示する前にこのメールを下書きに保存しますか?</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7469423"/>
         <source>all messages in trash</source>
         <comment>inserted into: &apos;Are you sure you want to delete: %1&apos; - %1=this string</comment>
         <translation type="obsolete">ゴミ箱にあるすべてのメッセージ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1753"/>
+        <location line="-7469468"/>
         <source>&lt;qt&gt;Failed sending SMS: %1&lt;/qt&gt;</source>
         <comment>%1 will contain the reason for the failure</comment>
         <translation type="obsolete">&lt;qt&gt;SMS の送信に失敗: %1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2197"/>
+        <location line="+444"/>
         <source>the mails</source>
         <translation type="obsolete">メール</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="565"/>
+        <location line="-1632"/>
         <source>Account Settings...</source>
         <translation type="obsolete">アカウントの設定...</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2054"/>
+        <location line="+1489"/>
         <source>&lt;qt&gt;Do you wish to send a Read Reply?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;開封通知を送信しますか?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2055"/>
+        <location line="+1"/>
         <source>Multimedia Message</source>
         <translation>マルチメディアメッセージ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2174"/>
+        <location line="+119"/>
         <source>&lt;qt&gt;Multimedia message delivered to %1.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;マルチメディアメッセージが %1 に配信されました。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2176"/>
+        <location line="+2"/>
         <source>&lt;qt&gt;Multimedia message rejected by %1.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;マルチメディアメッセージは %1 により拒否されました。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2178"/>
+        <location line="+2"/>
         <source>&lt;qt&gt;Multimedia message deferred by %1.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;マルチメディアメッセージは %1 により延期されました。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2180"/>
+        <location line="+2"/>
         <source>&lt;qt&gt;Multimedia message to %1 expired.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1 へのマルチメディアメッセージは期限切れです。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2188"/>
+        <location line="+8"/>
         <source>Unspecified</source>
         <comment>MMS recipient</comment>
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1767"/>
+        <location line="-421"/>
         <source>&lt;qt&gt;Failed sending MMS: %1&lt;/qt&gt;</source>
         <comment>%1 will contain the reason for the failure</comment>
         <translation type="obsolete">&lt;qt&gt;MMS の送信に失敗: %1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1774"/>
+        <location line="+7"/>
         <source>&lt;qt&gt;Failed receiving MMS: %1&lt;/qt&gt;</source>
         <comment>%1 will contain the reason for the failure</comment>
         <translation type="obsolete">&lt;qt&gt;MMS の受信に失敗: %1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3107"/>
+        <location line="+1333"/>
         <source>Messages conflict</source>
         <translation>メッセージの競合</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2067"/>
+        <location line="-1040"/>
         <source>Sent MMS &quot;%1&quot; was read on: %2</source>
         <comment>%1 = subject %2 = date</comment>
         <translation>送信した MMS &quot;%1&quot; が読まれた日: %2</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1392"/>
+        <location line="-675"/>
         <source>You have new multimedia messages.</source>
         <translation type="obsolete">新しいマルチメディアメッセージがあります。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1398"/>
+        <location line="+6"/>
         <source>You have a new multimedia message.</source>
         <translation type="obsolete">1 件の新しいマルチメディアメッセージがあります。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1401"/>
+        <location line="+3"/>
         <source>Subject: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;</source>
         <translation type="obsolete">件名: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1403"/>
+        <location line="+2"/>
         <source>From: %1&lt;br&gt;</source>
         <translation type="obsolete">差出人: %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1404"/>
+        <location line="+1"/>
         <source>%1 KBytes</source>
         <translation type="obsolete">%1 K バイト</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1408"/>
+        <location line="+4"/>
         <source>New MMS</source>
         <translation type="obsolete">新しい MMS</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1419"/>
+        <location line="+11"/>
         <source>Read now</source>
         <translation type="obsolete">すぐに読む</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1420"/>
+        <location line="+1"/>
         <source>Read later</source>
         <translation type="obsolete">後で読む</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1421"/>
+        <location line="+1"/>
         <source>Reject message</source>
         <translation type="obsolete">メッセージの拒否</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="571"/>
+        <location line="-850"/>
         <source>Move mail...</source>
         <translation type="obsolete">メールの移動...</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="573"/>
+        <location line="+2"/>
         <source>Copy mail...</source>
         <translation type="obsolete">メールのコピー...</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1692"/>
+        <location line="+1119"/>
         <source>Remote host closed the connection</source>
         <translation type="obsolete">リモートのホストが接続を閉じました</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1694"/>
+        <location line="+2"/>
         <source>Permission denied</source>
         <translation type="obsolete">パーミッションが拒否されました</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1695"/>
+        <location line="+1"/>
         <source>Insufficient resources</source>
         <translation type="obsolete">リソースが足りません</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1696"/>
+        <location line="+1"/>
         <source>Operation timed out</source>
         <translation type="obsolete">動作はタイムアウトしました</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1697"/>
+        <location line="+1"/>
         <source>Datagram too large</source>
         <translation type="obsolete">データグラムが大き過ぎます</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1698"/>
+        <location line="+1"/>
         <source>Network error</source>
         <translation type="obsolete">ネットワークのエラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1699"/>
+        <location line="+1"/>
         <source>Address in use</source>
         <translation type="obsolete">使用中のアドレス</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1700"/>
+        <location line="+1"/>
         <source>Address not available</source>
         <translation type="obsolete">アドレスは使用できません</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1701"/>
+        <location line="+1"/>
         <source>Unsupported operation</source>
         <translation type="obsolete">サポートされていない動作です</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1702"/>
+        <location line="+1"/>
         <source>Unknown error</source>
         <translation type="obsolete">不明なエラー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3417"/>
+        <location line="+1715"/>
         <source>(%1 new)</source>
         <comment>%1 = number of new mails</comment>
         <translation type="obsolete">(%1 新着)</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3948"/>
+        <location line="+531"/>
         <source>%1 unsent</source>
         <comment>%1 = number of unsent mails</comment>
         <translation type="obsolete">%1 未送信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3950"/>
+        <location line="+2"/>
         <source>%1 unfinished</source>
         <comment>%1 = number of unfinished mails</comment>
         <translation type="obsolete">%1 未完了</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1387"/>
+        <location line="-2563"/>
         <source>Select all</source>
         <translation type="unfinished">すべてを選択</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2681"/>
+        <location line="+1294"/>
         <source>Copy error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2682"/>
+        <location line="+1"/>
         <source>Storage for messages is full.&lt;br&gt;&lt;br&gt;Could not copy messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1238"/>
+        <location line="-1444"/>
         <source>Should this message be saved in Drafts before viewing the new message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1357"/>
+        <location line="+119"/>
         <source>Write a new message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1361"/>
+        <location line="+4"/>
         <source>Search for messages in your folders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1368"/>
+        <location line="+7"/>
         <source>Account settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1371"/>
+        <location line="+3"/>
         <source>Empty trash</source>
         <translation type="unfinished">ゴミ箱を空にする</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1689"/>
+        <location line="+318"/>
         <source>Airplane safe mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1690"/>
+        <location line="+1"/>
         <source>Saved message to Outbox. Message will be sent after exiting Airplane Safe mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1775"/>
+        <location line="+85"/>
         <source>Sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2189"/>
+        <location line="+414"/>
         <source>Multimedia message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2380"/>
+        <location line="+191"/>
         <source>Message</source>
         <translation type="unfinished">メッセージ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3540"/>
+        <location line="+1160"/>
         <source>Deleting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3545"/>
+        <location line="+5"/>
         <source>Moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4295"/>
+        <location line="+750"/>
         <source>Should it be saved in Drafts before writing the new message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3224"/>
+        <location line="-1071"/>
         <source>Should this message be saved in Drafts before writing the new message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3446"/>
+        <location line="+222"/>
         <source>Cannot edit a message of this type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3943"/>
+        <location line="+497"/>
         <source>(%1 new)</source>
         <comment>%1 = number of new messages</comment>
         <translation type="obsolete">(%1 新着)</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2624"/>
+        <location line="-1319"/>
         <source>Delete</source>
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3963"/>
+        <location line="+1339"/>
         <source>Copy</source>
         <translation type="obsolete">コピー</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4112"/>
+        <location line="+149"/>
         <source>New message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4183"/>
+        <location line="+71"/>
         <source>Saved to Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4183"/>
+        <location line="+0"/>
         <source>Incomplete message has been saved to the Drafts folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4336"/>
+        <location line="+153"/>
         <source>Send Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3790"/>
+        <location line="-546"/>
         <source>Message deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3791"/>
+        <location line="+1"/>
         <source>Message cannot be downloaded, because it has been deleted from the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2429"/>
+        <location line="-1362"/>
         <source>Save error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2443"/>
+        <location line="+14"/>
         <source>Move error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2585"/>
+        <location line="+142"/>
         <source>SIM not ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3445"/>
+        <location line="+860"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3545"/>
+        <location line="+100"/>
         <source>Moving to Trash: %1</source>
         <comment>%1=Email/Message/MMS</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3540"/>
+        <location line="-5"/>
         <source>Deleting: %1</source>
         <comment>%1=Email/Message/MMS</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1775"/>
+        <location line="-1765"/>
         <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3735"/>
+        <location line="+1960"/>
         <source>Deleting messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4337"/>
+        <location line="+602"/>
         <source>%1 cannot be sent, because no account has been configured to send with.</source>
         <comment>%1=MMS/Email/TextMessage</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3890"/>
+        <location line="-447"/>
         <source>Move to Trash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="432"/>
+        <location line="-3458"/>
         <source>Today %1</source>
         <translation type="unfinished">今日 %1</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="435"/>
+        <location line="+3"/>
         <source>Yesterday</source>
         <translation type="unfinished">昨日</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1347"/>
+        <location line="+912"/>
         <source>Get new mail from current account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4430"/>
+        <location line="+3083"/>
         <source>Mark messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2623"/>
+        <location line="-1807"/>
         <source>%n message(s)</source>
         <comment>%1: number of messages</comment>
         <translation type="unfinished">
@@ -1971,59 +1976,59 @@ before viewing this mail?</source>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2338"/>
+        <location line="-285"/>
         <source>Send Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2339"/>
+        <location line="+1"/>
         <source>Error sending %1: %2</source>
         <comment>%1: message type, %2: error text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2341"/>
+        <location line="+2"/>
         <source>Automatic Fetch Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2363"/>
+        <location line="+22"/>
         <source>Transfer cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2434"/>
+        <location line="+71"/>
         <source>&lt;qt&gt;Cannot copy message to %1. Either there is insufficient space, or another program is accessing the folders.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2441"/>
+        <location line="+7"/>
         <source>&lt;qt&gt;Cannot move message to %1. Either there is insufficient space, or another program is accessing the folders.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2582"/>
+        <location line="+141"/>
         <source>The SIM card is not ready. Do you want to delete the message(s) without removal from the SIM card?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2610"/>
+        <location line="+28"/>
         <source>Deleting message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2666"/>
+        <location line="+56"/>
         <source>Moving message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2887"/>
+        <location line="+221"/>
         <source>Deleting %n message(s)</source>
         <comment>%1: number of messages</comment>
         <translation type="unfinished">
@@ -2031,7 +2036,7 @@ before viewing this mail?</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2641"/>
+        <location line="-246"/>
         <source>Moving %n message(s) to Trash</source>
         <comment>%1: number of messages</comment>
         <translation type="unfinished">
@@ -2039,204 +2044,204 @@ before viewing this mail?</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2689"/>
+        <location line="+48"/>
         <source>Copying message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2994"/>
+        <location line="+305"/>
         <source>Get mail for %1</source>
         <comment>%1:account name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3064"/>
+        <location line="+70"/>
         <source>Reply</source>
         <translation type="obsolete">返信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3065"/>
+        <location line="+1"/>
         <source>Reply All</source>
         <translation type="obsolete">全員に返信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3066"/>
+        <location line="+1"/>
         <source>Forward</source>
         <translation type="obsolete">転送</translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="3887"/>
+        <location line="+821"/>
         <source>Delete message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="3893"/>
+        <location line="+6"/>
         <source>Move message(s)...</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="3894"/>
+        <location line="+1"/>
         <source>Copy message(s)...</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="4080"/>
+        <location line="+186"/>
         <source>%n new message(s) have arrived. Do you wish to view them now?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4428"/>
+        <location line="+348"/>
         <source>Cancel</source>
         <translation type="unfinished">取り消し</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1365"/>
+        <location line="-3063"/>
         <source>Decide whether messages in this folder should be retrieved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2233"/>
+        <location line="+868"/>
         <source>[%1 Voicemail]</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="2851"/>
+        <location line="+618"/>
         <source>Restoring message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3004"/>
+        <location line="+153"/>
         <source>Exclude folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3006"/>
+        <location line="+2"/>
         <source>Include folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="3895"/>
+        <location line="+889"/>
         <source>Restore message(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1223"/>
+        <location line="-2672"/>
         <source>Incomplete message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1225"/>
+        <location line="+2"/>
         <source>Messages was previously interrupted while composing a message.
 Do you want to resume composing the message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1493"/>
+        <location line="+268"/>
         <source>Unable to initialize the Mail Store!
 
 Messages cannot continue and will now terminate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1658"/>
+        <location line="+165"/>
         <source>Network Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1659"/>
+        <location line="+1"/>
         <source>Connection is currently unavailable.
 Do you want to connect to the network?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1674"/>
+        <location line="+15"/>
         <source>Message has been saved to the Drafts folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1876"/>
+        <location line="+202"/>
         <source>&lt;qt&gt;You must create an account.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1897"/>
+        <location line="+21"/>
         <source>&lt;qt&gt;Get mail only works with POP or IMAP.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2231"/>
+        <location line="+334"/>
         <source>[%1 Videomail]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2341"/>
+        <location line="+110"/>
         <source>Retrieve Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2342"/>
+        <location line="+1"/>
         <source>Error retrieving %1: %2</source>
         <comment>%1: message type, %2: error text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="2355"/>
+        <location line="+13"/>
         <source>message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3064"/>
+        <location line="+709"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3513"/>
+        <location line="+449"/>
         <source>Flash message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3514"/>
+        <location line="+1"/>
         <source>Do you wish to save this Flash message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4076"/>
+        <location line="+562"/>
         <source>1 new message has arrived.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="4078"/>
+        <location line="+2"/>
         <source>%n new messages have arrived.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4162"/>
+        <location line="+84"/>
         <source>New messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="4296"/>
+        <location line="+134"/>
         <source>&apos;Write Instant Message&apos; message will be ignored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="1492"/>
+        <location line="-2804"/>
         <source>No Mail Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2244,7 +2249,7 @@ Do you want to connect to the network?</source>
 <context>
     <name>EmailComposer</name>
     <message>
-        <location filename="emailcomposer.cpp" line="40"/>
+        <location filename="emailcomposer.cpp" line="+40"/>
         <source>Attachments</source>
         <translation type="obsolete">添付</translation>
     </message>
@@ -2252,47 +2257,47 @@ Do you want to connect to the network?</source>
 <context>
     <name>EmailFolderList</name>
     <message>
-        <location filename="emailfolderlist.cpp" line="227"/>
+        <location filename="emailfolderlist.cpp" line="+227"/>
         <source>Reading mailbox, please wait</source>
         <translation type="obsolete">メールボックスを読み込み中、お待ちください</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="187"/>
+        <location line="-40"/>
         <source>Email - Invalid index files</source>
         <translation type="obsolete">Email - 無効なインデックスファイル</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="188"/>
+        <location line="+1"/>
         <source>Yes</source>
         <translation type="obsolete">はい</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="188"/>
+        <location line="+0"/>
         <source>No</source>
         <translation type="obsolete">いいえ</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="199"/>
+        <location line="+11"/>
         <source>Email - Could not open mailbox</source>
         <translation type="obsolete">Email - メールボックスを開けませんでした</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="169"/>
+        <location line="-30"/>
         <source>&lt;qt&gt;Index files have been deleted. They must be recreated to access the %1 folder.&lt;br&gt;Recreate now?&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;インデックスファイルが削除されています。%1 フォルダにアクセスするには作成し直す必要があります。&lt;br&gt;いますぐ再作成しますか?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="176"/>
+        <location line="+7"/>
         <source>&lt;qt&gt;Mailbox is in older format. It must be upgraded to access the %1 folder.&lt;br&gt;Upgrade now?</source>
         <translation type="obsolete">&lt;qt&gt;メールボックスが旧フォーマットです。%1 フォルダにアクセスするにはアップグレードする必要があります。&lt;br&gt;いますぐアップグレードしますか?</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="183"/>
+        <location line="+7"/>
         <source>&lt;qt&gt;Index files have been deleted. They must be recreated to access the %1 folder.&lt;br&gt;Recreate now?</source>
         <translation type="obsolete">&lt;qt&gt;インデックスファイルが削除されています。%1 フォルダにアクセスするには作成し直す必要があります。&lt;br&gt;いますぐ再作成しますか?</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="198"/>
+        <location line="+15"/>
         <source>&lt;qt&gt;Could not open folder %1&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;フォルダ %1 を開けませんでした&lt;/qt&gt;</translation>
     </message>
@@ -2300,7 +2305,7 @@ Do you want to connect to the network?</source>
 <context>
     <name>EmailFolderModel</name>
     <message>
-        <location filename="emailfoldermodel.cpp" line="214"/>
+        <location filename="emailfoldermodel.cpp" line="+214"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2308,7 +2313,7 @@ Do you want to connect to the network?</source>
 <context>
     <name>EmailHandler</name>
     <message>
-        <location filename="emailhandler.cpp" line="149"/>
+        <location filename="emailhandler.cpp" line="+149"/>
         <source>No recipients specified for
  mail with subject:
 %1
@@ -2316,17 +2321,17 @@ NO mail has been sent.</source>
         <translation type="obsolete">メールの受取人が指定されていません、 件名:  %1。 送信されたメールはありません。</translation>
     </message>
     <message>
-        <location filename="emailhandler.cpp" line="243"/>
+        <location line="+94"/>
         <source>Mail encoding error</source>
         <translation type="obsolete">メールのエンコーディングエラー</translation>
     </message>
     <message>
-        <location filename="emailhandler.cpp" line="243"/>
+        <location line="+0"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="emailhandler.cpp" line="199"/>
+        <location line="-44"/>
         <source>Could not locate all files
 in mail with subject:
 %1
@@ -2334,12 +2339,12 @@ NO mail has been sent</source>
         <translation type="obsolete">メールにあるファイルをすべて見つけられませんでした、 件名: %1。 送信されたメールはありません</translation>
     </message>
     <message>
-        <location filename="emailhandler.cpp" line="520"/>
+        <location line="+321"/>
         <source>Cancelled by user</source>
         <translation type="obsolete">ユーザーによって取り消されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470701"/>
         <source>Invalid sms recipient specified for
  mail with subject:
 %1
@@ -2350,12 +2355,12 @@ NO mail has been sent.</source>
 <context>
     <name>EmailService</name>
     <message>
-        <location filename="emailclient.cpp" line="3707"/>
+        <location filename="emailclient.cpp" line="+2215"/>
         <source>Should this mail be saved in Drafts before viewing the new mail?</source>
         <translation type="obsolete">新しいメールを表示する前にこのメールを下書きに保存しますか?</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="3708"/>
+        <location line="+1"/>
         <source>&apos;View Mail&apos; message will be ignored</source>
         <translation type="obsolete">「メールの表示」メッセージは無視されます</translation>
     </message>
@@ -2363,32 +2368,32 @@ NO mail has been sent.</source>
 <context>
     <name>FolderListView</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7467513"/>
         <source>New Query</source>
         <translation type="obsolete">新規クエリー</translation>
     </message>
     <message>
-        <location filename="folderlistview.cpp" line="685"/>
+        <location filename="folderlistview.cpp" line="+685"/>
         <source>New query</source>
         <translation type="obsolete">新規のクエリー</translation>
     </message>
     <message>
-        <location filename="folderlistview.cpp" line="652"/>
+        <location line="-33"/>
         <source>Empty trash</source>
         <translation type="obsolete">ゴミ箱を空にする</translation>
     </message>
     <message>
-        <location filename="folderlistview.cpp" line="705"/>
+        <location line="+53"/>
         <source>Modify query</source>
         <translation type="obsolete">クエリーの変更</translation>
     </message>
     <message>
-        <location filename="folderlistview.cpp" line="659"/>
+        <location line="-46"/>
         <source>Delete query</source>
         <translation type="obsolete">クエリーの削除</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470562"/>
         <source>Modify Query</source>
         <translation type="obsolete">クエリーの変更</translation>
     </message>
@@ -2396,7 +2401,7 @@ NO mail has been sent.</source>
 <context>
     <name>FolderModel</name>
     <message numerus="yes">
-        <location filename="foldermodel.cpp" line="175"/>
+        <location filename="foldermodel.cpp" line="+175"/>
         <source> (%n new)</source>
         <comment>%1 = number of new messages</comment>
         <translation type="unfinished">
@@ -2404,7 +2409,7 @@ NO mail has been sent.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="foldermodel.cpp" line="177"/>
+        <location line="+2"/>
         <source> (%n unsent)</source>
         <comment>%1 = number of unsent messages</comment>
         <translation type="unfinished">
@@ -2412,7 +2417,7 @@ NO mail has been sent.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="foldermodel.cpp" line="179"/>
+        <location line="+2"/>
         <source> (%n unread)</source>
         <comment>%1 = number of unread messages</comment>
         <translation type="unfinished">
@@ -2423,23 +2428,23 @@ NO mail has been sent.</source>
 <context>
     <name>GenericComposer</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471042"/>
         <source>Attachments</source>
         <translation type="obsolete">添付</translation>
     </message>
     <message>
-        <location filename="genericcomposer.cpp" line="230"/>
+        <location filename="genericcomposer.cpp" line="+230"/>
         <source>Show Sms Limit</source>
         <translation type="obsolete">Sms の制限を表示</translation>
     </message>
     <message>
-        <location filename="genericcomposer.cpp" line="290"/>
+        <location line="+60"/>
         <source>%1/%2 </source>
         <comment>e.g. 5/7</comment>
         <translation type="obsolete">%1/%2 </translation>
     </message>
     <message>
-        <location filename="genericcomposer.cpp" line="237"/>
+        <location line="-53"/>
         <source>Insert Template</source>
         <translation type="obsolete">テンプレートの挿入</translation>
     </message>
@@ -2447,17 +2452,17 @@ NO mail has been sent.</source>
 <context>
     <name>ImageSourceDialog</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470984"/>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Cancel</source>
         <translation type="obsolete">取り消し</translation>
     </message>
     <message>
-        <location filename="../addressbook/imagesourcedialog.cpp" line="328"/>
+        <location filename="../addressbook/imagesourcedialog.cpp" line="+328"/>
         <source>Contact Photo</source>
         <translation type="obsolete">連絡先の写真</translation>
     </message>
@@ -2465,17 +2470,17 @@ NO mail has been sent.</source>
 <context>
     <name>ImageSourceWidget</name>
     <message>
-        <location filename="../addressbook/imagesourcedialog.cpp" line="175"/>
+        <location line="-153"/>
         <source>Remove</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="../addressbook/imagesourcedialog.cpp" line="105"/>
+        <location line="-70"/>
         <source>Pictures</source>
         <translation type="obsolete">画像</translation>
     </message>
     <message>
-        <location filename="../addressbook/imagesourcedialog.cpp" line="208"/>
+        <location line="+103"/>
         <source>No Photo</source>
         <translation type="obsolete">写真がありません</translation>
     </message>
@@ -2483,57 +2488,57 @@ NO mail has been sent.</source>
 <context>
     <name>ImapClient</name>
     <message>
-        <location filename="imapclient.cpp" line="67"/>
+        <location filename="imapclient.cpp" line="+67"/>
         <source>DNS lookup</source>
         <translation type="obsolete">DNS ルックアップ</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="100"/>
+        <location line="+33"/>
         <source>Logging in</source>
         <translation type="obsolete">ログイン中</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="106"/>
+        <location line="+6"/>
         <source>Retrieving folders</source>
         <translation type="obsolete">フォルダを読み出し中</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="314"/>
+        <location line="+208"/>
         <source>Checking </source>
         <translation type="obsolete">照合中 </translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="253"/>
+        <location line="-61"/>
         <source>Previewing </source>
         <translation type="obsolete">プレビューを表示中 </translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="291"/>
+        <location line="+38"/>
         <source>Deleting message %1</source>
         <translation type="obsolete">メッセージ %1 を削除中</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="383"/>
+        <location line="+92"/>
         <source>Completing %1 / %2</source>
         <translation type="obsolete">%1 / %2 を完了</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="464"/>
+        <location line="+81"/>
         <source>Connection failed</source>
         <translation type="obsolete">接続に失敗しました</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="459"/>
+        <location line="-5"/>
         <source>Error Occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="475"/>
+        <location line="+16"/>
         <source>Logging out</source>
         <translation type="obsolete">ログアウト中</translation>
     </message>
     <message>
-        <location filename="imapclient.cpp" line="468"/>
+        <location line="-7"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
@@ -2541,7 +2546,7 @@ NO mail has been sent.</source>
 <context>
     <name>ImapProtocol</name>
     <message>
-        <location filename="imapprotocol.cpp" line="266"/>
+        <location filename="imapprotocol.cpp" line="+266"/>
         <source>Connection failed</source>
         <translation type="obsolete">接続に失敗しました</translation>
     </message>
@@ -2549,53 +2554,53 @@ NO mail has been sent.</source>
 <context>
     <name>MMSComposer</name>
     <message>
-        <location filename="mmscomposer.cpp" line="446"/>
+        <location filename="mmscomposer.cpp" line="+446"/>
         <source>Add Slide</source>
         <translation type="obsolete">スライドの追加</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="449"/>
+        <location line="+3"/>
         <source>Remove Slide</source>
         <translation type="obsolete">スライドの削除</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="473"/>
+        <location line="+24"/>
         <source>Slide Options</source>
         <translation type="obsolete">スライドオプション</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470748"/>
         <source>Duration</source>
         <translation type="obsolete">期間</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="487"/>
+        <location line="-7470734"/>
         <source>seconds</source>
         <translation type="obsolete">秒</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="498"/>
+        <location line="+11"/>
         <source>Slide Color</source>
         <translation type="obsolete">スライドカラー</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="651"/>
+        <location line="+153"/>
         <source>Slide %1 of %2</source>
         <translation type="obsolete">スライド %1 / %2</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470570"/>
         <source>Duration: %1secs</source>
         <translation type="obsolete">期間: %1秒</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="477"/>
+        <location line="-7470744"/>
         <source>Duration</source>
         <comment>duration between images in a slide show</comment>
         <translation type="obsolete">期間</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="654"/>
+        <location line="+177"/>
         <source>Duration: %1secs</source>
         <comment>duration between images in a slide show</comment>
         <translation type="obsolete">期間: %1秒</translation>
@@ -2604,12 +2609,12 @@ NO mail has been sent.</source>
 <context>
     <name>MMSSlideImage</name>
     <message>
-        <location filename="mmscomposer.cpp" line="132"/>
+        <location line="-522"/>
         <source>Slide Photo</source>
         <translation type="obsolete">スライドフォト</translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="160"/>
+        <location line="+28"/>
         <source>Slide Image</source>
         <translation type="obsolete">スライドイメージ</translation>
     </message>
@@ -2617,42 +2622,42 @@ NO mail has been sent.</source>
 <context>
     <name>MailListView</name>
     <message>
-        <location filename="maillistview.cpp" line="182"/>
+        <location filename="maillistview.cpp" line="+182"/>
         <source>Arrival</source>
         <translation type="obsolete">着信</translation>
     </message>
     <message>
-        <location filename="maillistview.cpp" line="60"/>
+        <location line="-122"/>
         <source>Date</source>
         <translation type="obsolete">日付</translation>
     </message>
     <message>
-        <location filename="emaillistitem.cpp" line="113"/>
+        <location filename="emaillistitem.cpp" line="+113"/>
         <source>Today %1</source>
         <translation type="obsolete">今日 %1</translation>
     </message>
     <message>
-        <location filename="emaillistitem.cpp" line="116"/>
+        <location line="+3"/>
         <source>Yesterday</source>
         <translation type="obsolete">昨日</translation>
     </message>
     <message>
-        <location filename="maillistview.cpp" line="58"/>
+        <location filename="maillistview.cpp" line="-2"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="maillistview.cpp" line="59"/>
+        <location line="+1"/>
         <source>Subject</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="maillistview.cpp" line="79"/>
+        <location line="+20"/>
         <source>Select the sort order by tapping any of the columns in this header.  Tapping the same column twice will switch between ascending and descending order.</source>
         <translation type="obsolete">このヘッダーにあるコラムのどれかをタップして分類順序を選択します。昇順と降順を切り替えるには同じコラムを 2 回タップします。</translation>
     </message>
     <message>
-        <location filename="maillistview.cpp" line="74"/>
+        <location line="-5"/>
         <source>A list of the messages in your current folder.  Tap a mail to examine it.</source>
         <translation type="obsolete">現在のフォルダ内にあるメッセージの一覧です。内容を表示するにはメールをタップします。</translation>
     </message>
@@ -2660,17 +2665,17 @@ NO mail has been sent.</source>
 <context>
     <name>MailTransport</name>
     <message>
-        <location filename="mailtransport.cpp" line="135"/>
+        <location filename="mailtransport.cpp" line="+135"/>
         <source>DNS lookup</source>
         <translation type="obsolete">DNS ルックアップ</translation>
     </message>
     <message>
-        <location filename="mailtransport.cpp" line="195"/>
+        <location line="+60"/>
         <source>Connected</source>
         <translation type="obsolete">接続しました</translation>
     </message>
     <message>
-        <location filename="mailtransport.cpp" line="220"/>
+        <location line="+25"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
@@ -2678,77 +2683,77 @@ NO mail has been sent.</source>
 <context>
     <name>MailboxSelector</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471001"/>
         <source>Configure IMAP folders</source>
         <translation type="obsolete">IMAP フォルダの設定</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Lists your IMAP mailboxes.  Tick the mailboxes which you want to access on your device.</source>
         <translation type="obsolete">IMAP メールボックスを一覧表示します。ご使用のデバイでアクセスするメールボックスにチェックを入れます。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>For selected mailboxes, you can choose which type of messages to download.</source>
         <translation type="obsolete">選択したメールボックスで、ダウンロードするメッセージのタイプを選択できます。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Keep local copy</source>
         <translation type="obsolete">ローカルコピーを残す</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Complete messages</source>
         <translation type="obsolete">メッセージの完了</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Select all</source>
         <translation type="obsolete">すべてを選択</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Select all mailboxes in your account.</source>
         <translation type="obsolete">自分のアカウントにあるすべてのメールボックスを選択します。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Deselect all</source>
         <translation type="obsolete">すべての選択をはずす</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Deselect all mailboxes in your account.</source>
         <translation type="obsolete">自分のアカウントにあるすべてのメールボックスの選択をはずします。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Change message type</source>
         <translation type="obsolete">メッセージのタイプを変更</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Choose the message types you want to download for the selected mailbox.</source>
         <translation type="obsolete">選択したメールボックスにダウンロードするメッセージのタイプを選択します。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>All</source>
         <translation type="obsolete">すべて</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Only recent</source>
         <translation type="obsolete">最近のみ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>None (only headers)</source>
         <translation type="obsolete">なし(ヘッダーのみ)</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>No local copies?
 
 You must select the mailboxes
@@ -2759,22 +2764,22 @@ you want to access mail from</source>
 メールボックスを選択してください</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>I know</source>
         <translation type="obsolete">知っています</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Whoops</source>
         <translation type="obsolete">あら?!</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>&lt;qt&gt;No local copies? You must select the mailboxes you want to access mail from&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;ローカルコピーなし? アクセスするメールがあるメールボックスを選択して下さい。&lt;/qt&gt;</translation>
     </message>
@@ -2782,17 +2787,17 @@ you want to access mail from</source>
 <context>
     <name>MailboxView</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>All</source>
         <translation type="obsolete">すべて</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Only recent</source>
         <translation type="obsolete">最近のみ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>None (only headers)</source>
         <translation type="obsolete">なし(ヘッダーのみ)</translation>
     </message>
@@ -2800,42 +2805,42 @@ you want to access mail from</source>
 <context>
     <name>MessageListView</name>
     <message>
-        <location filename="messagelistview.cpp" line="188"/>
+        <location filename="messagelistview.cpp" line="+188"/>
         <source>No Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="192"/>
+        <location line="+4"/>
         <source>Messages</source>
         <translation type="unfinished">メッセージ</translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="193"/>
+        <location line="+1"/>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="194"/>
+        <location line="+1"/>
         <source>Sent</source>
         <translation type="unfinished">送信済み</translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="195"/>
+        <location line="+1"/>
         <source>Drafts</source>
         <translation type="unfinished">下書き</translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="196"/>
+        <location line="+1"/>
         <source>Trash</source>
         <translation type="unfinished">ゴミ箱</translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="205"/>
+        <location line="+9"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="messagelistview.cpp" line="440"/>
+        <location line="+235"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
@@ -2843,12 +2848,12 @@ you want to access mail from</source>
 <context>
     <name>MessageUiBase</name>
     <message>
-        <location filename="emailclient.cpp" line="526"/>
+        <location filename="emailclient.cpp" line="-7470695"/>
         <source>Messages</source>
         <translation type="unfinished">メッセージ</translation>
     </message>
     <message numerus="yes">
-        <location filename="emailclient.cpp" line="924"/>
+        <location line="+398"/>
         <source>%n message(s) selected</source>
         <comment>%1: number of messages</comment>
         <translation type="unfinished">
@@ -2856,35 +2861,35 @@ you want to access mail from</source>
         </translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="778"/>
+        <location line="-146"/>
         <source>(%1 new)</source>
         <comment>%1 = number of new messages</comment>
         <translation type="obsolete">(%1 新着)</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="782"/>
+        <location line="+4"/>
         <source>%1 unsent</source>
         <comment>%1 = number of unsent mails</comment>
         <translation type="obsolete">%1 未送信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="784"/>
+        <location line="+2"/>
         <source>%1 unfinished</source>
         <comment>%1 = number of unfinished mails</comment>
         <translation type="obsolete">%1 未完了</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="906"/>
+        <location line="+122"/>
         <source>Folders</source>
         <translation type="obsolete">フォルダ</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="847"/>
+        <location line="-59"/>
         <source>A list of your folders.  You can tap Outbox and then tap the Messages tab to see the messages currently in the outbox.</source>
         <translation type="obsolete">フォルダの一覧です。送信ボックスをタップ、次にメッセージタブをタップして送信ボックスに現在あるメッセージを表示します。</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="600"/>
+        <location line="-247"/>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2892,7 +2897,7 @@ you want to access mail from</source>
 <context>
     <name>MmsClient</name>
     <message>
-        <location filename="mmsclient.cpp" line="476"/>
+        <location filename="mmsclient.cpp" line="+476"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
@@ -2900,37 +2905,37 @@ you want to access mail from</source>
 <context>
     <name>MmsCommsHttp</name>
     <message>
-        <location filename="mmscomms_http.cpp" line="244"/>
+        <location filename="mmscomms_http.cpp" line="+244"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="212"/>
+        <location line="-32"/>
         <source>Transfer Failed</source>
         <translation type="obsolete">転送に失敗</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="286"/>
+        <location line="+74"/>
         <source>Lookup host</source>
         <translation type="obsolete">ルックアップホスト</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="289"/>
+        <location line="+3"/>
         <source>Connecting...</source>
         <translation type="obsolete">接続中...</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="292"/>
+        <location line="+3"/>
         <source>Sending...</source>
         <translation type="obsolete">送信中...</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="295"/>
+        <location line="+3"/>
         <source>Receiving...</source>
         <translation type="obsolete">受信中...</translation>
     </message>
     <message>
-        <location filename="mmscomms_http.cpp" line="265"/>
+        <location line="-30"/>
         <source>Closing Connection</source>
         <translation type="obsolete">接続を終了中</translation>
     </message>
@@ -2938,47 +2943,47 @@ you want to access mail from</source>
 <context>
     <name>MmsEditAccount</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470956"/>
         <source>Maximum</source>
         <translation type="obsolete">最大</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>1 Hour</source>
         <translation type="obsolete">1 時間</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>2 Hours</source>
         <translation type="obsolete">2 時間</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>6 Hours</source>
         <translation type="obsolete">6 時間</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>12 Hours</source>
         <translation type="obsolete">12 時間</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>1 Day</source>
         <translation type="obsolete">1 日</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>2 Days</source>
         <translation type="obsolete">2 日</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>3 Days</source>
         <translation type="obsolete">3 日</translation>
     </message>
     <message>
-        <location filename="mmseditaccount.cpp" line="71"/>
+        <location filename="mmseditaccount.cpp" line="+71"/>
         <source>&lt;None configured&gt;</source>
         <comment>No network profiles have been configured</comment>
         <translation>&lt;設定されていません&gt;</translation>
@@ -2987,67 +2992,67 @@ you want to access mail from</source>
 <context>
     <name>MmsEditAccountBase</name>
     <message>
-        <location filename="mmseditaccountbase.ui" line="16"/>
+        <location filename="mmseditaccountbase.ui" line="+16"/>
         <source>MMS Account</source>
         <translation>MMS アカウント</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471205"/>
         <source>Server</source>
         <translation type="obsolete">サーバ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Server:</source>
         <translation type="obsolete">サーバ:</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Gateway:</source>
         <translation type="obsolete">ゲートウェイ:</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Expiry</source>
         <translation type="obsolete">有効期限</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Send</source>
         <translation type="obsolete">送信</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Default</source>
         <translation type="obsolete">デフォルト</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Show</source>
         <translation type="obsolete">表示</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Hide</source>
         <translation type="obsolete">隠す</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Receive</source>
         <translation type="obsolete">受信</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Allow read reply</source>
         <translation type="obsolete">開封通知を許可</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Sender Visibility</source>
         <translation type="obsolete">送信者の情報表示</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Default: show address/number unless sender has secret number
 Show: show even secret number
 Hide: don&apos;t show any address</source>
@@ -3056,17 +3061,17 @@ Hide: don&apos;t show any address</source>
 隠す: アドレスをまったく表示させない</translation>
     </message>
     <message>
-        <location filename="mmseditaccountbase.ui" line="28"/>
+        <location line="-7471193"/>
         <source>Network Profile:</source>
         <translation>ネットワークプロフィール:</translation>
     </message>
     <message>
-        <location filename="mmseditaccountbase.ui" line="38"/>
+        <location line="+10"/>
         <source>Configure Network...</source>
         <translation>ネットワークの設定...</translation>
     </message>
     <message>
-        <location filename="mmseditaccountbase.ui" line="45"/>
+        <location line="+7"/>
         <source>Retrieve Automatically</source>
         <translation>自動的に回収</translation>
     </message>
@@ -3074,23 +3079,23 @@ Hide: don&apos;t show any address</source>
 <context>
     <name>NewMessagesDialog</name>
     <message>
-        <location filename="emailclient.cpp" line="306"/>
+        <location filename="emailclient.cpp" line="-294"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="289"/>
+        <location line="-17"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="320"/>
+        <location line="+31"/>
         <source>Listen</source>
         <comment>Listen to current message</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="323"/>
+        <location line="+3"/>
         <source>View</source>
         <comment>View this message</comment>
         <translation type="unfinished"></translation>
@@ -3099,7 +3104,7 @@ Hide: don&apos;t show any address</source>
 <context>
     <name>NewTemplateTextDialog</name>
     <message>
-        <location filename="templatetext.cpp" line="193"/>
+        <location filename="templatetext.cpp" line="+193"/>
         <source>Enter new text</source>
         <translation type="obsolete">新しいテキストを入力</translation>
     </message>
@@ -3107,17 +3112,17 @@ Hide: don&apos;t show any address</source>
 <context>
     <name>PDAComposer</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471028"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>CC</source>
         <translation type="obsolete">CC</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>BCC</source>
         <translation type="obsolete">BCC</translation>
     </message>
@@ -3125,62 +3130,62 @@ Hide: don&apos;t show any address</source>
 <context>
     <name>PopClient</name>
     <message>
-        <location filename="popclient.cpp" line="127"/>
+        <location filename="popclient.cpp" line="+127"/>
         <source>DNS lookup</source>
         <translation type="obsolete">DNS ルックアップ</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="163"/>
+        <location line="+36"/>
         <source>Connection established</source>
         <translation type="obsolete">接続が確立されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471058"/>
         <source>Error Occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="187"/>
+        <location line="-7471034"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="150"/>
+        <location line="-37"/>
         <source>Logging in</source>
         <translation type="obsolete">ログイン中</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="236"/>
+        <location line="+86"/>
         <source>Retrieving %1</source>
         <translation type="obsolete">%1 を読み出し中</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="238"/>
+        <location line="+2"/>
         <source>Completing %1</source>
         <translation type="obsolete">%1 を完了中</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="356"/>
+        <location line="+118"/>
         <source>Removing old messages</source>
         <translation type="obsolete">古いメッセージを削除中</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="397"/>
+        <location line="+41"/>
         <source>Communication finished</source>
         <translation type="obsolete">通信が終了しました</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="161"/>
+        <location line="-236"/>
         <source>Connected</source>
         <translation type="obsolete">接続しました</translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="251"/>
+        <location line="+90"/>
         <source>Previewing </source>
         <translation type="obsolete">プレビューを表示中 </translation>
     </message>
     <message>
-        <location filename="popclient.cpp" line="253"/>
+        <location line="+2"/>
         <source>Completing %1 / %2</source>
         <translation type="obsolete">%1 / %2 を完了</translation>
     </message>
@@ -3188,12 +3193,12 @@ Hide: don&apos;t show any address</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470968"/>
         <source>Out of Space</source>
         <translation type="obsolete">空き容量がありません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The memory is very low.
 Please shorten this message
 or cancel this message.
@@ -3204,101 +3209,126 @@ or cancel this message.
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Inbox</source>
         <translation type="obsolete">受信ボックス</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Outbox</source>
         <translation type="obsolete">送信ボックス
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Drafts</source>
         <translation type="obsolete">下書き</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Sent</source>
         <translation type="obsolete">送信済み</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Trash</source>
         <translation type="obsolete">ゴミ箱</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Messages</source>
         <translation type="obsolete">メッセージ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
     <message>
-        <location filename="smsdecoder.cpp" line="793"/>
+        <location filename="smsdecoder.cpp" line="+793"/>
         <source>Attachment: </source>
         <translation type="obsolete">添付: </translation>
     </message>
     <message>
-        <location filename="mmscomposer.cpp" line="176"/>
+        <location filename="mmscomposer.cpp" line="+16"/>
         <source>Your text here..</source>
         <translation type="obsolete">テキストはここ...</translation>
     </message>
+    <message>
+        <location filename="attachmentoptions.cpp" line="+338"/>
+        <source>1 byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 bytes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 GB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtMail</name>
     <message>
-        <location filename="messagestore.cpp" line="50"/>
+        <location filename="messagestore.cpp" line="+50"/>
         <source>Inbox</source>
         <translation type="obsolete">受信ボックス</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="66"/>
+        <location line="+16"/>
         <source>Outbox</source>
         <translation type="obsolete">送信ボックス</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="62"/>
+        <location line="-4"/>
         <source>Trash</source>
         <translation type="obsolete">ゴミ箱</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="54"/>
+        <location line="-8"/>
         <source>Sent</source>
         <translation type="obsolete">送信済み</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="58"/>
+        <location line="+4"/>
         <source>Drafts</source>
         <translation type="obsolete">下書き</translation>
     </message>
     <message>
-        <location filename="emailfolderlist.cpp" line="73"/>
+        <location filename="emailfolderlist.cpp" line="-125"/>
         <source>Last Search</source>
         <translation type="obsolete">最後の検索</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="51"/>
+        <location filename="messagestore.cpp" line="-7"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="67"/>
+        <location line="+16"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="63"/>
+        <location line="-4"/>
         <source>From/To</source>
         <translation type="obsolete">差出人/宛先</translation>
     </message>
     <message>
-        <location filename="messagestore.cpp" line="74"/>
+        <location line="+11"/>
         <source>Email</source>
         <translation type="obsolete">Email</translation>
     </message>
@@ -3306,212 +3336,212 @@ or cancel this message.
 <context>
     <name>QtSslSocket</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471147"/>
         <source>QtSslSocket: Certificate required in server mode</source>
         <translation type="obsolete">QtSslSocket: サーバーモードで証明書が必要です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Private key required in server mode</source>
         <translation type="obsolete">サーバーモードでプライベートキーが必要です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Error creating SSL context, %1</source>
         <translation type="obsolete">SSL コンテキストの作成中にエラーが発生しました、%1 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Invalid or empty cipher list, %1</source>
         <translation type="obsolete">無効または空の暗合リストです、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Error loading certificate, %1</source>
         <translation type="obsolete">証明書のロード中にエラーが発生しました、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Error loading private key, %1</source>
         <translation type="obsolete">プライベートキーのロード中にエラーが発生しました、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Private key do not certificate public key, %1</source>
         <translation type="obsolete">プライベートキーはパブリックキーの証明を行ないません、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Failed to load the list of trusted CAs</source>
         <translation type="obsolete">信頼できる CA 一覧のロードに失敗しました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Error creating SSL session, %1</source>
         <translation type="obsolete">SSL セッションの作成中にエラーが発生しました、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Error creating SSL session</source>
         <translation type="obsolete">SSL セッションの作成中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Failed to write protocol data to BIO</source>
         <translation type="obsolete">プロトコルデータの BIO への書き込みに失敗しました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Failed to read from SSL, %1</source>
         <translation type="obsolete">SSL からの読み込みに失敗しました、 %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>SSL error: %1</source>
         <translation type="obsolete">SSL エラー: %1</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>An unknown error occurred</source>
         <translation type="obsolete">不明なエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Self signed certificate</source>
         <translation type="obsolete">self signed 証明書</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Self signed certificate in certificate chain</source>
         <translation type="obsolete">証明チェーン内の self signed 証明書</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unable to decrypt certificate&apos;s signature</source>
         <translation type="obsolete">証明書の署名を解読できません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Certificate signature failure</source>
         <translation type="obsolete">証明書の署名に関する支障</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The certificate is not yet valid</source>
         <translation type="obsolete">証明書がまだ有効ではありません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The certificate has expired</source>
         <translation type="obsolete">証明書の期限が切れています</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Format error in certificate&apos;s notBefore field</source>
         <translation type="obsolete">証明書の notBefore フィールドにフォーマットエラーがあります</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Format error in certificate&apos;s notAfter field</source>
         <translation type="obsolete">証明書の notAfter フィールドにフォーマットエラーがあります</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unable to get local issuer certificate</source>
         <translation type="obsolete">ローカルの発行元証明書を取得できません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unable to verify the first certificate</source>
         <translation type="obsolete">1番目の証明書を検証できません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Invalid CA certificate</source>
         <translation type="obsolete">無効な CA 証明書です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unable to get issuer certificate</source>
         <translation type="obsolete">発行元証明書を取得できません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unable to decode issuer public key</source>
         <translation type="obsolete">発行元パブリックキーを解読できません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Path length constraint exceeded</source>
         <translation type="obsolete">パス長の制限を超えています</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unsupported certificate purpose</source>
         <translation type="obsolete">サポートされていない証明目的です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Certificate not trusted</source>
         <translation type="obsolete">信頼できない証明書です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Certificate rejected</source>
         <translation type="obsolete">証明書が拒否されました</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Subject issuer mismatch</source>
         <translation type="obsolete">subject と issuer の不一致です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Authority and subject key identifier mismatch</source>
         <translation type="obsolete">authority と subject キー識別子の不一致です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Authority and issuer serial number mismatch</source>
         <translation type="obsolete">authority と issuer シリアル番号の不一致です</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Key usage does not include certificate signing</source>
         <translation type="obsolete">キーの使用には証明書の署名は含まれません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Out of memory</source>
         <translation type="obsolete">メモリ不足</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Unknown error</source>
         <translation type="obsolete">不明なエラー</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The SSL certificate has been verified</source>
         <translation type="obsolete">SSL 証明書は検証されています</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The SSL certificate is not valid until %1</source>
         <translation type="obsolete">SSL 証明書は %1 まで有効ではありません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The SSL certificate expired on %1</source>
         <translation type="obsolete">SSL 証明書は %1 で期限が切れています</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>, %1 </source>
         <translation type="obsolete">、 %1 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>the host name &quot;%0&quot; doesn&apos;t match the host name in the certificate &quot;%1&quot;</source>
         <translation type="obsolete">ホスト名 &quot;%0&quot; は証明書のホスト名  &quot;%1&quot; と一致しません</translation>
     </message>
@@ -3519,322 +3549,322 @@ or cancel this message.
 <context>
     <name>ReadMail</name>
     <message>
-        <location filename="readmail.cpp" line="171"/>
+        <location filename="readmail.cpp" line="+171"/>
         <source>&amp;View</source>
         <translation type="obsolete">(&amp;V)表示</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="168"/>
+        <location line="-3"/>
         <source>&amp;Mail</source>
         <translation type="obsolete">(&amp;M)メール</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="105"/>
+        <location line="-63"/>
         <source>Get this mail</source>
         <translation type="obsolete">このメールを受信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="107"/>
+        <location line="+2"/>
         <source>Retrieve this mail from the server.  You can use this option to retrieve individual mails that would normally not be automatically downloaded.</source>
         <translation type="obsolete">サーバーからこのメールをリトリーブします。通常、自動的にはダウンロードされないメールを個々にリトリーブするのにこのオプションを使用することができます。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="109"/>
+        <location line="+2"/>
         <source>Send this mail</source>
         <translation type="obsolete">このメールを送信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="111"/>
+        <location line="+2"/>
         <source>Send this mail.  This option will not send any other mails in your outbox.</source>
         <translation type="obsolete">このメールを送信します。このオプションでは、送信ボックスにある他のメールは送信しません。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="181"/>
+        <location line="+70"/>
         <source>Reply</source>
         <translation>返信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="183"/>
+        <location line="+2"/>
         <source>Reply to sender only.  Select Reply all from the menu if you want to reply to all recipients.</source>
         <translation>送信者へのみ返信します。すべての受信者に返信したい場合は、メニューから全員に返信を選択してください。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="191"/>
+        <location line="+8"/>
         <source>Modify</source>
         <translation>変更</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="125"/>
+        <location line="-66"/>
         <source>Opens this mail in the composer so that you can make modifications to it.</source>
         <translation type="obsolete">コンポーザーでこのメールを開くとメールに変更を加えることができます。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="195"/>
+        <location line="+70"/>
         <source>Previous</source>
         <translation>前のメール</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="129"/>
+        <location line="-66"/>
         <source>Read the previous mail in the folder.</source>
         <translation type="obsolete">フォルダ内の前のメールを読みます。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="199"/>
+        <location line="+70"/>
         <source>Next</source>
         <translation>次のメール</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="133"/>
+        <location line="-66"/>
         <source>Read the next mail in the folder.</source>
         <translation type="obsolete">フォルダ内の次のメールを読みます。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="203"/>
+        <location line="+70"/>
         <source>Attachments</source>
         <translation>添付</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="138"/>
+        <location line="-65"/>
         <source>View the attachments in the mail.</source>
         <translation type="obsolete">メールの添付を表示します。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="140"/>
+        <location line="+2"/>
         <source>Text Format</source>
         <translation type="obsolete">テキスト形式</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="143"/>
+        <location line="+3"/>
         <source>Toggle the display of mail between plain text and rich text.</source>
         <translation type="obsolete">プレーンテキストかリッチテキストにメールの表示を切り替えます。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="611"/>
+        <location line="+468"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="167"/>
+        <location line="-444"/>
         <source>This view displays the contents of the mail.</source>
         <translation type="obsolete">このビューはメールの内容を表示します。</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="299"/>
+        <location line="+132"/>
         <source>Add to Contacts</source>
         <translation type="obsolete">連絡先に追加</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="300"/>
+        <location line="+1"/>
         <source>Write mail to</source>
         <translation type="obsolete">メールを作成</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470921"/>
         <source>Send this Mail</source>
         <translation type="obsolete">このメールを送信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="185"/>
+        <location line="-7471036"/>
         <source>Reply all</source>
         <translation type="unfinished">全員へ返信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="188"/>
+        <location line="+3"/>
         <source>Forward</source>
         <translation>転送</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471033"/>
         <source>Edit</source>
         <translation type="obsolete">編集</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1221"/>
+        <location line="-7470000"/>
         <source>Set status</source>
         <translation type="obsolete">状態の設定</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1225"/>
+        <location line="+4"/>
         <source>Unread</source>
         <translation type="obsolete">未読</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1226"/>
+        <location line="+1"/>
         <source>Replied</source>
         <translation type="obsolete">返信済み</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1227"/>
+        <location line="+1"/>
         <source>Forwarded</source>
         <translation type="obsolete">転送済み</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1229"/>
+        <location line="+2"/>
         <source>Sent</source>
         <translation type="obsolete">送信済み</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="1230"/>
+        <location line="+1"/>
         <source>Unsent</source>
         <translation type="obsolete">未送信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="147"/>
+        <location line="-1083"/>
         <source>Move this mail to the trash folder.  If the mail is already in the trash folder it will be deleted. </source>
         <translation type="obsolete">このメールをゴミ箱フォルダに移動します。メールがすでにゴミ箱にある場合はこのメールは完全に削除されます。 </translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="306"/>
+        <location line="+159"/>
         <source>The address already exists in Contacts</source>
         <translation type="obsolete">このアドレスはすでに連絡先にあります</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="117"/>
+        <location line="-189"/>
         <source>Reply All</source>
         <translation type="obsolete">全員に返信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="706"/>
+        <location line="+589"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="707"/>
+        <location line="+1"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="517"/>
+        <location line="-190"/>
         <source>Reply-To</source>
         <translation type="obsolete">返信</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="722"/>
+        <location line="+205"/>
         <source>Date</source>
         <translation type="obsolete">日付</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="590"/>
+        <location line="-132"/>
         <source>Attachment</source>
         <translation type="obsolete">添付</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="609"/>
+        <location line="+19"/>
         <source>Could not locate file</source>
         <translation type="obsolete">ファイルが見つかりませんでした</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="745"/>
+        <location line="+136"/>
         <source>Awaiting download</source>
         <translation type="obsolete">ダウンロード待機中</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="746"/>
+        <location line="+1"/>
         <source>Size of mail</source>
         <translation type="obsolete">メールのサイズ</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="705"/>
+        <location line="-41"/>
         <source>Subject</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="530"/>
+        <location line="-175"/>
         <source>&lt;b&gt;Play MMS</source>
         <translation type="obsolete">&lt;b&gt;MMS を再生</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="636"/>
+        <location line="+106"/>
         <source>Cannot view MMS</source>
         <translation>MMS を表示できません</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="478"/>
+        <location line="-158"/>
         <source>&lt;qt&gt;Cannot play improperly formatted MMS&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;正しくフォーマット化されていない MMS は再生できません&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="173"/>
+        <location line="-305"/>
         <source>Get message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="175"/>
+        <location line="+2"/>
         <source>Retrieve this message from the server.  You can use this option to retrieve individual messages that would normally not be automatically downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="177"/>
+        <location line="+2"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="179"/>
+        <location line="+2"/>
         <source>Send this message.  This option will not send any other messages in your outbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="193"/>
+        <location line="+14"/>
         <source>Opens this message in the composer so that you can make modifications to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="197"/>
+        <location line="+4"/>
         <source>Read the previous message in the folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="201"/>
+        <location line="+4"/>
         <source>Read the next message in the folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="206"/>
+        <location line="+5"/>
         <source>View the attachments in the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="210"/>
+        <location line="+4"/>
         <source>Move this message to the trash folder.  If the message is already in the trash folder it will be deleted. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="958"/>
+        <location line="+748"/>
         <source>This view displays the contents of the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="334"/>
+        <location line="-624"/>
         <source>Message</source>
         <translation type="unfinished">メッセージ</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="611"/>
+        <location line="+277"/>
         <source>Move to Trash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="634"/>
+        <location line="+23"/>
         <source>MMS</source>
         <translation type="unfinished">MMS</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="653"/>
+        <location line="+19"/>
         <source>Save to Contacts</source>
         <translation type="obsolete">連絡先に保存</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="212"/>
+        <location line="-441"/>
         <source>Save Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="341"/>
+        <location line="+129"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="637"/>
+        <location line="+296"/>
         <source>&lt;qt&gt;Cannot play improperly formatted MMS.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3842,12 +3872,12 @@ or cancel this message.
 <context>
     <name>RecipientEdit</name>
     <message>
-        <location filename="detailspage.cpp" line="278"/>
+        <location filename="detailspage.cpp" line="+124"/>
         <source>Send</source>
         <translation type="obsolete">送信</translation>
     </message>
     <message>
-        <location filename="detailspage.cpp" line="275"/>
+        <location line="-3"/>
         <source>Search</source>
         <translation type="obsolete">検索</translation>
     </message>
@@ -3855,7 +3885,7 @@ or cancel this message.
 <context>
     <name>RecipientSelectorButton</name>
     <message>
-        <location filename="detailspage.cpp" line="302"/>
+        <location line="+27"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
@@ -3863,22 +3893,22 @@ or cancel this message.
 <context>
     <name>ReplyDialog</name>
     <message>
-        <location filename="emailclient.cpp" line="186"/>
+        <location filename="emailclient.cpp" line="-137"/>
         <source>Reply</source>
         <translation type="unfinished">返信</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="189"/>
+        <location line="+3"/>
         <source>ReplyAll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="192"/>
+        <location line="+3"/>
         <source>Forward</source>
         <translation type="unfinished">転送</translation>
     </message>
     <message>
-        <location filename="emailclient.cpp" line="195"/>
+        <location line="+3"/>
         <source>Cancel</source>
         <translation type="unfinished">取り消し</translation>
     </message>
@@ -3886,33 +3916,33 @@ or cancel this message.
 <context>
     <name>SaveContactDialog</name>
     <message>
-        <location filename="readmail.cpp" line="74"/>
+        <location filename="readmail.cpp" line="-563"/>
         <source>Create new contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="75"/>
+        <location line="+1"/>
         <source>Add to existing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="72"/>
+        <location line="-3"/>
         <source>Cancel</source>
         <translation type="unfinished">取り消し</translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="81"/>
+        <location line="+9"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="89"/>
+        <location line="+8"/>
         <source>Saving &apos;%1&apos; to Contacts.</source>
         <comment>%1=name/address/number</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="readmail.cpp" line="91"/>
+        <location line="+2"/>
         <source>Create new contact or add to an existing contact?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3920,7 +3950,7 @@ or cancel this message.
 <context>
     <name>Search</name>
     <message>
-        <location filename="search.cpp" line="63"/>
+        <location filename="search.cpp" line="+63"/>
         <source>(No name)</source>
         <translation type="obsolete">(名前なし)</translation>
     </message>
@@ -3928,7 +3958,7 @@ or cancel this message.
 <context>
     <name>SearchProgressDialog</name>
     <message>
-        <location filename="emailclient.cpp" line="161"/>
+        <location filename="emailclient.cpp" line="-34"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3936,32 +3966,32 @@ or cancel this message.
 <context>
     <name>SearchView</name>
     <message>
-        <location filename="searchview.cpp" line="50"/>
+        <location filename="searchview.cpp" line="+50"/>
         <source>Query</source>
         <translation type="obsolete">クエリー</translation>
     </message>
     <message>
-        <location filename="searchview.cpp" line="43"/>
+        <location line="-7"/>
         <source>Search</source>
         <translation>検索</translation>
     </message>
     <message>
-        <location filename="searchview.cpp" line="108"/>
+        <location line="+65"/>
         <source>Pick address</source>
         <translation type="obsolete">アドレスを拾う</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471113"/>
         <source>Copy</source>
         <translation type="obsolete">コピー</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Paste</source>
         <translation type="obsolete">貼り付け</translation>
     </message>
     <message>
-        <location filename="searchview.cpp" line="50"/>
+        <location line="-7471171"/>
         <source>From contacts</source>
         <comment>Find email address from Contacts application</comment>
         <translation type="unfinished"></translation>
@@ -3970,214 +4000,214 @@ or cancel this message.
 <context>
     <name>SearchViewBase</name>
     <message>
-        <location filename="searchviewbasephone.ui" line="13"/>
+        <location filename="searchviewbasephone.ui" line="+13"/>
         <source>Search</source>
         <translation>検索</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="161"/>
+        <location line="+148"/>
         <source>To</source>
         <translation>宛先</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="205"/>
+        <location line="+44"/>
         <source>Input text that must occur in the subject.</source>
         <translation>件名内で検索するテキストを入力します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="71"/>
+        <location line="-134"/>
         <source>Inbox</source>
         <translation>受信ボックス</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="76"/>
+        <location line="+5"/>
         <source>Outbox</source>
         <translation>送信ボックス</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="81"/>
+        <location line="+5"/>
         <source>Drafts</source>
         <translation>下書き</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="86"/>
+        <location line="+5"/>
         <source>Sent</source>
         <translation>送信済み</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="91"/>
+        <location line="+5"/>
         <source>Trash</source>
         <translation>ゴミ箱</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="62"/>
+        <location line="-29"/>
         <source>Select the mailbox to search for mail in.</source>
         <translation>受信メールを検索するメールボックスを選択します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="144"/>
+        <location line="+82"/>
         <source>From</source>
         <translation>差出人</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="178"/>
+        <location line="+34"/>
         <source>Subject</source>
         <translation type="unfinished">件名</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="195"/>
+        <location line="+17"/>
         <source>Body</source>
         <translation type="unfinished">本文</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="87"/>
+        <location line="-108"/>
         <source>Input text that must occur in the body.  Bear in mind that searching the body can be very slow.</source>
         <translation type="obsolete">本文内で検索するテキストを入力します。本文の検索はかなり時間がかかることがあるので注意してください。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="162"/>
+        <location filename="searchviewbase.ui" line="+162"/>
         <source>Search in</source>
         <translation type="obsolete">検索先</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="116"/>
+        <location filename="searchviewbasephone.ui" line="+29"/>
         <source>Any</source>
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="121"/>
+        <location line="+5"/>
         <source>Read</source>
         <translation>読む</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="126"/>
+        <location line="+5"/>
         <source>Unread</source>
         <translation>未読</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="131"/>
+        <location line="+5"/>
         <source>Replied</source>
         <translation>返信済み</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="54"/>
+        <location filename="searchviewbase.ui" line="-108"/>
         <source>Find mail with a matching status.</source>
         <translation type="obsolete">状態が合致するメールを検索します。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="134"/>
+        <location line="+80"/>
         <source>Mail status</source>
         <translation type="obsolete">メールの状態</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="183"/>
+        <location line="+49"/>
         <source>Date</source>
         <translation type="obsolete">日付</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="201"/>
+        <location line="+18"/>
         <source>before</source>
         <translation type="obsolete">以前</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="236"/>
+        <location filename="searchviewbasephone.ui" line="+105"/>
         <source>Include only mails before this date.</source>
         <translation>この日付以前のメールのみ含みます。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="211"/>
+        <location filename="searchviewbase.ui" line="+10"/>
         <source>after</source>
         <translation type="obsolete">以後</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="226"/>
+        <location filename="searchviewbasephone.ui" line="-10"/>
         <source>Include only mails after this date.</source>
         <translation>この日付以後のメールのみ含みます。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="164"/>
+        <location filename="searchviewbase.ui" line="-47"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="234"/>
+        <location filename="searchviewbasephone.ui" line="+8"/>
         <source>Set the name for your query.</source>
         <translation type="obsolete">クエリーに名前を設定します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="162"/>
+        <location line="-72"/>
         <source>Name</source>
         <translation type="obsolete">名前</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="154"/>
+        <location line="-8"/>
         <source>Input text that must occur in the from field.</source>
         <translation>差出人フィールド内で検索するテキストを入力します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="171"/>
+        <location line="+17"/>
         <source>Input text that must occur in the to field.</source>
         <translation>宛先フィールド内で検索するテキストを入力します。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="84"/>
+        <location filename="searchviewbase.ui" line="-80"/>
         <source>Select a contact to use as recipient.</source>
         <translation type="obsolete">受信者として使用する連絡先を選択します。</translation>
     </message>
     <message>
-        <location filename="searchviewbase.ui" line="161"/>
+        <location line="+77"/>
         <source>Select a contact to use as sender.</source>
         <translation type="obsolete">送信者として使用する連絡先を選択します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="191"/>
+        <location filename="searchviewbasephone.ui" line="+20"/>
         <source>Subj</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="49"/>
+        <location line="-142"/>
         <source>In</source>
         <translation>次のものを含む</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="112"/>
+        <location line="+63"/>
         <source>Find mail with a matching flag.</source>
         <translation>フラグが合致するメールを検索します。</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="141"/>
+        <location line="+29"/>
         <source>Flag</source>
         <translation type="obsolete">フラグ</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="61"/>
+        <location line="-80"/>
         <source>Before</source>
         <translation type="obsolete">以前</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="78"/>
+        <location line="+17"/>
         <source>After</source>
         <translation type="obsolete">以後</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="239"/>
+        <location line="+161"/>
         <source>Before</source>
         <comment>Before 20th of July</comment>
         <translation type="unfinished">以前</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="229"/>
+        <location line="-10"/>
         <source>After</source>
         <comment>e.g. After 20th of July</comment>
         <translation type="unfinished">以後</translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="99"/>
+        <location line="-130"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="searchviewbasephone.ui" line="136"/>
+        <location line="+37"/>
         <source>Removed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4185,7 +4215,7 @@ or cancel this message.
 <context>
     <name>SelectFolderDialog</name>
     <message>
-        <location filename="selectfolder.cpp" line="24"/>
+        <location filename="selectfolder.cpp" line="+24"/>
         <source>Select folder</source>
         <translation type="unfinished">フォルダの選択</translation>
     </message>
@@ -4193,7 +4223,7 @@ or cancel this message.
 <context>
     <name>SigEntry</name>
     <message>
-        <location filename="editaccount.cpp" line="546"/>
+        <location filename="editaccount.cpp" line="+136"/>
         <source>Signature</source>
         <translation>署名</translation>
     </message>
@@ -4201,17 +4231,17 @@ or cancel this message.
 <context>
     <name>SmsClient</name>
     <message>
-        <location filename="smsclient.cpp" line="309"/>
+        <location filename="smsclient.cpp" line="+309"/>
         <source>(no subject)</source>
         <translation type="obsolete">(件名なし）</translation>
     </message>
     <message>
-        <location filename="smsclient.cpp" line="80"/>
+        <location line="-229"/>
         <source>Messages cannot be sent in Airplane Mode.</source>
         <translation type="obsolete">Airplane Mode ではメッセージの送信はできません。</translation>
     </message>
     <message>
-        <location filename="smsclient.cpp" line="140"/>
+        <location line="+60"/>
         <source>Invalid sms recipient specified for
  mail with subject:
 %1
@@ -4222,32 +4252,32 @@ NO mail has been sent.</source>
 <context>
     <name>SmtpClient</name>
     <message>
-        <location filename="smtpclient.cpp" line="228"/>
+        <location filename="smtpclient.cpp" line="+228"/>
         <source>DNS lookup</source>
         <translation type="obsolete">DNS ルックアップ</translation>
     </message>
     <message>
-        <location filename="smtpclient.cpp" line="316"/>
+        <location line="+88"/>
         <source>Connection established</source>
         <translation type="obsolete">接続が確立されました</translation>
     </message>
     <message>
-        <location filename="smtpclient.cpp" line="202"/>
+        <location line="-114"/>
         <source>Error occurred</source>
         <translation type="obsolete">エラーが発生しました</translation>
     </message>
     <message>
-        <location filename="smtpclient.cpp" line="472"/>
+        <location line="+270"/>
         <source>Sending: %1</source>
         <translation type="obsolete">送信中: %1</translation>
     </message>
     <message>
-        <location filename="smtpclient.cpp" line="513"/>
+        <location line="+41"/>
         <source>Sent %1 messages</source>
         <translation type="obsolete">%1 メッセージが送信されました</translation>
     </message>
     <message>
-        <location filename="smtpclient.cpp" line="152"/>
+        <location line="-361"/>
         <source>Connected</source>
         <translation type="obsolete">接続しました</translation>
     </message>
@@ -4255,103 +4285,103 @@ NO mail has been sent.</source>
 <context>
     <name>TemplateTextDialog</name>
     <message>
-        <location filename="templatetext.cpp" line="32"/>
+        <location filename="templatetext.cpp" line="-7471189"/>
         <source>Templates</source>
         <translation type="obsolete">テンプレート</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="44"/>
+        <location line="+12"/>
         <source>Remove template item</source>
         <translation type="obsolete">テンプレートアイテムの削除</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="47"/>
+        <location line="+3"/>
         <source>Reset to default</source>
         <translation type="obsolete">デフォルトにリセット</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="69"/>
+        <location line="+22"/>
         <source>New template text...</source>
         <translation type="obsolete">新規のテンプレートテキスト...</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="173"/>
+        <location line="+104"/>
         <source>&lt;p&gt;Reset to defaults?</source>
         <translation type="obsolete">&lt;p&gt;デフォルトにリセットしますか?</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="174"/>
+        <location line="+1"/>
         <source>Reset all templates</source>
         <translation type="obsolete">すべてのテンプレートをリセット</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="96"/>
+        <location line="-78"/>
         <source>I love you</source>
         <comment>message template</comment>
         <translation type="obsolete">あなたが好き</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="97"/>
+        <location line="+1"/>
         <source>I love you too</source>
         <comment>message template</comment>
         <translation type="obsolete">私もあなたが好き</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="98"/>
+        <location line="+1"/>
         <source>Do you miss me?</source>
         <comment>message template</comment>
         <translation type="obsolete">いなくて寂しい?</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="99"/>
+        <location line="+1"/>
         <source>I miss you</source>
         <comment>message template</comment>
         <translation type="obsolete">いなくて寂しい</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="100"/>
+        <location line="+1"/>
         <source>When are you coming back?</source>
         <comment>message template</comment>
         <translation type="obsolete">いつ戻りますか?</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="101"/>
+        <location line="+1"/>
         <source>I&apos;ll be there soon</source>
         <comment>message template</comment>
         <translation type="obsolete">もうすぐ着きます</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="102"/>
+        <location line="+1"/>
         <source>Are you ready yet?</source>
         <comment>message template</comment>
         <translation type="obsolete">まだですか?</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="103"/>
+        <location line="+1"/>
         <source>You&apos;re late</source>
         <comment>message template</comment>
         <translation type="obsolete">遅い</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="104"/>
+        <location line="+1"/>
         <source>You&apos;re very late!</source>
         <comment>message template</comment>
         <translation type="obsolete">すごい遅い!</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="105"/>
+        <location line="+1"/>
         <source>Please call me</source>
         <comment>message template</comment>
         <translation type="obsolete">電話してください</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="106"/>
+        <location line="+1"/>
         <source>Please call me ASAP</source>
         <comment>message template</comment>
         <translation type="obsolete">至急、電話ください</translation>
     </message>
     <message>
-        <location filename="templatetext.cpp" line="107"/>
+        <location line="+1"/>
         <source>Please call me Now!</source>
         <comment>message template</comment>
         <translation type="obsolete">今すぐ電話ください!</translation>
@@ -4360,47 +4390,47 @@ NO mail has been sent.</source>
 <context>
     <name>ViewAtt</name>
     <message>
-        <location filename="viewatt.cpp" line="32"/>
+        <location filename="viewatt.cpp" line="+32"/>
         <source>Attachments</source>
         <translation>添付</translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="46"/>
+        <location line="+14"/>
         <source>Attachment</source>
         <translation>添付</translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="47"/>
+        <location line="+1"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471174"/>
         <source>&lt;p&gt;Check the attachments which you want to be visible in the Documents tab</source>
         <translation type="obsolete">&lt;p&gt;ドキュメントタブに表示させたい添付をチェックする</translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="101"/>
+        <location line="-7471120"/>
         <source>&lt;p&gt;These are the attachments in this mail</source>
         <translation>&lt;p&gt;このメールの添付です</translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="95"/>
+        <location line="-6"/>
         <source>&lt;p&gt;Check attachments to add to Documents</source>
         <translation>&lt;p&gt;ドキュメントに追加する添付をチェックします</translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="197"/>
+        <location line="+102"/>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="200"/>
+        <location line="+3"/>
         <source>Storage for documents is full.&lt;br&gt;&lt;br&gt;Some attachments could not be saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="viewatt.cpp" line="201"/>
+        <location line="+1"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -4408,119 +4438,119 @@ NO mail has been sent.</source>
 <context>
     <name>WriteMail</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471020"/>
         <source>Write mail</source>
         <translation type="obsolete">メールの作成</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>&amp;Mail</source>
         <translation type="obsolete">(&amp;M)メール</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>&amp;Fields</source>
         <translation type="obsolete">(&amp;F)フィールド</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="619"/>
+        <location filename="writemail.cpp" line="+619"/>
         <source>Send</source>
         <translation type="obsolete">送信</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="223"/>
+        <location line="-396"/>
         <source>Add this mail to the queue of outgoing mails.  All enqueued mails are stored in the outbox.</source>
         <translation type="obsolete">送信メールのキューにこのメールを追加します。エンキューされたメールはすべて送信ボックスに保存されます。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470998"/>
         <source>Store in drafts</source>
         <translation type="obsolete">下書きに保存</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="70"/>
+        <location line="-7471151"/>
         <source>Save this message as a draft.</source>
         <translation>このメッセージを下書きとして保存します。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471151"/>
         <source>Discard changes</source>
         <translation type="obsolete">変更を破棄</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Discard any changes made to this mail.</source>
         <translation type="obsolete">このメールの変更をすべて破棄します。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach file</source>
         <translation type="obsolete">ファイルを添付</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Attach a document to this mail.</source>
         <translation type="obsolete">このメールにドキュメントを添付します。</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Hide all</source>
         <translation type="obsolete">すべて隠す</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Toggle display of the header fields.  Use this option if you want to increase the view of the body text</source>
         <translation type="obsolete">ヘッダーフィールドの表示を切り替えます。本文テキストの表示部分を大きくしたい場合にこのオプションを使用します</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>CC field</source>
         <translation type="obsolete">CCフィールド</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>BCC field</source>
         <translation type="obsolete">BCCフィールド</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>From field</source>
         <translation type="obsolete">差出人フィールド</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Incorrect recipient separator</source>
         <translation type="obsolete">受信者セパレータが正しくありません</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="118"/>
+        <location line="-7471103"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7471103"/>
         <source>(no subject)</source>
         <translation type="obsolete">(件名なし）</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Show selected</source>
         <translation type="obsolete">選択部分を表示</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Recipients must be separated by ,
 and be valid email addresses</source>
         <translation type="obsolete">複数の受信者は「 ,」で区切り、
 有効なアドレスを使用してください</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>Out of Space</source>
         <translation type="obsolete">空き容量が足りません</translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>The memory is very low.
 Please shorten this message
 or cancel this message.
@@ -4531,198 +4561,198 @@ or cancel this message.
 </translation>
     </message>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+0"/>
         <source>&lt;qt&gt;The memory is very low. Please shorten this message or cancel this message.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;メモリが残りわずかです。このメッセージを短くするか、取り消しを行なってください。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="167"/>
+        <location line="-7471054"/>
         <source>Write Mail</source>
         <translation type="obsolete">メールの作成</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="68"/>
+        <location line="-99"/>
         <source>Save in drafts</source>
         <translation>下書きに保存</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="260"/>
+        <location line="+192"/>
         <source>Previous</source>
         <translation type="obsolete">前のメール</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="217"/>
+        <location line="-43"/>
         <source>&amp;Message</source>
         <translation type="obsolete">(&amp;M)メッセージ</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="219"/>
+        <location line="+2"/>
         <source>&amp;Options</source>
         <translation type="obsolete">(&amp;O)オプション</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="226"/>
+        <location line="+7"/>
         <source>Attachments</source>
         <translation type="obsolete">添付</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="235"/>
+        <location line="+9"/>
         <source>Show CC</source>
         <translation type="obsolete">CC を表示</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="240"/>
+        <location line="+5"/>
         <source>Show BCC</source>
         <translation type="obsolete">BCC を表示</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="245"/>
+        <location line="+5"/>
         <source>Show From</source>
         <translation type="obsolete">差出人を表示</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="252"/>
+        <location line="+7"/>
         <source>Word Wrap</source>
         <translation type="obsolete">ワードラップ</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="615"/>
+        <location line="+363"/>
         <source>Write Message</source>
         <translation type="obsolete">メッセージの作成</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="621"/>
+        <location line="+6"/>
         <source>Draft</source>
         <translation type="obsolete">下書き</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="162"/>
+        <location line="-459"/>
         <source>Save to drafts</source>
         <translation>下書きに保存</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="163"/>
+        <location line="+1"/>
         <source>Do you wish to save the message to drafts?</source>
         <translation>下書きにメッセージを保存しますか?</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="218"/>
+        <location line="+55"/>
         <source>Yes</source>
         <translation type="obsolete">はい</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="218"/>
+        <location line="+0"/>
         <source>No</source>
         <translation type="obsolete">いいえ</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="716"/>
+        <location line="+498"/>
         <source>Select Type</source>
         <translation type="obsolete">タイプを選択</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="187"/>
+        <location line="-529"/>
         <source>Create</source>
         <translation type="obsolete">作成</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="611"/>
+        <location line="+424"/>
         <source>Details</source>
         <translation type="obsolete">詳細</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="73"/>
+        <location line="-538"/>
         <source>Cancel</source>
         <translation>取り消し</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="181"/>
+        <location line="+108"/>
         <source>Discard</source>
         <translation type="obsolete">破棄</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="147"/>
+        <location line="-34"/>
         <source>Incomplete message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="187"/>
+        <location line="+40"/>
         <source>Forward</source>
         <translation type="obsolete">転送</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="190"/>
+        <location line="+3"/>
         <source>Reply</source>
         <translation type="obsolete">返信</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="192"/>
+        <location line="+2"/>
         <source>Reply to all</source>
         <translation type="obsolete">全員へ返信</translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="348"/>
+        <location line="+156"/>
         <source>Select type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="109"/>
+        <location line="-239"/>
         <source>Large attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="116"/>
+        <location line="+7"/>
         <source>Message saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="117"/>
+        <location line="+1"/>
         <source>The message has been saved in the Drafts folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="110"/>
+        <location line="-7"/>
         <source>The message has large attachments. Send now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="140"/>
+        <location line="+30"/>
         <source>Empty message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="141"/>
+        <location line="+1"/>
         <source>The message is currently empty. Do you wish to send an empty message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="148"/>
+        <location line="+7"/>
         <source>The message cannot be sent until at least one recipient has been entered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="406"/>
+        <location line="+258"/>
         <source>No accounts configured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="331"/>
+        <location line="-75"/>
         <source>No accounts are configured to send messages with. Do you wish to configure one now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="407"/>
+        <location line="+76"/>
         <source>No accounts are configured to send %1.
 Do you wish to configure one now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="586"/>
+        <location line="+179"/>
         <source>No type selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="writemail.cpp" line="587"/>
+        <location line="+1"/>
         <source>Please select a message type to compose.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4730,69 +4760,474 @@ Do you wish to configure one now?</source>
 <context>
     <name>WriteMailBase</name>
     <message>
-        <location filename="" line="7471221"/>
+        <location line="+7470634"/>
         <source>Write Mail</source>
         <translation type="obsolete">メールの作成</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="160"/>
+        <location filename="writemailbase.ui" line="+160"/>
         <source>Enter the body text here.</source>
         <translation type="obsolete">ここに本文テキストを入力します。</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="36"/>
+        <location line="-124"/>
         <source>To</source>
         <translation type="obsolete">宛先</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="43"/>
+        <location line="+7"/>
         <source>CC</source>
         <translation type="obsolete">CC</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="50"/>
+        <location line="+7"/>
         <source>Subject</source>
         <translation type="obsolete">件名</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="60"/>
+        <location line="+10"/>
         <source>From</source>
         <translation type="obsolete">差出人</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="70"/>
+        <location line="+10"/>
         <source>BCC</source>
         <translation type="obsolete">BCC</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="138"/>
+        <location line="+68"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="90"/>
+        <location line="-48"/>
         <source>Select recipients from the addressbook.</source>
         <translation type="obsolete">住所録から受信者を選択します。</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="106"/>
+        <location line="+16"/>
         <source>Select the from address used for this mail.</source>
         <translation type="obsolete">このメールに使用された差出人のアドレスを選択します。</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="122"/>
+        <location line="+16"/>
         <source>Select blind carbon copies from the addressbook.</source>
         <translation type="obsolete">住所録から BCC (blind carbon copy) を選択します。</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="135"/>
+        <location line="+13"/>
         <source>Select carbon copies from the addressbook.</source>
         <translation type="obsolete">住所録から CC (carbon copy) を選択します。</translation>
     </message>
     <message>
-        <location filename="writemailbase.ui" line="16"/>
+        <location line="-119"/>
         <source>Form1</source>
         <translation type="obsolete">フォーム 1</translation>
     </message>
 </context>
+<context>
+    <name>EmailComposerInterface</name>
+    <message numerus="yes">
+        <location filename="emailcomposer.cpp" line="+131"/>
+        <source>%n Attachment(s): %1KB</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>No documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>There are no existing documents to attach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+235"/>
+        <source>Fwd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fw</source>
+        <comment>2 letter short version of Fwd for forward</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+139"/>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reply to all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="deskphone_emailcomposer.cpp" line="+321"/>
+        <source>(no subject)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+204"/>
+        <source>Select Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Subject</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AttachmentOptions</name>
+    <message>
+        <location filename="attachmentoptions.cpp" line="-68"/>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Add to documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Document has been deleted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Already added to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No viewer available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>No application associated with file of type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unable to create temporary file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unknown file type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Added to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Unable to save attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please ensure that there is space available for Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Browser</name>
+    <message>
+        <location filename="browser.cpp" line="+280"/>
+        <source>Message part is not displayable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Subject</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>CC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>BCC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Reply-To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Awaiting download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Size of message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Download this message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Play MMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>No displayable part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Message contains vCard describing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Message contains vCard describing a contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Message contains vCard describing multiple contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Message deleted from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericViewer</name>
+    <message>
+        <location filename="genericviewer.cpp" line="+71"/>
+        <source>From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reply</source>
+        <comment>Reply to selected msg</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete</source>
+        <comment>Delete selected msg</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Plain text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Display the message contents in Plain text format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rich text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Display the message contents in Rich text format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Print the message contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+241"/>
+        <source>Dial %1</source>
+        <comment>%1=number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Message %1</source>
+        <comment>%1=number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>View %1</source>
+        <comment>%1=contact label</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save %1</source>
+        <comment>%1=number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageDisplay</name>
+    <message>
+        <location filename="attachmentoptions.cpp" line="-447"/>
+        <source>Size to fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Actual size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom to fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RecipientsDialog</name>
+    <message>
+        <location filename="genericviewer.cpp" line="-293"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TextDisplay</name>
+    <message>
+        <location filename="attachmentoptions.cpp" line="-70"/>
+        <source>Wrap text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
author	Robin Burchell <robin.burchell@jollamobile.com>	2014-01-21 10:19:19 +0100
committer	Robin Burchell <robin+qt@viroteck.net>	2014-01-24 10:21:25 +0100
commit	daa2a0ad8092b3552db8a81a1d076b5a9de84d61 (patch)
tree	f21abebcba59873906a225a5f6a0803013c56b06 /examples/qtmail/app/qtmail-ja.ts
parent	1d48985c25e4dbf700d65da5761dc2859b5c6cfc (diff)