mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 12:55:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/2.0'

Browse source
This commit is contained in:
Daniel Molkentin 2015-10-21 18:49:58 +02:00
commit c7bf09c3d4
6 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/images/client-7.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

39
doc/navigating.rst
View file

@ -92,18 +92,27 @@ have the following features:
removed synchronization on an account (see **Remove Sync** below).
The little button with three dots that sits to the right of the sync status bar
offers three additional options:
offers four additional options:
* Open Folder
* Pause Sync
* Choose What to Sync
* Pause Sync / Resume Sync
* Remove Sync
**Pause Sync** pauses sync operations without making any changes to your account.
**Open Folder** opens a file explorer window displaying the client-side folder
that is being synced.
**Remove Sync** suspends synchronization without removing the account, and it
removes your folder sync selection. When you're ready to resume synchronization
click the **Add Folder Sync Connection** button, and re-select the folders you
want to sync.
**Choose What to Sync** opens the folder sync tree view. From there you can
choose to sync all or only some of the folders in the folder tree.
**Pause Sync** pauses sync operations for just this folder sync connection
without making any changes to your account.
**Resume Sync** resumes sync operations for this folder sync connection.
**Remove Sync** removes this folder sync connection without removing the
account. If you want to synchronize the folder tree again then click the
**Add Folder Sync Connection** button, and re-select the folder tree that
you want to sync.
.. image:: images/client-7.png
:alt: Extra options for sync operations
@ -122,12 +131,15 @@ Multi-Account Support
You may now configure multiple ownCloud accounts in your desktop sync client.
Simply click the **Add an Account** button on the General tab, and follow the
account creation wizard. The new account will appear as a new tab in the settings dialog, where you can adjust its settings at any time.
account creation wizard. The new account will appear as a new tab in the
settings dialog, where you can adjust its settings at any time.
Editing Ignored Files
---------------------
The Ignored Files Editor can be opened by clicking on the button in the General tab of the settings dialog. The settings apply to all configured accounts. The :guilabel:`Ignored Files Editor` provides a list of files that are ignored
The Ignored Files Editor can be opened by clicking on the button in the General
tab of the settings dialog. The settings apply to all configured accounts. The
:guilabel:`Ignored Files Editor` provides a list of files that are ignored
(that is, not synchronized) by the client and server during synchronizations.
You may add additional files or directories that you want to exclude from the
synchronization process. In addition to using standard characters, the Ignored
@ -184,7 +196,8 @@ components of the path being checked.
.. note:: Custom entries are currently not validated for syntactical
correctness by the editor, so you will not see any warnings for bad
syntax. If your synchronization does not work as you expected, check your syntax.
syntax. If your synchronization does not work as you expected, check your
syntax.
Each pattern string in the list is preceded by a checkbox. When the check box
contains a check mark, in addition to ignoring the file or directory component
@ -197,8 +210,8 @@ this list:
- The ownCloud Client always excludes files containing characters that cannot
be synchronized to other file systems.
- Files are removed that cause individual errors three times during a synchronization.
However, the client provides the option of retrying a synchronization three additional
times on files that produce errors.
- Files are removed that cause individual errors three times during a
synchronization. However, the client provides the option of retrying a
synchronization three additional times on files that produce errors.
For more detailed information see :ref:`ignored-files-label`.

2
src/gui/generalsettings.cpp
View file

@ -173,7 +173,7 @@ void GeneralSettings::slotAccountAddedOrRemoved()
{
_ui->addAccountButton->setVisible(
AccountManager::instance()->accounts().isEmpty()
|| !Theme::instance()->singleAccount());
|| Theme::instance()->multiAccount());
}

4
src/libsync/theme.cpp
View file

@ -201,9 +201,9 @@ bool Theme::singleSyncFolder() const {
return false;
}
bool Theme::singleAccount() const
bool Theme::multiAccount() const
{
return false;
return true;
}
QString Theme::defaultServerFolder() const

5
src/libsync/theme.h
View file

@ -111,10 +111,11 @@ public:
* Characteristics: bool if more than one sync folder is allowed
*/
virtual bool singleSyncFolder() const;
/**
* When true, there can only be one account.
* When true, client works with multiple accounts.
*/
virtual bool singleAccount() const;
virtual bool multiAccount() const;
/**
* URL to help file

28
translations/client_ja.ts
View file

@ -125,7 +125,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="283"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
<translation>同期停止中</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="309"/>
@ -185,7 +185,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="563"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
<translation>アカウント削除確認</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="564"/>
@ -195,7 +195,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="570"/>
<source>Remove connection</source>
<translation type="unfinished"/>
<translation>接続削除</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="165"/>
@ -220,12 +220,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="176"/>
<source>Remove sync</source>
<translation type="unfinished"/>
<translation>同期削除</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="277"/>
<source>Confirm Sync Removal</source>
<translation type="unfinished"/>
<translation>同期削除確認</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="278"/>
@ -416,7 +416,7 @@
<message>
<location filename="../src/gui/folder.cpp" line="164"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="167"/>
@ -682,7 +682,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
<source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>既に同期対象のフォルダーの為、追加したフォルダーを無効にしました。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation>
<translation>既に同期対象のフォルダーのため、追加したフォルダーを無効にしました。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
@ -761,7 +761,7 @@ Total time left %5</source>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
<source>Waiting...</source>
<translation type="unfinished"/>
<translation>待機中...</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
@ -771,7 +771,7 @@ Total time left %5</source>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
<translation>同期の準備中...</translation>
</message>
</context>
<context>
@ -1768,7 +1768,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder &apos;%1&apos;;</source>
<translation type="unfinished"/>
<translation>ディレクトリ &apos;%1&apos;を削除できません;</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@ -1988,7 +1988,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="26"/>
<source>Username:</source>
<translation>ユーザ名:</translation>
<translation>ユーザー名:</translation>
</message>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="36"/>
@ -1998,7 +1998,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="43"/>
<source>The proxy server needs a username and password.</source>
<translation>プロキシサーバにユーザー名とパスワードが必要です。</translation>
<translation>プロキシサーバーにユーザー名とパスワードが必要です。</translation>
</message>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="50"/>
@ -2432,12 +2432,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="66"/>
<source>Untrusted Certificate</source>
<translation type="unfinished"/>
<translation>信頼できない証明書</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="135"/>
<source>Cannot connect securely to &lt;i&gt;%1&lt;/i&gt;:</source>
<translation type="unfinished"/>
<translation>&lt;i&gt;%1&lt;/i&gt; にセキュアに接続できません:</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="171"/>