Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'translations/client_ja.ts')
-rw-r--r--translations/client_ja.ts1128
1 files changed, 586 insertions, 542 deletions
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 61bb075bf..201ed4b2c 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -87,22 +87,45 @@
<translation>フォーム</translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.ui" line="58"/>
+ <location filename="../src/gui/notificationwidget.ui" line="73"/>
<source>Lorem ipsum dolor sit amet</source>
<translation>Lorem ipsum dolor sit amet</translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.ui" line="71"/>
+ <location filename="../src/gui/notificationwidget.ui" line="86"/>
<source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
<translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.ui" line="91"/>
+ <location filename="../src/gui/notificationwidget.ui" line="106"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
</context>
<context>
+ <name>OCC::AboutDialog</name>
+ <message>
+ <location filename="../src/gui/aboutdialog.ui" line="24"/>
+ <source>About</source>
+ <translation>バージョン情報</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/aboutdialog.ui" line="88"/>
+ <source>TextLabel</source>
+ <translation>テキストラベル</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/aboutdialog.ui" line="96"/>
+ <source>Versions</source>
+ <translation>バージョン</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/aboutdialog.cpp" line="28"/>
+ <source>About %1</source>
+ <translation>%1 について</translation>
+ </message>
+</context>
+<context>
<name>OCC::AbstractNetworkJob</name>
<message>
<location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/>
@@ -121,6 +144,14 @@
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="121"/>
+ <source>%1@%2</source>
+ <translation>%1@%2</translation>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -169,9 +200,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="269"/>
- <location filename="../src/gui/accountsettings.cpp" line="512"/>
- <location filename="../src/gui/accountsettings.cpp" line="625"/>
- <location filename="../src/gui/accountsettings.cpp" line="1083"/>
+ <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="611"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1048"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -181,87 +212,67 @@
<translation>&lt;server&gt; に &lt;user&gt; で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="182"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="200"/>
- <source>Add new</source>
- <translation>新規追加</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="203"/>
<source>Remove</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="213"/>
+ <location filename="../src/gui/accountsettings.cpp" line="207"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="297"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="316"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Force sync now</source>
<translation>今すぐ強制的に同期</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="318"/>
+ <location filename="../src/gui/accountsettings.cpp" line="305"/>
<source>Restart sync</source>
<translation>同期を再実行</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Remove folder sync connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="356"/>
- <source>Enable virtual file support %1...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="356"/>
- <source>(tech preview)</source>
- <translation>(技術プレビュー)</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="356"/>
- <source>(experimental)</source>
- <translation>(実験的)</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="445"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="434"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ローカルフォルダー &lt;i&gt;%1&lt;/i&gt; を作成できません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="491"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>同期フォルダー接続の削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Remove Folder Sync Connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="616"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="624"/>
+ <location filename="../src/gui/accountsettings.cpp" line="610"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="734"/>
+ <location filename="../src/gui/accountsettings.cpp" line="712"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="735"/>
+ <location filename="../src/gui/accountsettings.cpp" line="713"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>同期作業を実行中です。&lt;br/&gt;終了しますか?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="830"/>
+ <location filename="../src/gui/accountsettings.cpp" line="809"/>
<source>%1 in use</source>
<translation>%1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="836"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>&lt;i&gt;%2&lt;/i&gt; の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="866"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="871"/>
+ <location filename="../src/gui/accountsettings.cpp" line="850"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="874"/>
+ <location filename="../src/gui/accountsettings.cpp" line="853"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>サーバー %1 は現在メンテナンスモードです。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="877"/>
+ <location filename="../src/gui/accountsettings.cpp" line="856"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="866"/>
<source>Connecting to %1...</source>
<translation>%1 に接続中...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="892"/>
+ <location filename="../src/gui/accountsettings.cpp" line="871"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="931"/>
+ <location filename="../src/gui/accountsettings.cpp" line="910"/>
<source>Log in</source>
<translation>ログイン</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1026"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1005"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>大きすぎるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1028"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1007"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1029"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1008"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>大きすぎたか、外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1075"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1041"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1076"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; アカウント &lt;i&gt;%1&lt;/i&gt; を本当に削除しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1082"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1047"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="306"/>
+ <location filename="../src/gui/accountsettings.cpp" line="293"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
- <location filename="../src/gui/accountsettings.cpp" line="933"/>
+ <location filename="../src/gui/accountsettings.cpp" line="199"/>
+ <location filename="../src/gui/accountsettings.cpp" line="912"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="265"/>
+ <location filename="../src/gui/accountsettings.cpp" line="252"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="273"/>
+ <location filename="../src/gui/accountsettings.cpp" line="260"/>
<source>Open folder in browser</source>
<translation>フォルダをブラウザで開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="324"/>
+ <location filename="../src/gui/accountsettings.cpp" line="311"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="324"/>
+ <location filename="../src/gui/accountsettings.cpp" line="311"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="331"/>
+ <location filename="../src/gui/accountsettings.cpp" line="318"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="348"/>
+ <location filename="../src/gui/accountsettings.cpp" line="335"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="505"/>
+ <location filename="../src/gui/accountsettings.cpp" line="343"/>
+ <source>Enable virtual file support%1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="343"/>
+ <source> (experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="817"/>
+ <location filename="../src/gui/accountsettings.cpp" line="796"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="797"/>
<source>%1 of %2 in use</source>
<translation>%2 のうち %1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <location filename="../src/gui/accountsettings.cpp" line="806"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="864"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="884"/>
+ <location filename="../src/gui/accountsettings.cpp" line="863"/>
<source>Obtaining authorization from the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="897"/>
+ <location filename="../src/gui/accountsettings.cpp" line="876"/>
<source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="908"/>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivityItemDelegate</name>
<message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="140"/>
+ <location filename="../src/gui/activityitemdelegate.cpp" line="139"/>
<source>%1 on %2</source>
<translation>%2 中 %1</translation>
</message>
<message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="142"/>
+ <location filename="../src/gui/activityitemdelegate.cpp" line="141"/>
<source>%1 on %2 (disconnected)</source>
<translation>%2 中 %1 (切断しました)</translation>
</message>
@@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="515"/>
- <location filename="../src/gui/activitywidget.cpp" line="563"/>
+ <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>Server Activity</source>
<translation>サーバーアクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="529"/>
<source>Sync Protocol</source>
<translation>同期状況</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="578"/>
<source>Not Synced</source>
<translation>同期対象外</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="574"/>
+ <location filename="../src/gui/activitywidget.cpp" line="581"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>未同期 (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="606"/>
+ <location filename="../src/gui/activitywidget.cpp" line="613"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>サーバーアクティビティリストをクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="610"/>
+ <location filename="../src/gui/activitywidget.cpp" line="617"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="613"/>
+ <location filename="../src/gui/activitywidget.cpp" line="620"/>
<source>The list of unsynced items has been copied to the clipboard.</source>
<translation>同期されていないアイテムのリストがクリップボードにコピーされました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="618"/>
+ <location filename="../src/gui/activitywidget.cpp" line="625"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
@@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source>
<translation>テキストラベル</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="136"/>
+ <location filename="../src/gui/activitywidget.cpp" line="143"/>
<source>Server Activities</source>
<translation>サーバーアクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="92"/>
+ <location filename="../src/gui/activitywidget.cpp" line="99"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="93"/>
+ <location filename="../src/gui/activitywidget.cpp" line="100"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="140"/>
+ <location filename="../src/gui/activitywidget.cpp" line="147"/>
<source>Notifications</source>
<translation>通知</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="358"/>
<source>%n notifications(s) for %1.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <location filename="../src/gui/activitywidget.cpp" line="364"/>
<source>%n notifications(s) for %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="366"/>
<source>New notifications for %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="362"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>Open the activity view for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="145"/>
+ <location filename="../src/gui/activitywidget.cpp" line="152"/>
<source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
<translation>&lt;br/&gt;%1 アカウントは、 アクティビティを有効にしていません。</translation>
</message>
@@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="134"/>
+ <location filename="../src/gui/application.cpp" line="136"/>
<source>Continuing will mean &lt;b&gt;deleting these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="136"/>
+ <location filename="../src/gui/application.cpp" line="138"/>
<source>Continuing will mean &lt;b&gt;ignoring these settings&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="142"/>
+ <location filename="../src/gui/application.cpp" line="144"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="149"/>
+ <location filename="../src/gui/application.cpp" line="151"/>
<source>Quit</source>
<translation>終了</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="150"/>
+ <location filename="../src/gui/application.cpp" line="152"/>
<source>Continue</source>
<translation>続ける</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="299"/>
+ <location filename="../src/gui/application.cpp" line="309"/>
<source>Error accessing the configuration file</source>
<translation>設定ファイルのアクセスでエラーが発生しました</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="300"/>
+ <location filename="../src/gui/application.cpp" line="310"/>
<source>There was an error while accessing the configuration file at %1.</source>
<translation>設定ファイルの %1 行目にアクセスしている時にエラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="303"/>
+ <location filename="../src/gui/application.cpp" line="313"/>
<source>Quit ownCloud</source>
<translation>ownCloudを終了</translation>
</message>
@@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -805,135 +826,135 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="172"/>
+ <location filename="../src/gui/folder.cpp" line="173"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="175"/>
+ <location filename="../src/gui/folder.cpp" line="176"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="178"/>
+ <location filename="../src/gui/folder.cpp" line="179"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="429"/>
+ <location filename="../src/gui/folder.cpp" line="430"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="436"/>
+ <location filename="../src/gui/folder.cpp" line="437"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="443"/>
+ <location filename="../src/gui/folder.cpp" line="444"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="413"/>
+ <location filename="../src/gui/folder.cpp" line="414"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="420"/>
+ <location filename="../src/gui/folder.cpp" line="421"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="422"/>
+ <location filename="../src/gui/folder.cpp" line="423"/>
<source>%1 has been added.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="427"/>
+ <location filename="../src/gui/folder.cpp" line="428"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="434"/>
+ <location filename="../src/gui/folder.cpp" line="435"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="441"/>
+ <location filename="../src/gui/folder.cpp" line="442"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="448"/>
+ <location filename="../src/gui/folder.cpp" line="449"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="450"/>
+ <location filename="../src/gui/folder.cpp" line="451"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="455"/>
+ <location filename="../src/gui/folder.cpp" line="456"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="457"/>
+ <location filename="../src/gui/folder.cpp" line="458"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="463"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="810"/>
+ <location filename="../src/gui/folder.cpp" line="800"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1055"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB より大きな新しいフォルダーが追加されました: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1058"/>
+ <location filename="../src/gui/folder.cpp" line="1048"/>
<source>A folder from an external storage has been added.
</source>
<translation>外部ストレージからフォルダーが追加されました。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1059"/>
+ <location filename="../src/gui/folder.cpp" line="1049"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>このフォルダーをダウンロードするには設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1109"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1133"/>
+ <location filename="../src/gui/folder.cpp" line="1123"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -942,7 +963,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1208"/>
+ <location filename="../src/gui/folder.cpp" line="1197"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -953,7 +974,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
「すべてのファイルを削除」を選択すると、あなたが所有者でない限り、ファイルは使用できなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1213"/>
+ <location filename="../src/gui/folder.cpp" line="1202"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -962,17 +983,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
「ファイルを残す」を選択した場合、ファイルはサーバーから再同期されます。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1217"/>
+ <location filename="../src/gui/folder.cpp" line="1206"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1220"/>
+ <location filename="../src/gui/folder.cpp" line="1210"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1211"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -980,107 +1001,107 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="355"/>
+ <location filename="../src/gui/folderman.cpp" line="357"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="356"/>
+ <location filename="../src/gui/folderman.cpp" line="358"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル &apos;%1&apos; が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1144"/>
+ <location filename="../src/gui/folderman.cpp" line="1146"/>
<source> (backup)</source>
<translation>(バックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1149"/>
+ <location filename="../src/gui/folderman.cpp" line="1151"/>
<source> (backup %1)</source>
<translation>(%1をバックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1327"/>
+ <location filename="../src/gui/folderman.cpp" line="1329"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1330"/>
+ <location filename="../src/gui/folderman.cpp" line="1332"/>
<source>Waiting to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1336"/>
+ <location filename="../src/gui/folderman.cpp" line="1338"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1341"/>
+ <location filename="../src/gui/folderman.cpp" line="1343"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1343"/>
+ <location filename="../src/gui/folderman.cpp" line="1345"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1349"/>
+ <location filename="../src/gui/folderman.cpp" line="1351"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1352"/>
+ <location filename="../src/gui/folderman.cpp" line="1354"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1355"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1361"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1369"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>No valid folder selected!</source>
<translation>有効なフォルダーが選択されていません!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1378"/>
+ <location filename="../src/gui/folderman.cpp" line="1383"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1382"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>The selected path is not a folder!</source>
<translation>指定のパスは、フォルダーではありません!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1386"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>You have no permission to write to the selected folder!</source>
<translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1451"/>
+ <location filename="../src/gui/folderman.cpp" line="1456"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>すでに同期されたフォルダーがあります。別のフォルダーを選択してください!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1431"/>
+ <location filename="../src/gui/folderman.cpp" line="1436"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダーを含んでいます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1437"/>
+ <location filename="../src/gui/folderman.cpp" line="1442"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
</message>
@@ -1088,16 +1109,11 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderStatusDelegate</name>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/>
<source>Add Folder Sync Connection</source>
<translation>同期フォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/>
- <source>Synchronizing with local folder</source>
- <translation>ローカルフォルダーを同期中</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="299"/>
<source>File</source>
<translation>ファイル</translation>
@@ -1148,107 +1164,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>未解決の競合があります。クリックで詳細。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="279"/>
+ <source>Synchronizing VirtualFiles with local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="281"/>
+ <source>Synchronizing with local folder</source>
+ <translation>ローカルフォルダーを同期中</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="914"/>
<source>Reconciling changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="943"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="946"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="952"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="972"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="978"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="982"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ダウンロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="978"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>↓ %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="988"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="994"/>
<source>↑ %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>アップロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="994"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%4 中 %3 完了)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1015"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>残り%5、%2中%1完了 、ファイル%4個中%3個完了</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1023"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 of %2, ファイル数 %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1030"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/>
<source>file %1 of %2</source>
<translation>%1 / %2 ファイル</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
<source>Waiting...</source>
<translation>待機中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/>
<source>Preparing to sync...</source>
<translation>同期の準備中...</translation>
</message>
@@ -1272,12 +1298,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="574"/>
+ <location filename="../src/gui/folderwizard.cpp" line="576"/>
<source>Add Folder Sync Connection</source>
<translation>同期フォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="576"/>
+ <location filename="../src/gui/folderwizard.cpp" line="578"/>
<source>Add Sync Connection</source>
<translation>同期接続を追加</translation>
</message>
@@ -1285,17 +1311,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardLocalPath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="68"/>
+ <location filename="../src/gui/folderwizard.cpp" line="69"/>
<source>Click to select a local folder to sync.</source>
<translation>同期したいローカルフォルダーをクリックしてください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="75"/>
+ <location filename="../src/gui/folderwizard.cpp" line="76"/>
<source>Enter the path to the local folder.</source>
<translation>ローカルフォルダーのパスを入力してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="136"/>
+ <location filename="../src/gui/folderwizard.cpp" line="137"/>
<source>Select the source folder</source>
<translation>ソースフォルダーを選択</translation>
</message>
@@ -1303,52 +1329,52 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
+ <location filename="../src/gui/folderwizard.cpp" line="185"/>
<source>Create Remote Folder</source>
<translation>リモートフォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="185"/>
+ <location filename="../src/gui/folderwizard.cpp" line="186"/>
<source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
<translation> &apos;%1&apos;の下に新しいフォルダーの名前を入力:</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="215"/>
+ <location filename="../src/gui/folderwizard.cpp" line="216"/>
<source>Folder was successfully created on %1.</source>
<translation>%1 にフォルダーが作成されました。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="226"/>
+ <location filename="../src/gui/folderwizard.cpp" line="227"/>
<source>Authentication failed accessing %1</source>
<translation>%1 アクセス中に認証に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="228"/>
+ <location filename="../src/gui/folderwizard.cpp" line="229"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="237"/>
+ <location filename="../src/gui/folderwizard.cpp" line="247"/>
<source>Failed to list a folder. Error: %1</source>
<translation>フォルダーをリストアップできません。エラー: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="318"/>
+ <location filename="../src/gui/folderwizard.cpp" line="328"/>
<source>Choose this to sync the entire account</source>
<translation>アカウント全体を同期する場合はこちらを選択</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="445"/>
+ <location filename="../src/gui/folderwizard.cpp" line="440"/>
<source>This folder is already being synced.</source>
<translation>このフォルダーはすでに同期されています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="447"/>
+ <location filename="../src/gui/folderwizard.cpp" line="442"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%1&lt;/i&gt;は、&lt;i&gt;%2&lt;/i&gt;の親フォルダーですでに同期しています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="444"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1356,30 +1382,30 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="488"/>
- <source>Use virtual files instead of downloading content immediately %1</source>
+ <location filename="../src/gui/folderwizard.cpp" line="485"/>
+ <source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="489"/>
- <source>(tech preview)</source>
- <translation>(技術プレビュー)</translation>
+ <location filename="../src/gui/folderwizard.cpp" line="485"/>
+ <source> (experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="489"/>
- <source>(experimental)</source>
- <translation>(実験的)</translation>
+ <location filename="../src/gui/folderwizard.cpp" line="519"/>
+ <source>Virtual files are not available for the selected folder</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::FormatWarningsWizardPage</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="49"/>
+ <location filename="../src/gui/folderwizard.cpp" line="50"/>
<source>&lt;b&gt;Warning:&lt;/b&gt; %1</source>
<translation>&lt;b&gt;警告:&lt;/b&gt; %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="51"/>
+ <location filename="../src/gui/folderwizard.cpp" line="52"/>
<source>&lt;b&gt;Warning:&lt;/b&gt;</source>
<translation>&lt;b&gt;警告:&lt;/b&gt; </translation>
</message>
@@ -1428,48 +1454,73 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>一般設定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="55"/>
- <source>For System Tray</source>
- <translation>システムトレイ</translation>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Sync hidden files</source>
+ <translation>隠しファイルを同期</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <source>Log Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="184"/>
+ <location filename="../src/gui/generalsettings.ui" line="136"/>
+ <source>Advanced - Approval of folder sync (Non virtual file mode only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="196"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="257"/>
+ <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <source>Updates</source>
+ <translation>アップデート</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="237"/>
<source>stable</source>
<translation>安定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="262"/>
+ <location filename="../src/gui/generalsettings.ui" line="242"/>
<source>beta</source>
<translation>ベータ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="68"/>
+ <location filename="../src/gui/generalsettings.ui" line="337"/>
+ <source>About</source>
+ <translation>バージョン情報</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="65"/>
<source>Advanced</source>
<translation>詳細設定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="100"/>
+ <location filename="../src/gui/generalsettings.ui" line="41"/>
+ <source>Use &amp;Monochrome Icons in the system tray</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="144"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation>指定された容量以上のフォルダーは同期前に確認する</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="120"/>
+ <location filename="../src/gui/generalsettings.ui" line="164"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="144"/>
+ <location filename="../src/gui/generalsettings.ui" line="186"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation>外部ストレージと同期する前に確認する</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="41"/>
+ <location filename="../src/gui/generalsettings.ui" line="55"/>
<source>&amp;Launch on System Startup</source>
<translation>システム開始時に起動(&amp;L)</translation>
</message>
@@ -1479,69 +1530,54 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>デスクトップに通知を表示(&amp;D)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="58"/>
- <source>Use &amp;Monochrome Icons</source>
- <translation>モノクロアイコンを使用(&amp;M)</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="213"/>
- <source>Version</source>
- <translation>バージョン</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="240"/>
+ <location filename="../src/gui/generalsettings.ui" line="220"/>
<source>&amp;Update Channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="346"/>
- <source>•</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="76"/>
+ <location filename="../src/gui/generalsettings.ui" line="102"/>
<source>Edit &amp;Ignored Files</source>
<translation>除外ファイルリストを編集(&amp;I)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="155"/>
+ <location filename="../src/gui/generalsettings.ui" line="73"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="93"/>
<source>S&amp;how crash reporter</source>
<translation>クラッシュ報告を表示(&amp;H)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="289"/>
+ <location filename="../src/gui/generalsettings.ui" line="269"/>
<source>&amp;Restart &amp;&amp; Update</source>
<translation>再起動してアップデート(&amp;R)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="266"/>
+ <location filename="../src/gui/generalsettings.cpp" line="280"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="176"/>
+ <location filename="../src/gui/generalsettings.cpp" line="190"/>
<source>Change update channel?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="177"/>
+ <location filename="../src/gui/generalsettings.cpp" line="191"/>
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly.
Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="190"/>
+ <location filename="../src/gui/generalsettings.cpp" line="204"/>
<source>Change update channel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="191"/>
+ <location filename="../src/gui/generalsettings.cpp" line="205"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -1578,63 +1614,53 @@ Note that this selects only what pool upgrades are taken from, and that there ar
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="20"/>
- <source>Global Ignore Settings</source>
- <translation>全体的な除外設定</translation>
- </message>
- <message>
- <location filename="../src/gui/ignorelisteditor.ui" line="26"/>
- <source>Sync hidden files</source>
- <translation>隠しファイルを同期</translation>
- </message>
- <message>
- <location filename="../src/gui/ignorelisteditor.ui" line="36"/>
<source>Files Ignored by Patterns</source>
<translation>パターンによって除外するファイル</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.ui" line="75"/>
+ <location filename="../src/gui/ignorelisteditor.ui" line="59"/>
<source>Add</source>
<translation>追加</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.ui" line="57"/>
+ <location filename="../src/gui/ignorelisteditor.ui" line="41"/>
<source>Pattern</source>
<translation>パターン</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.ui" line="62"/>
+ <location filename="../src/gui/ignorelisteditor.ui" line="46"/>
<source>Allow Deletion</source>
<translation>削除を許可</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.ui" line="85"/>
+ <location filename="../src/gui/ignorelisteditor.ui" line="69"/>
<source>Remove</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.ui" line="121"/>
+ <location filename="../src/gui/ignorelisteditor.ui" line="105"/>
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="119"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="112"/>
<source>Could not open file</source>
<translation>ファイルが開けませんでした</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="120"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="113"/>
<source>Cannot write changes to &apos;%1&apos;.</source>
<translation>&apos;%1&apos;を更新できません。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="146"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="132"/>
<source>Add Ignore Pattern</source>
<translation>除外するファイルパターンを追加</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="147"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
<source>Add a new ignore pattern:</source>
<translation>除外するファイルパターンを新しく追加:</translation>
</message>
@@ -1735,35 +1761,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<context>
<name>OCC::LogBrowser</name>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="46"/>
+ <location filename="../src/gui/logbrowser.ui" line="14"/>
<source>Log Output</source>
<translation>ログ出力</translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="52"/>
+ <location filename="../src/gui/logbrowser.ui" line="116"/>
+ <source>Enable logging to temporary folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/logbrowser.cpp" line="61"/>
+ <source>Delete logs older than %1 hours</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/logbrowser.ui" line="53"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;The logs contain sensitive information which you should not make publicly available&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/logbrowser.ui" line="71"/>
<source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems.
-Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.
-If enabled, logs will be written to %1</source>
+Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="66"/>
- <source>Enable logging to temporary folder</source>
+ <location filename="../src/gui/logbrowser.ui" line="84"/>
+ <source>If enabled, logs will be written to:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="72"/>
- <source>Delete logs older than %1 hours</source>
+ <location filename="../src/gui/logbrowser.ui" line="91"/>
+ <source>C:/log</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/logbrowser.ui" line="123"/>
+ <source>Log Http traffic </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="78"/>
+ <location filename="../src/gui/logbrowser.ui" line="143"/>
<source>These settings persist across client restarts.
Note that using any logging command line options will override the settings.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="85"/>
+ <location filename="../src/gui/logbrowser.ui" line="154"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
@@ -1771,12 +1816,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="186"/>
+ <location filename="../src/libsync/logger.cpp" line="177"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="187"/>
+ <location filename="../src/libsync/logger.cpp" line="178"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;ファイル &apos;%1&apos;&lt;br/&gt;を書き込み用で開けませんでした。&lt;br/&gt;&lt;br/&gt;ログ出力を&lt;b&gt;保存できません&lt;/b&gt;でした!&lt;/nobr&gt;</translation>
</message>
@@ -1951,23 +1996,23 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NotificationWidget</name>
<message>
- <location filename="../src/gui/notificationwidget.cpp" line="65"/>
+ <location filename="../src/gui/notificationwidget.cpp" line="59"/>
<source>Created at %1</source>
<translation>%1 を作成しました。</translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.cpp" line="78"/>
+ <location filename="../src/gui/notificationwidget.cpp" line="72"/>
<source>Closing in a few seconds...</source>
<translation>数秒以内に接続を終了します。</translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.cpp" line="125"/>
+ <location filename="../src/gui/notificationwidget.cpp" line="119"/>
<source>%1 request failed at %2</source>
<extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
<translation>リクエスト %1 が %2 に失敗 </translation>
</message>
<message>
- <location filename="../src/gui/notificationwidget.cpp" line="131"/>
+ <location filename="../src/gui/notificationwidget.cpp" line="125"/>
<source>&apos;%1&apos; selected at %2</source>
<extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
<translation>&apos;%1&apos; が %2 に選択されました</translation>
@@ -1976,68 +2021,73 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="134"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="127"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>サーバからエラーが返されました: &lt;em&gt;%1&lt;/em&gt; </translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="137"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="130"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="141"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="134"/>
<source>Empty JSON from OAuth2 redirect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="146"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="139"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="149"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="142"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="151"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="144"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="153"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="146"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="291"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="170"/>
+ <source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
<source> Error: Missing field %1
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="157"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="150"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;ログインエラー&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt; </translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="202"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="205"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="209"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="201"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="204"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="208"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="214"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="213"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="235"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="234"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;ユーザの誤りです&lt;/h1&gt;&lt;p&gt;&lt;em&gt;%1&lt;/em&gt;としてログインされましたがm、&lt;em&gt;%2&lt;/em&gt;でなければいけません。&lt;br&gt;別のタブで %3 からログアウトし、&lt;a href=&apos;%4&apos;&gt;ここをクリック&lt;/a&gt;して %2 としてログインしてください&lt;/p&gt; </translation>
</message>
@@ -2104,58 +2154,58 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/>
<source>Connect to %1</source>
<translation>%1 に接続中</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/>
<source>Setup local folder options</source>
<translation>ローカルフォルダーのオプションを設定</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/>
<source>Connect...</source>
<translation>接続...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="85"/>
- <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/>
+ <source> (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/>
- <source>(tech preview)</source>
- <translation>(技術プレビュー)</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/>
- <source>(experimental)</source>
- <translation>(実験的)</translation>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/>
+ <source>Use &amp;virtual files instead of downloading content immediately%1</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="178"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 フォルダー &apos;%2&apos; はローカルフォルダー &apos;%3&apos; と同期しています</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>&apos;%1&apos; フォルダーを同期</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告:&lt;/strong&gt; ローカルフォルダーは空ではありません。解決方法を選択してください!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/>
+ <source>Virtual files are not available for the selected folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/>
<source>Local Sync Folder</source>
<translation>ローカル同期フォルダー</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="350"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2232,38 +2282,38 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/>
<source>Connect to %1</source>
<translation>%1 に接続中</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/>
<source>Setup %1 server</source>
<translation>%1 サーバーを設定</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>このURLは暗号化されていないため安全ではありません。利用はお勧めしません。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/>
<source>This url is secure. You can use it.</source>
<translation>このURLは安全です。利用可能です。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/>
<source>&amp;Next &gt;</source>
<translation>次(&amp;N) &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/>
<source>Invalid URL</source>
<translation>無効なURL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2271,144 +2321,144 @@ It is not advisable to use it.</source>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/>
<source>&lt;font color=&quot;green&quot;&gt;Successfully connected to %1: %2 version %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;正常に %1 へ接続されました:%2 バージョン %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>%2 の %1 に接続に失敗:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>%2 の %1 へ接続を試みた際にタイムアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 の %1 へ接続を試みています...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>サーバーへの認証リクエストは &apos;%1&apos; へリダイレクトされました。URLは不正です、サーバーの設定に誤りがあります。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>認証された WebDav リクエストに不正な応答がありました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>サーバーによってアクセスが拒否されています。適切なアクセス権があるか検証するには、&lt;a href=&quot;%1&quot;&gt;ここをクリック&lt;/a&gt;してブラウザーでサービスにアクセスしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
<source>Invalid URL</source>
<translation>無効なURL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/>
<source>Creating local sync folder %1...</source>
<translation>ローカル同期フォルダー %1 を作成中...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/>
<source>failed.</source>
<translation>失敗。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
<source>Could not create local folder %1</source>
<translation>ローカルフォルダー %1 を作成できませんでした</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/>
<source>No remote folder specified!</source>
<translation>リモートフォルダーが指定されていません!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/>
<source>Error: %1</source>
<translation>エラー: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud上にフォルダーを作成中: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/>
<source>Remote folder %1 created successfully.</source>
<translation>リモートフォルダー %1 は正常に生成されました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました!&lt;br/&gt;前に戻って資格情報を確認してください。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。&lt;/font&gt;&lt;br/&gt;前に戻り、資格情報をチェックしてください。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>リモートフォルダー %1 の作成がエラーで失敗しました。&lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
<source>Successfully connected to %1!</source>
<translation>%1への接続に成功しました!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/>
<source>Folder rename failed</source>
<translation>フォルダー名の変更に失敗しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;ローカルの同期フォルダー %1 は正常に作成されました!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2416,44 +2466,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/>
<source>%1 Connection Wizard</source>
<translation>%1 接続ウィザード</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/>
- <source>Enable technical preview feature?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/>
- <source>Enable virtual files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Continue to use selective sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/>
<source>Enable experimental feature?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/>
<source>Enable experimental placeholder mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2464,7 +2492,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="281"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2593,12 +2621,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1246"/>
+ <location filename="../src/libsync/discovery.cpp" line="1244"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1259"/>
+ <location filename="../src/libsync/discovery.cpp" line="1257"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
@@ -2618,17 +2646,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1223"/>
+ <location filename="../src/libsync/discovery.cpp" line="1222"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1368"/>
+ <location filename="../src/libsync/discovery.cpp" line="1367"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1429"/>
+ <location filename="../src/libsync/discovery.cpp" line="1428"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2636,7 +2664,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -2706,22 +2734,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="147"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
<source>could not delete file %1, error: %2</source>
<translation>ファイル %1 を削除できません。エラー: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>注意: %1 で大文字小文字が競合している可能性</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="168"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
<source>could not create folder %1</source>
<translation>フォルダー %1 を作成できません</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="179"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -2729,7 +2757,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="100"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation>
</message>
@@ -2737,18 +2765,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="217"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="249"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="248"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
@@ -2827,7 +2855,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="663"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="677"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -2868,12 +2896,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUploadFileTUS</name>
<message>
- <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/>
+ <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/>
+ <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
@@ -3045,28 +3073,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="196"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="187"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="128"/>
- <location filename="../src/gui/settingsdialog.cpp" line="131"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="176"/>
+ <source>Add account</source>
+ <translation>アカウントを追加</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="210"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="132"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="211"/>
<source>Are you sure you want to quit %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="254"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="342"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
@@ -3104,42 +3137,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>OwnCloudのパス:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="108"/>
+ <location filename="../src/gui/sharedialog.cpp" line="110"/>
<source>%1 Sharing</source>
<translation>%1 を共有中</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="86"/>
+ <location filename="../src/gui/sharedialog.cpp" line="88"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="105"/>
+ <location filename="../src/gui/sharedialog.cpp" line="107"/>
<source>Folder: %2</source>
<translation>フォルダー: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="111"/>
+ <location filename="../src/gui/sharedialog.cpp" line="113"/>
<source>The server does not allow sharing</source>
<translation>サーバーで共有を許可していません</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="127"/>
+ <location filename="../src/gui/sharedialog.cpp" line="129"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>サーバーから共有権限を取得できる最大数で取得しています</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="197"/>
+ <location filename="../src/gui/sharedialog.cpp" line="202"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="211"/>
+ <location filename="../src/gui/sharedialog.cpp" line="216"/>
<source>Users and Groups</source>
<translation>ユーザーとグループ</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="218"/>
+ <location filename="../src/gui/sharedialog.cpp" line="223"/>
<source>Public Links</source>
<translation>公開リンク</translation>
</message>
@@ -3334,32 +3367,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="210"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/>
<source>The item is not shared with any users or groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/>
<source>Open link in browser</source>
<translation>ブラウザでリンクを開く</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/>
<source>Copy link to clipboard</source>
<translation>クリップボードにリンクをコピー</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/>
<source>Send link by email</source>
<translation>メールでリンクを送信</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/>
<source>No results for &apos;%1&apos;</source>
<translation>&apos;%1&apos; は見つかりませんでした</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
@@ -3393,17 +3426,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>…</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/>
<source>create</source>
<translation>作成</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/>
<source>change</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/>
+ <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/>
<source>delete</source>
<translation>削除</translation>
</message>
@@ -3770,17 +3803,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1024"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1035"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1042"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
@@ -3795,27 +3828,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="503"/>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="510"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="546"/>
+ <location filename="../src/libsync/syncengine.cpp" line="541"/>
<source>Unable to read from the sync journal.</source>
<translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="630"/>
+ <location filename="../src/libsync/syncengine.cpp" line="625"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1007"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1018"/>
<source>Aborted</source>
<translation>中止しました</translation>
</message>
@@ -3831,20 +3864,10 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="341"/>
- <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;https://%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For known issues and help, please visit: &lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.&lt;/small&gt;&lt;/p&gt;</source>
+ <location filename="../src/libsync/theme.cpp" line="382"/>
+ <source>&lt;p&gt;Version %1. For more information visit &lt;a href=&quot;%2&quot;&gt;https://%3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For known issues and help, please visit: &lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.&lt;/p&gt;&lt;p&gt;&lt;small&gt;%6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/theme.cpp" line="348"/>
- <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
- <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
- </message>
- <message>
- <location filename="../src/libsync/theme.cpp" line="349"/>
- <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
- <translation>&lt;p&gt;%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。&lt;br/&gt;%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。&lt;/p&gt;</translation>
- </message>
</context>
<context>
<name>OCC::ValidateChecksumHeader</name>
@@ -3865,245 +3888,252 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>OCC::Vfs</name>
+ <message>
+ <location filename="../src/common/vfs.cpp" line="72"/>
+ <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="267"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="258"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="313"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="304"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>There are no sync folders configured.</source>
<translation>同期するフォルダーがありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="389"/>
- <location filename="../src/gui/owncloudgui.cpp" line="712"/>
- <location filename="../src/gui/owncloudgui.cpp" line="806"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="703"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="797"/>
<source>Log in...</source>
<translation>ログイン...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <location filename="../src/gui/owncloudgui.cpp" line="808"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="695"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="799"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="499"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="490"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="358"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="361"/>
<source>Open folder &apos;%1&apos;</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="199"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="190"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="789"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="780"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="791"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="782"/>
<source>Settings...</source>
<translation>設定...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="793"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="784"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="794"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected from %1</source>
<translation>%1 から切断されました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="198"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="189"/>
<source>Unsupported Server Version</source>
<translation>サポートされていないサーバーバージョン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="238"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="229"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="240"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="231"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="251"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="242"/>
<source>Disconnected from accounts:</source>
<translation>アカウントから切断:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="253"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="244"/>
<source>Account %1: %2</source>
<translation>アカウント %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="268"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="259"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="272"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="263"/>
<source>Account synchronization is disabled</source>
<translation>アカウントの同期は無効になっています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="273"/>
- <location filename="../src/gui/owncloudgui.cpp" line="326"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="317"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="321"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="312"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="328"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="319"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="378"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
<source>Unpause all folders</source>
<translation>すべてのフォルダーの同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="374"/>
<source>Pause all folders</source>
<translation>すべてのフォルダーの同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="683"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="674"/>
<source>Unpause all synchronization</source>
<translation>すべての同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="685"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="676"/>
<source>Unpause synchronization</source>
<translation>同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="693"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="684"/>
<source>Pause all synchronization</source>
<translation>すべての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="695"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="686"/>
<source>Pause synchronization</source>
<translation>同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="693"/>
<source>Log out of all accounts</source>
<translation>全てのアカウントからログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="710"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="701"/>
<source>Log in to all accounts...</source>
<translation>全てのアカウントにログイン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="783"/>
<source>New account...</source>
<translation>新規アカウント...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1151"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>About %1</source>
<translation>%1 について</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="834"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="825"/>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="856"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="847"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="859"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="850"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="874"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="865"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同期中 %2 中 %1 (残り %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="879"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="870"/>
<source>Syncing %1 of %2</source>
<translation>%2 の %1 を同期しています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="888"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="879"/>
<source>Syncing %1 (%2 left)</source>
<translation>同期中 %1 (残り %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="891"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="882"/>
<source>Syncing %1</source>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="909"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="899"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
@@ -4117,84 +4147,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="316"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/>
<source>Server</source>
<translation>サーバー</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="414"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.&lt;/p&gt;&lt;p&gt;Do not check this if the local content should be uploaded to the servers folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;チェックした場合、ローカルフォルダー内に存在するコンテンツはサーバーからクリーンな同期を開始するために削除されます。&lt;/p&gt;&lt;p&gt;もしローカルのコンテンツをサーバーのフォルダーにアップロードするなら、チェックしないでください。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="417"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/>
<source>Start a &amp;clean sync (Erases the local folder!)</source>
<translation>クリーン同期を開始(ローカルフォルダーは削除されます!)(&amp;C)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/>
<source>Ask for confirmation before synchroni&amp;zing folders larger than</source>
<translation>指定された容量以上のフォルダーは同期前に確認する</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/>
<source>MB</source>
<extracomment>Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; </extracomment>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/>
<source>Ask for confirmation before synchronizing e&amp;xternal storages</source>
<translation>外部ストレージと同期する前に確認する(&amp;X)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this option is selected, the wizard will close without synchronizing anything. You can use the &amp;quot;Add Folder Sync Connection&amp;quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
<source>Manually create folder sync connections </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="332"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/>
<source>&amp;Local Folder</source>
<translation>ローカルフォルダー(&amp;L)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="373"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="404"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/>
<source>&amp;Keep local data</source>
<translation>ローカルデータを保持(&amp;K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/>
<source>S&amp;ynchronize everything from server (recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/>
<source>Status message</source>
<translation>状態メッセージ</translation>
</message>
@@ -4249,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
@@ -4264,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>Error Label</source>
<translation>エラーラベル</translation>
</message>
@@ -4296,37 +4324,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="449"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>in the future</source>
<translation>今後</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="447"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n日前</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="453"/>
+ <location filename="../src/common/utility.cpp" line="455"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n 時間前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="460"/>
<source>now</source>
<translation>今</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="460"/>
+ <location filename="../src/common/utility.cpp" line="462"/>
<source>Less than a minute ago</source>
<translation>1分以内</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="463"/>
+ <location filename="../src/common/utility.cpp" line="465"/>
<source>%n minute(s) ago</source>
<translation><numerusform> %n 分前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="466"/>
+ <location filename="../src/common/utility.cpp" line="468"/>
<source>Some time ago</source>
<translation>数分前</translation>
</message>
@@ -4409,11 +4437,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
- <name>ownCloudTheme::about()</name>
+ <name>ownCloudTheme::aboutVersions()</name>
+ <message>
+ <location filename="../src/libsync/theme.cpp" line="360"/>
+ <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ownCloudTheme::qtVer</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="320"/>
- <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
- <translation>&lt;p&gt;&lt;small&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用&lt;/small&gt;&lt;/p&gt;</translation>
+ <location filename="../src/libsync/theme.cpp" line="350"/>
+ <source>%1 (Built against Qt %1)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ownCloudTheme::versionWithSha</name>
+ <message>
+ <location filename="../src/libsync/theme.cpp" line="355"/>
+ <source>%1 %2</source>
+ <translation>%1 %2</translation>
</message>
</context>
<context>
@@ -4519,52 +4563,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="64"/>
+ <location filename="../src/libsync/theme.cpp" line="75"/>
<source>Status undefined</source>
<translation>未定義の状態</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="67"/>
+ <location filename="../src/libsync/theme.cpp" line="78"/>
<source>Waiting to start sync</source>
<translation>同期開始を待っています</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="70"/>
+ <location filename="../src/libsync/theme.cpp" line="81"/>
<source>Sync is running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="73"/>
+ <location filename="../src/libsync/theme.cpp" line="84"/>
<source>Sync Success</source>
<translation>同期成功</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="76"/>
+ <location filename="../src/libsync/theme.cpp" line="87"/>
<source>Sync Success, some files were ignored.</source>
<translation>同期が完了しました。一部のファイルが除外されました。</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="79"/>
+ <location filename="../src/libsync/theme.cpp" line="90"/>
<source>Sync Error</source>
<translation>同期エラー</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="82"/>
+ <location filename="../src/libsync/theme.cpp" line="93"/>
<source>Setup Error</source>
<translation>設定エラー</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="85"/>
+ <location filename="../src/libsync/theme.cpp" line="96"/>
<source>Preparing to sync</source>
<translation>同期の準備中</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="88"/>
+ <location filename="../src/libsync/theme.cpp" line="99"/>
<source>Aborting...</source>
<translation>中止しています...</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="91"/>
+ <location filename="../src/libsync/theme.cpp" line="102"/>
<source>Sync is paused</source>
<translation>同期を一時停止</translation>
</message>
@@ -4572,53 +4616,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>utility</name>
<message>
- <location filename="../src/gui/guiutility.cpp" line="38"/>
+ <location filename="../src/gui/guiutility.cpp" line="39"/>
<source>Could not open browser</source>
<translation>ブラウザを開くことができませんでした。</translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="39"/>
+ <location filename="../src/gui/guiutility.cpp" line="40"/>
<source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
<translation>URL %1 をブラウザで開く際にエラーが発生しました。おそらくデフォルトのブラウザが設定されていないのでは?</translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="62"/>
+ <location filename="../src/gui/guiutility.cpp" line="63"/>
<source>Could not open email client</source>
<translation>電子メールクライアントを開くことができませんでした</translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="63"/>
+ <location filename="../src/gui/guiutility.cpp" line="64"/>
<source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
<translation>メールクライアントを起動して新しいメッセージを作成するときにエラーが発生しました。デフォルトのメールクライアントが設定されていませんか?</translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="78"/>
+ <location filename="../src/gui/guiutility.cpp" line="79"/>
<source>Always available locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="82"/>
+ <location filename="../src/gui/guiutility.cpp" line="83"/>
<source>Some available online only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="84"/>
- <location filename="../src/gui/guiutility.cpp" line="86"/>
+ <location filename="../src/gui/guiutility.cpp" line="85"/>
+ <location filename="../src/gui/guiutility.cpp" line="87"/>
<source>Available online only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="80"/>
+ <location filename="../src/gui/guiutility.cpp" line="81"/>
<source>Currently available locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="93"/>
+ <location filename="../src/gui/guiutility.cpp" line="94"/>
<source>Make always available locally</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="98"/>
+ <location filename="../src/gui/guiutility.cpp" line="99"/>
<source>Free up local space</source>
<translation type="unfinished"/>
</message>