Merge remote-tracking branch 'origin/2.1'

ChangeLog

@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.1.1 (release 2016-02-0x)
+version 2.1.1 (release 2016-02-10)
  * UI improvements for HiDPI screens, error messages, RTL languages
  * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
  * Fix undeliberate WiFi scanning done by Qt Network classes
@@ -14,10 +14,11 @@ version 2.1.1 (release 2016-02-0x)
  * Allow changeable upload chunk size in owncloud.cfg
  * Crash fixes on account deletion
  * Forget password on explicit sign-out
+ * OS X: Fix the file system watcher ignoring unicode paths (#4424)
  * Windows Installer: Update to NSIS 2.50, fixes possible DLL injection
  * Sync Engine: .lnk files
  * Sync Engine: symlinked syn directories
- * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308 #4277)
+ * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277)
  * Sync Engine: Fixes for files becoming directories and vice versa (#4302)
  * Misc other fixes/improvements
 

admin/win/nsi/l10n/Portuguese.nsh

@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\\nDeseja que o instalador os termine automaticamente?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\nDeseja que o instalador os termine automaticamente?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
 StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que você desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."

admin/win/nsi/l10n/SpanishInternational.nsh

@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\\n$\"¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\n$\"¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."

admin/win/nsi/l10n/bin/build_locale_nsi.py

@@ -108,7 +108,8 @@ def escapeNSIS(st):
              .replace('\n', r'$\n')\
              .replace('\"', r'$\"')\
              .replace('$$\\', '$\\')\
-             .replace('$\\n', r'$\n')
+             .replace('$\\n', r'$\n')\
+             .replace('$\\\\n', r'$\n')
 
 
 translationCache = {}
@@ -120,7 +121,7 @@ translationCache = {}
 for root,dirs,files in os.walk(options.podir):
     for file in files:
         filename,ext = os.path.splitext(file)
-        if ext == ".po" or ext == ".nsh":
+        if ext == ".po":
             # Valid locale filename (fr.po, de.po etc)?
             if filename in localeToName:
                 language = localeToName[filename]

shell_integration/nautilus/createnemoplugin.sh

@@ -3,4 +3,4 @@
 # this script creates a plugin for nemo, just be replacing
 # all occurences of Nautilus with Nemo.
 
-/usr/bin/sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py
+sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py

shell_integration/nautilus/setappname.sh

@@ -3,4 +3,4 @@
 # this script replaces the line
 #  appname = 'ownCloud'
 # with the correct branding name in the syncstate.py script
-/usr/bin/sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py
+sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py

translations/client_ca.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Aturat per l&apos;usuari</translation>
     </message>

translations/client_cs.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Zrušeno uživatelem</translation>
     </message>

translations/client_de.ts

@@ -518,7 +518,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Abbruch durch den Benutzer</translation>
     </message>

translations/client_el.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Ματαιώθηκε από το χρήστη</translation>
     </message>

translations/client_en.ts

@@ -519,7 +519,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation type="unfinished"></translation>
     </message>

translations/client_es.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Interrumpido por el usuario</translation>
     </message>

translations/client_es_AR.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Interrumpido por el usuario</translation>
     </message>

translations/client_et.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Kasutaja poolt tühistatud</translation>
     </message>

translations/client_eu.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Erabiltzaileak bertan behera utzita</translation>
     </message>
@@ -2855,7 +2855,7 @@ Ez da gomendagarria erabltzea.</translation>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="826"/>
         <source>File name contains at least one invalid character</source>
-        <translation type="unfinished"/>
+        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="1015"/>

translations/client_fa.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>متوقف شده توسط کاربر</translation>
     </message>

translations/client_fi.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Keskeytetty käyttäjän toimesta</translation>
     </message>

translations/client_fr.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Interrompu par l&apos;utilisateur</translation>
     </message>
@@ -1123,7 +1123,7 @@ Temps restant total %5</translation>
     <message>
         <location filename="../src/gui/generalsettings.ui" line="129"/>
         <source>S&amp;how crash reporter</source>
-        <translation>A&amp;fficher le rapport d&apos;incident</translation>
+        <translation>Affic&amp;her le rapport d&apos;incident</translation>
     </message>
     <message>
         <location filename="../src/gui/generalsettings.ui" line="156"/>

translations/client_gl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Interrompido polo usuario</translation>
     </message>

translations/client_hu.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Felhasználó megszakította</translation>
     </message>

translations/client_it.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Interrotto dall&apos;utente</translation>
     </message>

translations/client_ja.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>ユーザーによって中止されました</translation>
     </message>

translations/client_nb_NO.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Avbrutt av brukeren</translation>
     </message>

translations/client_nl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Afgebroken door de gebruiker</translation>
     </message>

translations/client_pl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Anulowane przez użytkownika</translation>
     </message>

translations/client_pt.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Cancelado pelo utilizador</translation>
     </message>

translations/client_pt_BR.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Abortado pelo usuário</translation>
     </message>

translations/client_ru.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Прервано пользов</translation>
     </message>

translations/client_sk.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Zrušené používateľom</translation>
     </message>

translations/client_sl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
     </message>

translations/client_sr.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Прекинуо корисник</translation>
     </message>

translations/client_sv.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Avbruten av användare</translation>
     </message>

translations/client_th.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>ยกเลิกโดยผู้ใช้</translation>
     </message>

translations/client_tr.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Kullanıcı tarafından iptal edildi</translation>
     </message>

translations/client_uk.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>Перервано користувачем</translation>
     </message>

translations/client_zh_CN.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>用户撤销</translation>
     </message>

translations/client_zh_TW.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
         <source>Aborted by the user</source>
         <translation>使用者中斷</translation>
     </message>