Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-ca/strings.xml
	res/values-el/strings.xml

diff --cc res/values-ca/strings.xml
index 90ddff3,83dffe2..573bdea
--- 1/res/values-ca/strings.xml
--- 2/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@@ -55,10 -66,11 +66,10 @@@
    <string name="filedetails_size">Mida:</string>
    <string name="filedetails_type">Tipus:</string>
    <string name="filedetails_created">Creat:</string>
-   <string name="filedetails_modified">Midificat:</string>
-   <string name="filedetails_download">Baixada</string>
+   <string name="filedetails_modified">Modificat:</string>
+   <string name="filedetails_download">Baixa</string>
    <string name="filedetails_redownload">Baixa de nou</string>
 -  <string name="filedetails_download_in_progress">S\'està baixant</string>
 -  <string name="filedetails_open">Obre</string>
 +  <string name="filedetails_open">Obert</string>
    <string name="common_yes">Sí</string>
    <string name="common_no">No</string>
    <string name="common_ok">D\'acord</string>

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
index 318d75a,e0f1edb..979c60e
--- 1/res/values-el/strings.xml
--- 2/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@@ -49,6 -68,8 +68,7 @@@
    <string name="filedetails_created">Δημιουργήθηκε:</string>
    <string name="filedetails_modified">Τροποποιήθηκε:</string>
    <string name="filedetails_download">Λήψη</string>
 -  <string name="filedetails_download_in_progress">Λήψη</string>
+   <string name="filedetails_redownload">Κατέβασμα ξανά</string>
    <string name="filedetails_open">Άνοιγμα</string>
    <string name="common_yes">Ναι</string>
    <string name="common_no">Όχι</string>

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
index c2f68ab,4304df4..8e41836
--- 1/res/values-sl/strings.xml
--- 2/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@@ -52,9 -66,10 +66,9 @@@
    <string name="filedetails_size">Velikost:</string>
    <string name="filedetails_type">Vrsta:</string>
    <string name="filedetails_created">Ustvarjen:</string>
-   <string name="filedetails_modified">Spremenjen:</string>
+   <string name="filedetails_modified">Spremenjena:</string>
    <string name="filedetails_download">Prenos</string>
    <string name="filedetails_redownload">Ponovno prenesi</string>
 -  <string name="filedetails_download_in_progress">Prenašam</string>
    <string name="filedetails_open">Odpri</string>
    <string name="common_yes">Da</string>
    <string name="common_no">Ne</string>