From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 8 Oct 2012 07:10:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~165
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51?ds=sidebyside

Merge remote-tracking branch 'origin/master'

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

7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51
diff --cc res/values-ca/strings.xml
index 90ddff30,83dffe2f..573bdea7
--- a/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-el/strings.xml
index 318d75a8,e0f1edb6..979c60ea
--- a/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_redownload">Κατέβασμα ξανά</string>
 -  <string name="filedetails_download_in_progress">Λήψη</string>
    <string name="filedetails_open">Άνοιγμα</string>
    <string name="common_yes">Ναι</string>
    <string name="common_no">Όχι</string>
diff --cc res/values-sl/strings.xml
index c2f68ab1,4304df4a..8e418364
--- a/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>