Revert "Config: Use monochrome icons per default on MacOSX."

This reverts commit 546cab3f62.
For OEMs this patch causes an empty tray icon set.

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: Try another sync on 423 Locked (#3387)
-  * Propagation: Make 423 Locked a soft error #3387
+  * Propagation: Make 423 Locked a soft error (#3387)
   * Propagation: Reset upload blacklist if a chunk suceeds
-  * Application: Fix crash on early shutdown #3898
+  * Application: Fix crash on early shutdown (#3898)
-  * Linux: Don't show settings dialog always when launched twice #3273 #3771 #3485
+  * 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
+  * 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
+  * FolderMan: Fix for removing a syncing folder (#3843)
-  * ConnectionMethodDialog: Don't be insecure on close #3863
+  * ConnectionMethodDialog: Don't be insecure on close (#3863)
-  * Updater: Ensure folders are not removed #3747
+  * Updater: Ensure folders are not removed (#3747)
-  * Folder settings: Ensure path is cleaned #3811
+  * Folder settings: Ensure path is cleaned (#3811)
-  * Propagator: Simplify sub job finished counting #3844
+  * Propagator: Simplify sub job finished counting (#3844)
-  * Share dialog: Hide settings dialog before showing #3783
+  * Share dialog: Hide settings dialog before showing (#3783)
-  * UI: Only expand 1 level in folder list #3585
+  * UI: Only expand 1 level in folder list (#3585)
-  * UI: Allow folder expanding from button click #3585
+  * UI: Allow folder expanding from button click (#3585)
-  * UI: Expand folder treeview on single click #3585
+  * UI: Expand folder treeview on single click (#3585)
-  * GUI: Change tray menu order #3657
+  * 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
+  * csync io: Full UNC path support on Win (#3748)
-  * Tray: Don't use the tray workaround with the KDE theme #3706, #3765
+  * Tray: Don't use the tray workaround with the KDE theme (#3706, #3765)
-  * ShareDialog: Fix folder display #3659
+  * ShareDialog: Fix folder display (#3659)
-  * AccountSettings: Restore from legacy only once #3565
+  * AccountSettings: Restore from legacy only once (#3565)
-  * SSL Certificate Error Dialog: show account name #3729
+  * SSL Certificate Error Dialog: show account name (#3729)
-  * Tray notification: Don't show a message about modified folder #3613 
+  * 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
+  * Tray: Hide while modifying menus (#3656, #3672)
-  * AddFolder: Improve remote path selection error handling #3573
+  * AddFolder: Improve remote path selection error handling (#3573)
-  * csync_update: Use excluded_traversal() to improve performance #3638
+  * csync_update: Use excluded_traversal() to improve performance (#3638)
-  * csync_excluded: Add fast _traversal() function #3638
+  * csync_excluded: Add fast _traversal() function (#3638)
-  * csync_exclude: Speed up siginificantly #3638
+  * csync_exclude: Speed up siginificantly (#3638)
-  * AccountSettings: Adjust quota info design #3644 #3651
+  * AccountSettings: Adjust quota info design (#3644, #3651)
-  * Adjust buttons on remove folder/account questions #3654
+  * 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 "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

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;
+    return settings.value(QLatin1String(monoIconsC), false).toBool();
-    if( Utility::isMac() ) {
-        deflt = true;
-    }
-    return settings.value(QLatin1String(monoIconsC), deflt).toBool();
 }
 
 void ConfigFile::setMonoIcons(bool useMonoIcons)

translations/client_ja.ts

@@ -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"/>