Documentation: Fix PDF logo, version number

Backport #4052 to 2.0

ChangeLog

@@ -1,49 +1,49 @@
 ChangeLog
 =========
-version 2.0.2 (release 2015-10-xx)
+version 2.0.2 (release 2015-10-21)
   * csync_file_stat_s: Save a bit of memory
   * Shibboleth: Add our base user agent to WebKit
   * SelectiveSync: Increase folder list timeout to 60
-  * Propagation: Try another sync on 423 Locked #3387
-  * Propagation: Make 423 Locked a soft error #3387
+  * Propagation: Try another sync on 423 Locked (#3387)
+  * Propagation: Make 423 Locked a soft error (#3387)
   * Propagation: Reset upload blacklist if a chunk suceeds
-  * Application: Fix crash on early shutdown #3898
-  * Linux: Don't show settings dialog always when launched twice #3273 #3771 #3485
-  * win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call. #3813
+  * Application: Fix crash on early shutdown (#3898)
+  * Linux: Don't show settings dialog always when launched twice (#3273, #3771, #3485)
+  * win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call. (#3813)
   * AccountSettings: only expand root elements on single click.
   * AccountSettings: Do not allow to expand the folder list when disconnected.
   * Use application SHORT name for the name of the MacOSX pkg file (ownBrander).
-  * FolderMan: Fix for removing a syncing folder #3843
-  * ConnectionMethodDialog: Don't be insecure on close #3863
-  * Updater: Ensure folders are not removed #3747
-  * Folder settings: Ensure path is cleaned #3811
-  * Propagator: Simplify sub job finished counting #3844
-  * Share dialog: Hide settings dialog before showing #3783
-  * UI: Only expand 1 level in folder list #3585
-  * UI: Allow folder expanding from button click #3585
-  * UI: Expand folder treeview on single click #3585
-  * GUI: Change tray menu order #3657
+  * FolderMan: Fix for removing a syncing folder (#3843)
+  * ConnectionMethodDialog: Don't be insecure on close (#3863)
+  * Updater: Ensure folders are not removed (#3747)
+  * Folder settings: Ensure path is cleaned (#3811)
+  * Propagator: Simplify sub job finished counting (#3844)
+  * Share dialog: Hide settings dialog before showing (#3783)
+  * UI: Only expand 1 level in folder list (#3585)
+  * UI: Allow folder expanding from button click (#3585)
+  * UI: Expand folder treeview on single click (#3585)
+  * GUI: Change tray menu order (#3657)
   * GUI: Replace term "sign in" with "Log in" and friends.
   * SetupPage: Fix crash caused by uninitialized Account object.
   * Use a themable WebDAV path all over.
   * Units: Back to the "usual" mix units (JEDEC standard).
-  * csync io: Full UNC path support on Win #3748
-  * Tray: Don't use the tray workaround with the KDE theme #3706, #3765
-  * ShareDialog: Fix folder display #3659
-  * AccountSettings: Restore from legacy only once #3565
-  * SSL Certificate Error Dialog: show account name #3729
-  * Tray notification: Don't show a message about modified folder #3613 
+  * csync io: Full UNC path support on Win (#3748)
+  * Tray: Don't use the tray workaround with the KDE theme (#3706, #3765)
+  * ShareDialog: Fix folder display (#3659)
+  * AccountSettings: Restore from legacy only once (#3565)
+  * SSL Certificate Error Dialog: show account name (#3729)
+  * Tray notification: Don't show a message about modified folder (#3613) 
   * PropagateLocalRemove:  remove entries from the DB even if there was an error.
   * Settings UI improvements (eg. #3713, #3721, #3619 and others)
-  * Folder: Do not create the sync folder if it does not exist #3692
+  * Folder: Do not create the sync folder if it does not exist (#3692)
   * Shell integratioon: don't show share menu item for top level folders
-  * Tray: Hide while modifying menus #3656 #3672
-  * AddFolder: Improve remote path selection error handling #3573
-  * csync_update: Use excluded_traversal() to improve performance #3638
-  * csync_excluded: Add fast _traversal() function #3638
-  * csync_exclude: Speed up siginificantly #3638
-  * AccountSettings: Adjust quota info design #3644 #3651
-  * Adjust buttons on remove folder/account questions #3654
+  * Tray: Hide while modifying menus (#3656, #3672)
+  * AddFolder: Improve remote path selection error handling (#3573)
+  * csync_update: Use excluded_traversal() to improve performance (#3638)
+  * csync_excluded: Add fast _traversal() function (#3638)
+  * csync_exclude: Speed up siginificantly (#3638)
+  * AccountSettings: Adjust quota info design (#3644, #3651)
+  * Adjust buttons on remove folder/account questions (#3654)
 
 version 2.0.1 (release 2015-09-01)
   * AccountWizard: fix when the theme specify a override URL (#3699)

VERSION.cmake

@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 2 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

doc/autoupdate.rst

@@ -11,8 +11,8 @@ the Updater will check for updates and notify you when a new version is
 available.
 
 .. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not be allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
+   1.7 will not be allowed to connect and sync with the ownCloud 8.1+ server. It 
+   is highly recommended to keep your client updated.
 
 Basic Workflow
 --------------
@@ -73,8 +73,8 @@ To prevent automatic updates, but allow manual overrides:
 
 1. Edit these Registry keys:
 
-    a. (32-bit) ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``
-    b. (64-bit) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\ownCloud\ownCloud``
+    a. (32-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``
+    b. (64-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\ownCloud\ownCloud``
 
 2. Add the key ``skipUpdateCheck`` (of type DWORD).
 
@@ -89,7 +89,7 @@ To prevent automatic updates and disallow manual overrides:
 
 1. Edit this Registry key:
 
-	HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud
+    ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud``
 
 2. Add the key ``skipUpdateCheck`` (of type DWORD).
 

doc/conf.py.in

@@ -48,9 +48,9 @@ copyright = u'2013, The ownCloud developers'
 # built documents.
 #
 # The short X.Y version.
-version = '@VERSION_MAJOR@.@VERSION_MINOR@'
+version = '@MIRALL_VERSION_MAJOR@.@MIRALL_VERSION_MINOR@'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@MIRALL_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -189,7 +189,7 @@ latex_documents = [
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+latex_logo = '@LATEX_LOGO@'
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.

doc/installing.rst

@@ -3,7 +3,8 @@ Installing the Desktop Synchronization Client
 =============================================
 
 You can download the  latest version of the ownCloud Desktop Synchronization 
-Client from the `ownCloud Website <https://owncloud.org/install/#desktop>`_. 
+Client from the `ownCloud download page 
+<https://owncloud.org/install/#desktop>`_. 
 There are clients for Linux, Mac OS X, and Microsoft Windows.
 
 Installation on Mac OS X and Windows is the same as for any software 
@@ -21,6 +22,9 @@ will display a notification when an update is available.
 Linux users must also have a password manager enabled, such as GNOME Keyring or
 KWallet, so that the sync client can login automatically.
 
+You will also find links to source code archives and older versions on the 
+download page.
+
 Installation Wizard
 -------------------
 

doc/introduction.rst

@@ -13,14 +13,15 @@ Your files are always automatically synchronized between your ownCloud server
 and local PC.
 
 .. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
+   1.7 will not allowed to connect and sync with the ownCloud 8.1+ server. It 
+   is highly recommended to keep your client updated.
    
 Improvements and New Features
 -----------------------------
 
 The 2.0 release of the ownCloud desktop sync client has many new features and 
-improvements.
+improvements. (See the `complete changelog 
+<https://owncloud.org/changelog/desktop/>`_.)
 
   * Multi-account support
   * Many UI improvements

doc/navigating.rst

@@ -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`.

src/cmd/cmd.cpp

@@ -158,14 +158,14 @@ void help()
     std::cout << "  -h                     Sync hidden files,do not ignore them" << std::endl;
     std::cout << "  --version, -v          Display version and exit" << std::endl;
     std::cout << "" << std::endl;
-    exit(1);
+    exit(0);
 
 }
 
 void showVersion() {
     const char *binaryName = APPLICATION_EXECUTABLE "cmd";
     std::cout << binaryName << " version " << qPrintable(Theme::instance()->version()) << std::endl;
-    exit(1);
+    exit(0);
 }
 
 void parseOptions( const QStringList& app_args, CmdOptions *options )

src/libsync/configfile.cpp

@@ -588,11 +588,7 @@ void ConfigFile::setNewBigFolderSizeLimit(bool isChecked, quint64 mbytes)
 bool ConfigFile::monoIcons() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);
-    bool deflt = false;
-    if( Utility::isMac() ) {
-        deflt = true;
-    }
-    return settings.value(QLatin1String(monoIconsC), deflt).toBool();
+    return settings.value(QLatin1String(monoIconsC), false).toBool();
 }
 
 void ConfigFile::setMonoIcons(bool useMonoIcons)

translations/client_es.ts

@@ -2825,7 +2825,7 @@ No se recomienda usarla.</translation>
         <location filename="../src/gui/owncloudgui.cpp" line="451"/>
         <location filename="../src/gui/owncloudgui.cpp" line="528"/>
         <source>Log out</source>
-        <translation>Salir</translation>
+        <translation>Cerrar sesión</translation>
     </message>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="387"/>

translations/client_fr.ts

@@ -2155,7 +2155,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
     <message>
         <location filename="../src/gui/sharedialog.ui" line="77"/>
         <source>Share link</source>
-        <translation>Partage par lien</translation>
+        <translation>Partager par lien</translation>
     </message>
     <message>
         <location filename="../src/gui/sharedialog.ui" line="125"/>
@@ -2211,7 +2211,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
         <location filename="../src/gui/sharedialog.cpp" line="564"/>
         <location filename="../src/gui/sharedialog.cpp" line="565"/>
         <source>&amp;Share link</source>
-        <translation>&amp;Partage par lien</translation>
+        <translation>&amp;Partager par lien</translation>
     </message>
     <message>
         <location filename="../src/gui/sharedialog.cpp" line="583"/>

translations/client_it.ts

@@ -2826,7 +2826,7 @@ Non è consigliabile utilizzarlo.</translation>
         <location filename="../src/gui/owncloudgui.cpp" line="451"/>
         <location filename="../src/gui/owncloudgui.cpp" line="528"/>
         <source>Log out</source>
-        <translation>Esci</translation>
+        <translation>Disconnetti</translation>
     </message>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="387"/>

translations/client_ja.ts

@@ -83,7 +83,7 @@
     <message>
         <location filename="../src/gui/accountsettings.ui" line="97"/>
         <source>Storage space: ...</source>
-        <translation type="unfinished"/>
+        <translation>ストレージ空き容量: ...</translation>
     </message>
     <message>
         <location filename="../src/gui/accountsettings.ui" line="167"/>
@@ -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"/>
@@ -235,12 +235,12 @@
     <message>
         <location filename="../src/gui/accountsettings.cpp" line="447"/>
         <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
-        <translation type="unfinished"/>
+        <translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
     </message>
     <message>
         <location filename="../src/gui/accountsettings.cpp" line="448"/>
         <source>%1 of %2 in use</source>
-        <translation type="unfinished"/>
+        <translation>%2 のうち %1 を使用中</translation>
     </message>
     <message>
         <location filename="../src/gui/accountsettings.cpp" line="453"/>
@@ -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"/>
@@ -517,7 +517,9 @@ Please go in the settings to select it if you wish to download it.</source>
         <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
-        <translation type="unfinished"/>
+        <translation>この同期により、ローカルの同期フォルダー &apos;%1&apos;にある全ファイルが削除されます。
+これはフォルダーが黙って再構成されたか、すべてのファイルが手動で削除されたことが原因である場合があります。
+本当にこの操作を実行しますか？</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1119"/>
@@ -615,7 +617,7 @@ Are you sure you want to perform this operation?</source>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1142"/>
         <source>The selected path is not a folder!</source>
-        <translation type="unfinished"/>
+        <translation>指定のパスは、フォルダーではありません！</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1146"/>
@@ -625,27 +627,27 @@ Are you sure you want to perform this operation?</source>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1161"/>
         <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダー %1 はすでに同期フォルダーとして利用されています。他のフォルダーを選択してください。</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1166"/>
         <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダを含んでいます。他のフォルダーを選択してください。</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1173"/>
         <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダー %1 はシンボリックリンクです。リンク先のフォルダにはすでに同期フォルダーとして利用されているフォルダーを含みます。他のフォルダーを選択してください。</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1180"/>
         <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1186"/>
         <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください！</translation>
     </message>
 </context>
 <context>
@@ -653,7 +655,7 @@ Are you sure you want to perform this operation?</source>
     <message>
         <location filename="../src/gui/folderstatusdelegate.cpp" line="33"/>
         <source>Add Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>同期フォルダーを追加</translation>
     </message>
     <message>
         <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
@@ -682,7 +684,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,17 +763,17 @@ 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"/>
         <source>Waiting for %n other folder(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
     </message>
     <message>
         <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
         <source>Preparing to sync...</source>
-        <translation type="unfinished"/>
+        <translation>同期の準備中...</translation>
     </message>
 </context>
 <context>
@@ -798,7 +800,7 @@ Total time left %5</source>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="81"/>
         <source>The folder alias is a descriptive name for this sync connection.</source>
-        <translation type="unfinished"/>
+        <translation>このフォルダーのエイリアスは、この同期接続用の記述名です。</translation>
     </message>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -846,7 +848,7 @@ Total time left %5</source>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="271"/>
         <source>Failed to list a folder. Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>フォルダーをリストアップできません。エラー: %1</translation>
     </message>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="351"/>
@@ -1031,7 +1033,7 @@ Account: %3
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="20"/>
         <source>Global Ignore Settings</source>
-        <translation>共通除外設定</translation>
+        <translation>全体的な除外設定</translation>
     </message>
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="26"/>
@@ -1041,7 +1043,7 @@ Account: %3
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="36"/>
         <source>Files Ignored by Patterns</source>
-        <translation>パターンでファイルを除外</translation>
+        <translation>パターンによって除外するファイル</translation>
     </message>
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="55"/>
@@ -1056,7 +1058,7 @@ Account: %3
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="80"/>
         <source>Allow Deletion</source>
-        <translation>削除許可</translation>
+        <translation>削除を許可</translation>
     </message>
     <message>
         <location filename="../src/gui/ignorelisteditor.ui" line="45"/>
@@ -1068,7 +1070,9 @@ Account: %3
         <source>Files or folders matching a pattern will not be 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"/>
+        <translation>パターンに一致するファイルやフォルダーは同期されません。
+
+パターンによってディレクトリを削除から除外する場合は，パターンに含まれた項目も削除されます。例えばメタデータファイルに有用です。</translation>
     </message>
     <message>
         <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
@@ -1362,7 +1366,7 @@ for additional privileges during the process.</source>
     <message>
         <location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
         <source>Update Check</source>
-        <translation>更新を確認</translation>
+        <translation>アップデートを確認</translation>
     </message>
 </context>
 <context>
@@ -1390,12 +1394,12 @@ for additional privileges during the process.</source>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
         <source>Sync the folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; フォルダーを同期</translation>
     </message>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
         <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 type="unfinished"/>
+        <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="246"/>
@@ -1742,7 +1746,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
         <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>ファイルまたはフォルダーが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
     </message>
 </context>
 <context>
@@ -1755,7 +1759,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
         <source>could not create folder %1</source>
-        <translation type="unfinished"/>
+        <translation>フォルダー %1 を作成できませんでした</translation>
     </message>
 </context>
 <context>
@@ -1768,7 +1772,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"/>
@@ -1868,7 +1872,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/propagateupload.cpp" line="558"/>
         <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
     </message>
     <message>
         <location filename="../src/libsync/propagateupload.cpp" line="566"/>
@@ -1988,7 +1992,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 +2002,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"/>
@@ -2345,7 +2349,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/sslbutton.cpp" line="118"/>
         <source>Issuer:</source>
-        <translation>発行者: %1</translation>
+        <translation>発行者: </translation>
     </message>
     <message>
         <location filename="../src/gui/sslbutton.cpp" line="119"/>
@@ -2396,13 +2400,13 @@ It is not advisable to use it.</source>
         <location filename="../src/gui/sslbutton.cpp" line="192"/>
         <source>This connection is encrypted using %1 bit %2.
 </source>
-        <translation>この接続は、%1 を使って、%2 bit で暗号化されています。
+        <translation>この接続は、%1 の %2 bit を使って暗号化されています。
 </translation>
     </message>
     <message>
         <location filename="../src/gui/sslbutton.cpp" line="219"/>
         <source>No support for SSL session tickets/identifiers</source>
-        <translation type="unfinished"/>
+        <translation>SSLセッションチケット/識別子はサポートされていません</translation>
     </message>
     <message>
         <location filename="../src/gui/sslbutton.cpp" line="230"/>
@@ -2432,12 +2436,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"/>
@@ -2575,27 +2579,27 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="164"/>
         <source>The mounted folder is temporarily not available on the server</source>
-        <translation type="unfinished"/>
+        <translation>サーバー上のマウント済フォルダーが一時的に利用できません。</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="167"/>
         <source>An error occurred while opening a folder</source>
-        <translation type="unfinished"/>
+        <translation>フォルダーを開く際にエラーが発生しました</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="170"/>
         <source>Error while reading folder.</source>
-        <translation type="unfinished"/>
+        <translation>フォルダーの読み込みエラー</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="996"/>
         <source>Not allowed because you don&apos;t have permission to add parent folder</source>
-        <translation type="unfinished"/>
+        <translation>親フォルダーを追加する権限がありません</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="1003"/>
         <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
-        <translation type="unfinished"/>
+        <translation>そのフォルダーにファイルを追加する権限がありません</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2625,12 +2629,12 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="100"/>
         <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
-        <translation type="unfinished"/>
+        <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期フォルダーに読み書きの権限があるか確認してください。</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="149"/>
         <source>CSync tried to create a folder that already exists.</source>
-        <translation type="unfinished"/>
+        <translation>CSyncはすでに存在するフォルダーを作成しようとしました。</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="161"/>
@@ -2701,7 +2705,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="990"/>
         <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
-        <translation type="unfinished"/>
+        <translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="1023"/>
@@ -2812,7 +2816,7 @@ It is not advisable to use it.</source>
         <location filename="../src/gui/owncloudgui.cpp" line="459"/>
         <location filename="../src/gui/owncloudgui.cpp" line="526"/>
         <source>Log in...</source>
-        <translation type="unfinished"/>
+        <translation>ログイン...</translation>
     </message>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="354"/>
@@ -2849,12 +2853,12 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="449"/>
         <source>Log out everywhere</source>
-        <translation type="unfinished"/>
+        <translation>全サーバーからログアウト</translation>
     </message>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="457"/>
         <source>Log in everywhere...</source>
-        <translation type="unfinished"/>
+        <translation>全サーバーにログイン...</translation>
     </message>
     <message>
         <location filename="../src/gui/owncloudgui.cpp" line="513"/>
@@ -2967,7 +2971,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
         <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 type="unfinished"/>
+        <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="203"/>
@@ -3161,7 +3165,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/utility.cpp" line="125"/>
         <source>%L1 KB</source>
-        <translation type="unfinished"/>
+        <translation>%L1 KB</translation>
     </message>
     <message>
         <location filename="../src/libsync/utility.cpp" line="128"/>

translations/client_pt.ts

@@ -655,7 +655,7 @@ Tem a certeza que deseja realizar esta operação?</translation>
     <message>
         <location filename="../src/gui/folderstatusdelegate.cpp" line="33"/>
         <source>Add Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Ligação de Sincronização de Pasta</translation>
     </message>
     <message>
         <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>