Merge remote-tracking branch '2.2' into master

For the reanslation. Now transifex should be updated to update master.
This should normally be the last merge from 2.2

 Conflicts:
	mirall.desktop.in
	translations/client_sl.ts
	translations/client_th.ts

diff --cc translations/client_sl.ts
index 0ef710855bf1f1339b52ab3c2410197718ade7df,7fc803c67ab32c9e7cc1137f7f31e76dc1d2521e..9db97d0a5f63fd55fdd3b297021a6184a5377655
--- 1/translations/client_sl.ts
--- 2/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@@ -3342,8 -3294,8 +3342,8 @@@ Uporaba ni priporočljiva.</translation
      <name>OCC::ownCloudTheme</name>
      <message>
          <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
 -        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
 +        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.&lt;/p&gt;</source>
-         <translation type="unfinished"/>
+         <translation>&lt;p&gt;Različica %2. Več podrobnosti je zabeleženih na &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Avtorstvo: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz in drugi.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Avtorske pravice ownCloud GmbH&lt;/p&gt;&lt;p&gt;Programski paket je objavljen z dovoljenjem GNU General Public License (GPL), različice 2.0.&lt;br/&gt;Znamka in logotip ownCloud sta blagovni znamki družbe ownCloud, Inc, v Združenih državah, drugih državah ali obojih.&lt;/p&gt;</translation>
      </message>
  </context>
  <context>

diff --cc translations/client_th.ts
index 56f13ea600d30109fa9a7f7c9b915d43e4b92793,539ceddcac11da8c5d1508ca8aa6b37894ebae18..e848650f3102acdef8e88c2aed34833d2f165a76
--- 1/translations/client_th.ts
--- 2/translations/client_th.ts
+++ b/translations/client_th.ts
@@@ -3340,8 -3293,8 +3340,8 @@@ It is not advisable to use it.</source
      <name>OCC::ownCloudTheme</name>
      <message>
          <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
 -        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
 +        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.&lt;/p&gt;</source>
-         <translation type="unfinished"/>
+         <translation>&lt;p&gt;เวอร์ชัน %2 สำหรับข้อมูลเพิ่มเติม &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt; โดย Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz และคนอื่นๆ&lt;/small&gt;&lt;/p&gt;&lt;p&gt;ลิขสิทธิ์ ownCloud GmbH&lt;/p&gt;&lt;p&gt;ภายใต้สัญญาอนุญาต GNU General Public (GPL) เวอร์ชัน 2.0&lt;br/&gt;ownCloud และโลโก้ ownCloud เป็นเครื่องหมายจดทะเบียนการค้าของ ownCloud, Inc. ในสหรัฐอเมริกาและประเทศอื่นๆ หรือทั้งสองอย่าง&lt;/p&gt;</translation>
      </message>
  </context>
  <context>