From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 18 Mar 2013 13:28:49 +0000 (+0100)
Subject: Merge tag 'oc-android-1-3-22' into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5665d9c306165c144fc60b9749ac184cb32369c0?hp=7d84fd0c9f15227bc65a2ae00a74e1cfd8f8d33b

Merge tag 'oc-android-1-3-22' into oauth_login

Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
---

diff --git a/.tx/config b/.tx/config
index b2ca7e06..f30f5ef0 100644
--- a/.tx/config
+++ b/.tx/config
@@ -5,4 +5,4 @@ host = https://www.transifex.com
 file_filter = res/values-<lang>/strings.xml
 source_file = res/values/strings.xml
 source_lang = en
-lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sr@latin: sr-rSP, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, ta_LK: ta-rLK, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_CN.GB2312:zh-rBG, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA
+lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ku_IQ: ku-rIQ, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, my_MM: my, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sr@latin: sr-rSP, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, ta_LK: ta-rLK, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_CN.GB2312:zh-rBG, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3cb25781..f031ad47 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -17,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="103018"
-    android:versionName="1.3.18" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="103022"
+    android:versionName="1.3.22" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -124,12 +126,14 @@
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="oauth-mobile-app" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.owncloud.android.workaround.accounts.CREATE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <service android:name=".files.services.FileDownloader" >
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/actionbarsherlock b/actionbarsherlock
index 90939dc3..9598f2bb 160000
--- a/actionbarsherlock
+++ b/actionbarsherlock
@@ -1 +1 @@
-Subproject commit 90939dc3925ffaaa0de269bbbe1b35e274968ea1
+Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc
diff --git a/oc_jb_workaround/.classpath b/oc_jb_workaround/.classpath
new file mode 100644
index 00000000..3f9691c5
--- /dev/null
+++ b/oc_jb_workaround/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/oc_jb_workaround/.gitignore b/oc_jb_workaround/.gitignore
new file mode 100644
index 00000000..0105cb34
--- /dev/null
+++ b/oc_jb_workaround/.gitignore
@@ -0,0 +1,19 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Mac .DS_Store files
+.DS_Store
diff --git a/oc_jb_workaround/.project b/oc_jb_workaround/.project
new file mode 100644
index 00000000..54714bb1
--- /dev/null
+++ b/oc_jb_workaround/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>owncloud-android-workaround-accounts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oc_jb_workaround/.settings/org.eclipse.jdt.core.prefs b/oc_jb_workaround/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/oc_jb_workaround/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
new file mode 100644
index 00000000..acaf6ebc
--- /dev/null
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.owncloud.android.workaround.accounts"
+    android:versionCode="0100002"
+    android:versionName="1.0.2" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="16" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/oc_workaround_icon"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <service
+            android:name=".AccountAuthenticatorService"
+            android:exported="false">
+            <intent-filter android:priority="1">
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/oc_jb_workaround/README.md b/oc_jb_workaround/README.md
new file mode 100644
index 00000000..cddf3bda
--- /dev/null
+++ b/oc_jb_workaround/README.md
@@ -0,0 +1,10 @@
+ownCloud Jelly Bean Workaround
+==============================
+
+Helper app to work around the problem of lost credentials at reboot time found
+in devices with Android 4.1.x. 
+
+Only needed for ownCloud apps installed from the Google Play Store.
+
+See more information about the bug here: 
+http://code.google.com/p/android/issues/detail?id=34880
\ No newline at end of file
diff --git a/oc_jb_workaround/proguard-project.txt b/oc_jb_workaround/proguard-project.txt
new file mode 100644
index 00000000..f2fe1559
--- /dev/null
+++ b/oc_jb_workaround/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/oc_jb_workaround/project.properties b/oc_jb_workaround/project.properties
new file mode 100644
index 00000000..9b84a6b4
--- /dev/null
+++ b/oc_jb_workaround/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-16
diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_icon.png b/oc_jb_workaround/res/drawable-hdpi/oc_icon.png
new file mode 100644
index 00000000..e388c7be
Binary files /dev/null and b/oc_jb_workaround/res/drawable-hdpi/oc_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png
new file mode 100644
index 00000000..7daeea4a
Binary files /dev/null and b/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_icon.png b/oc_jb_workaround/res/drawable-ldpi/oc_icon.png
new file mode 100644
index 00000000..11cf0ab1
Binary files /dev/null and b/oc_jb_workaround/res/drawable-ldpi/oc_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png
new file mode 100644
index 00000000..8cd92ff9
Binary files /dev/null and b/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_icon.png b/oc_jb_workaround/res/drawable-mdpi/oc_icon.png
new file mode 100644
index 00000000..6997c7e4
Binary files /dev/null and b/oc_jb_workaround/res/drawable-mdpi/oc_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png
new file mode 100644
index 00000000..5bc795a3
Binary files /dev/null and b/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png b/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png
new file mode 100644
index 00000000..e388c7be
Binary files /dev/null and b/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png
new file mode 100644
index 00000000..7daeea4a
Binary files /dev/null and b/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png differ
diff --git a/oc_jb_workaround/res/values-v11/styles.xml b/oc_jb_workaround/res/values-v11/styles.xml
new file mode 100644
index 00000000..541752f6
--- /dev/null
+++ b/oc_jb_workaround/res/values-v11/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!--
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/oc_jb_workaround/res/values-v14/styles.xml b/oc_jb_workaround/res/values-v14/styles.xml
new file mode 100644
index 00000000..f20e0150
--- /dev/null
+++ b/oc_jb_workaround/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/oc_jb_workaround/res/values/strings.xml b/oc_jb_workaround/res/values/strings.xml
new file mode 100644
index 00000000..1bfdbe02
--- /dev/null
+++ b/oc_jb_workaround/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">ownCloud Jelly Bean Workaround for lost credentials</string>
+    <string name="oc_app_name">ownCloud</string>
+    
+</resources>
\ No newline at end of file
diff --git a/oc_jb_workaround/res/values/styles.xml b/oc_jb_workaround/res/values/styles.xml
new file mode 100644
index 00000000..4a10ca49
--- /dev/null
+++ b/oc_jb_workaround/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/oc_jb_workaround/res/xml/authenticator.xml b/oc_jb_workaround/res/xml/authenticator.xml
new file mode 100644
index 00000000..0bb57600
--- /dev/null
+++ b/oc_jb_workaround/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:accountType="owncloud"
+                       android:icon="@drawable/oc_icon"
+                       android:label="@string/oc_app_name"
+                       android:smallIcon="@drawable/oc_icon">  
+</account-authenticator>
\ No newline at end of file
diff --git a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
new file mode 100644
index 00000000..102f2be6
--- /dev/null
+++ b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
@@ -0,0 +1,139 @@
+/* ownCloud Jelly Bean Workaround for lost credentials
+ *   Copyright (C) 2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+package com.owncloud.android.workaround.accounts;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+//import android.util.Log;
+
+public class AccountAuthenticatorService extends Service {
+
+    private AccountAuthenticator mAuthenticator;
+    static final public String ACCOUNT_TYPE = "owncloud";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mAuthenticator = new AccountAuthenticator(this);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mAuthenticator.getIBinder();
+    }
+    
+    
+    public static class AccountAuthenticator extends AbstractAccountAuthenticator {
+
+        public static final String KEY_AUTH_TOKEN_TYPE = "authTokenType";
+        public static final String KEY_REQUIRED_FEATURES = "requiredFeatures";
+        public static final String KEY_LOGIN_OPTIONS = "loginOptions";
+    	
+    	public AccountAuthenticator(Context context) {
+            super(context);
+        }
+
+        @Override
+        public Bundle addAccount(AccountAuthenticatorResponse response,
+                String accountType, String authTokenType,
+                String[] requiredFeatures, Bundle options)
+                throws NetworkErrorException {
+        	//Log.e("WORKAROUND", "Yes, WORKAROUND takes the control here");
+            final Intent intent = new Intent("com.owncloud.android.workaround.accounts.CREATE");
+            intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,
+                    response);
+            intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);
+            intent.putExtra(KEY_REQUIRED_FEATURES, requiredFeatures);
+            intent.putExtra(KEY_LOGIN_OPTIONS, options);
+
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+            intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
+
+            final Bundle bundle = new Bundle();
+            bundle.putParcelable(AccountManager.KEY_INTENT, intent);
+            return bundle;
+            //return getCommonResultBundle();
+        }
+
+        
+		@Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response,
+                Account account, Bundle options) throws NetworkErrorException {
+            return getCommonResultBundle();
+        }
+
+        @Override
+        public Bundle editProperties(AccountAuthenticatorResponse response,
+                String accountType) {
+            return getCommonResultBundle();
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response,
+                Account account, String authTokenType, Bundle options)
+                throws NetworkErrorException {
+            return getCommonResultBundle();
+        }
+
+        @Override
+        public String getAuthTokenLabel(String authTokenType) {
+            return "";
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response,
+                Account account, String[] features) throws NetworkErrorException {
+            return getCommonResultBundle();
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response,
+                Account account, String authTokenType, Bundle options)
+                throws NetworkErrorException {
+            return getCommonResultBundle();
+        }
+
+        @Override
+        public Bundle getAccountRemovalAllowed(
+                AccountAuthenticatorResponse response, Account account)
+                throws NetworkErrorException {
+            return super.getAccountRemovalAllowed(response, account);
+        }
+
+        private Bundle getCommonResultBundle() {
+        	Bundle resultBundle = new Bundle();
+            resultBundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);
+            resultBundle.putString(AccountManager.KEY_ERROR_MESSAGE, "This is just a workaround, not a real account authenticator");
+            return resultBundle;
+		}
+
+    }
+}
diff --git a/project.properties b/project.properties
index d476196b..716944a4 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-17
 android.library.reference.1=actionbarsherlock/library
diff --git a/res/anim/disappear.xml b/res/anim/disappear.xml
index b1fd5e3a..1c98f627 100644
--- a/res/anim/disappear.xml
+++ b/res/anim/disappear.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<alpha
diff --git a/res/anim/grow_from_bottom.xml b/res/anim/grow_from_bottom.xml
index d2a371d1..f02d8680 100644
--- a/res/anim/grow_from_bottom.xml
+++ b/res/anim/grow_from_bottom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/grow_from_bottomleft_to_topright.xml b/res/anim/grow_from_bottomleft_to_topright.xml
index a4bf4ea2..963cfe5c 100644
--- a/res/anim/grow_from_bottomleft_to_topright.xml
+++ b/res/anim/grow_from_bottomleft_to_topright.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/grow_from_bottomright_to_topleft.xml b/res/anim/grow_from_bottomright_to_topleft.xml
index 3446623a..d7536342 100644
--- a/res/anim/grow_from_bottomright_to_topleft.xml
+++ b/res/anim/grow_from_bottomright_to_topleft.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/grow_from_top.xml b/res/anim/grow_from_top.xml
index ffd722c3..2dfe4dbb 100644
--- a/res/anim/grow_from_top.xml
+++ b/res/anim/grow_from_top.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/grow_from_topleft_to_bottomright.xml b/res/anim/grow_from_topleft_to_bottomright.xml
index b67ebe5e..8cef01b9 100644
--- a/res/anim/grow_from_topleft_to_bottomright.xml
+++ b/res/anim/grow_from_topleft_to_bottomright.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/grow_from_topright_to_bottomleft.xml b/res/anim/grow_from_topright_to_bottomleft.xml
index d4744f68..902f41ef 100644
--- a/res/anim/grow_from_topright_to_bottomleft.xml
+++ b/res/anim/grow_from_topright_to_bottomleft.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/res/anim/pump_bottom.xml b/res/anim/pump_bottom.xml
index f681951a..05827899 100644
--- a/res/anim/pump_bottom.xml
+++ b/res/anim/pump_bottom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.1" android:toXScale="1.0"
diff --git a/res/anim/pump_top.xml b/res/anim/pump_top.xml
index 65637b56..6766ea75 100644
--- a/res/anim/pump_top.xml
+++ b/res/anim/pump_top.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.1" android:toXScale="1.0"
diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
deleted file mode 100644
index 894d2223..00000000
--- a/res/anim/push_left_in.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="300"/>
-	<alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" />
-</set>
diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
deleted file mode 100644
index 28802d2e..00000000
--- a/res/anim/push_left_out.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="300"/>
-	<alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="300" />
-</set>
diff --git a/res/anim/shrink_from_bottom.xml b/res/anim/shrink_from_bottom.xml
index a98d592a..517d36c8 100644
--- a/res/anim/shrink_from_bottom.xml
+++ b/res/anim/shrink_from_bottom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/anim/shrink_from_bottomleft_to_topright.xml b/res/anim/shrink_from_bottomleft_to_topright.xml
index 6e56c1e2..c91455e9 100644
--- a/res/anim/shrink_from_bottomleft_to_topright.xml
+++ b/res/anim/shrink_from_bottomleft_to_topright.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/anim/shrink_from_bottomright_to_topleft.xml b/res/anim/shrink_from_bottomright_to_topleft.xml
index d4ed5134..7ad975bc 100644
--- a/res/anim/shrink_from_bottomright_to_topleft.xml
+++ b/res/anim/shrink_from_bottomright_to_topleft.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/anim/shrink_from_top.xml b/res/anim/shrink_from_top.xml
index 89cd8f4f..2c6fed06 100644
--- a/res/anim/shrink_from_top.xml
+++ b/res/anim/shrink_from_top.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/anim/shrink_from_topleft_to_bottomright.xml b/res/anim/shrink_from_topleft_to_bottomright.xml
index 13417287..98cc67b5 100644
--- a/res/anim/shrink_from_topleft_to_bottomright.xml
+++ b/res/anim/shrink_from_topleft_to_bottomright.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/anim/shrink_from_topright_to_bottomleft.xml b/res/anim/shrink_from_topright_to_bottomleft.xml
index d4064fcc..cb1d2928 100644
--- a/res/anim/shrink_from_topright_to_bottomleft.xml
+++ b/res/anim/shrink_from_topright_to_bottomleft.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png
index bf4b8324..08f99372 100644
Binary files a/res/drawable-hdpi/file.png and b/res/drawable-hdpi/file.png differ
diff --git a/res/drawable-hdpi/file_doc.png b/res/drawable-hdpi/file_doc.png
new file mode 100644
index 00000000..068ed572
Binary files /dev/null and b/res/drawable-hdpi/file_doc.png differ
diff --git a/res/drawable-hdpi/file_image.png b/res/drawable-hdpi/file_image.png
new file mode 100644
index 00000000..dc40bae8
Binary files /dev/null and b/res/drawable-hdpi/file_image.png differ
diff --git a/res/drawable-hdpi/file_movie.png b/res/drawable-hdpi/file_movie.png
new file mode 100644
index 00000000..2acfaf8d
Binary files /dev/null and b/res/drawable-hdpi/file_movie.png differ
diff --git a/res/drawable-hdpi/file_pdf.png b/res/drawable-hdpi/file_pdf.png
new file mode 100644
index 00000000..a4af2815
Binary files /dev/null and b/res/drawable-hdpi/file_pdf.png differ
diff --git a/res/drawable-hdpi/file_sound.png b/res/drawable-hdpi/file_sound.png
new file mode 100644
index 00000000..33045afb
Binary files /dev/null and b/res/drawable-hdpi/file_sound.png differ
diff --git a/res/drawable-hdpi/file_zip.png b/res/drawable-hdpi/file_zip.png
new file mode 100644
index 00000000..398f601d
Binary files /dev/null and b/res/drawable-hdpi/file_zip.png differ
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
index 670dd0d7..0bdcac5e 100644
Binary files a/res/drawable-hdpi/ic_menu_archive.png and b/res/drawable-hdpi/ic_menu_archive.png differ
diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png
index 8cdfc4f2..bbe560bb 100644
Binary files a/res/drawable-ldpi/file.png and b/res/drawable-ldpi/file.png differ
diff --git a/res/drawable-ldpi/file_doc.png b/res/drawable-ldpi/file_doc.png
new file mode 100644
index 00000000..a4070434
Binary files /dev/null and b/res/drawable-ldpi/file_doc.png differ
diff --git a/res/drawable-ldpi/file_image.png b/res/drawable-ldpi/file_image.png
new file mode 100644
index 00000000..b3af57ca
Binary files /dev/null and b/res/drawable-ldpi/file_image.png differ
diff --git a/res/drawable-ldpi/file_movie.png b/res/drawable-ldpi/file_movie.png
new file mode 100644
index 00000000..53bf0e78
Binary files /dev/null and b/res/drawable-ldpi/file_movie.png differ
diff --git a/res/drawable-ldpi/file_pdf.png b/res/drawable-ldpi/file_pdf.png
new file mode 100644
index 00000000..ded82499
Binary files /dev/null and b/res/drawable-ldpi/file_pdf.png differ
diff --git a/res/drawable-ldpi/file_sound.png b/res/drawable-ldpi/file_sound.png
new file mode 100644
index 00000000..6fc963f8
Binary files /dev/null and b/res/drawable-ldpi/file_sound.png differ
diff --git a/res/drawable-ldpi/file_zip.png b/res/drawable-ldpi/file_zip.png
new file mode 100644
index 00000000..04340f46
Binary files /dev/null and b/res/drawable-ldpi/file_zip.png differ
diff --git a/res/drawable-ldpi/ic_menu_archive.png b/res/drawable-ldpi/ic_menu_archive.png
index ebe6e4a2..7818537c 100644
Binary files a/res/drawable-ldpi/ic_menu_archive.png and b/res/drawable-ldpi/ic_menu_archive.png differ
diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png
index 561c788a..0a1ca52d 100644
Binary files a/res/drawable-mdpi/file.png and b/res/drawable-mdpi/file.png differ
diff --git a/res/drawable-mdpi/file_doc.png b/res/drawable-mdpi/file_doc.png
new file mode 100644
index 00000000..95651f8e
Binary files /dev/null and b/res/drawable-mdpi/file_doc.png differ
diff --git a/res/drawable-mdpi/file_image.png b/res/drawable-mdpi/file_image.png
new file mode 100644
index 00000000..2b2fff49
Binary files /dev/null and b/res/drawable-mdpi/file_image.png differ
diff --git a/res/drawable-mdpi/file_movie.png b/res/drawable-mdpi/file_movie.png
new file mode 100644
index 00000000..4c0254c4
Binary files /dev/null and b/res/drawable-mdpi/file_movie.png differ
diff --git a/res/drawable-mdpi/file_pdf.png b/res/drawable-mdpi/file_pdf.png
new file mode 100644
index 00000000..306ad99a
Binary files /dev/null and b/res/drawable-mdpi/file_pdf.png differ
diff --git a/res/drawable-mdpi/file_sound.png b/res/drawable-mdpi/file_sound.png
new file mode 100644
index 00000000..8789e5cf
Binary files /dev/null and b/res/drawable-mdpi/file_sound.png differ
diff --git a/res/drawable-mdpi/file_zip.png b/res/drawable-mdpi/file_zip.png
new file mode 100644
index 00000000..92647b83
Binary files /dev/null and b/res/drawable-mdpi/file_zip.png differ
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
index 66f02446..2c502851 100644
Binary files a/res/drawable-mdpi/ic_menu_archive.png and b/res/drawable-mdpi/ic_menu_archive.png differ
diff --git a/res/drawable/action_item_btn.xml b/res/drawable/action_item_btn.xml
index 3a48a675..47f73b22 100644
--- a/res/drawable/action_item_btn.xml
+++ b/res/drawable/action_item_btn.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     android:dither="true">
 
diff --git a/res/drawable/btn.xml b/res/drawable/btn.xml
index 8e01f676..b58eda87 100644
--- a/res/drawable/btn.xml
+++ b/res/drawable/btn.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_round_pressed" />
   <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_round_pressed" />
diff --git a/res/drawable/btn_round.xml b/res/drawable/btn_round.xml
index a7c5063f..a2c92aa8 100644
--- a/res/drawable/btn_round.xml
+++ b/res/drawable/btn_round.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?> 
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
         android:shape="rectangle"> 
         <corners android:radius="5dip" />
diff --git a/res/drawable/btn_round_pressed.xml b/res/drawable/btn_round_pressed.xml
index 34d860dc..e567a6bd 100644
--- a/res/drawable/btn_round_pressed.xml
+++ b/res/drawable/btn_round_pressed.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?> 
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
         android:shape="rectangle"> 
         <corners android:radius="5dip" />
diff --git a/res/drawable/connection_secure.xml b/res/drawable/connection_secure.xml
index b988c29b..7b2944f3 100644
--- a/res/drawable/connection_secure.xml
+++ b/res/drawable/connection_secure.xml
@@ -1,8 +1,27 @@
-<!--?xml version="1.0" encoding="utf-8"? -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 	<gradient android:endColor="#8dc73f" android:centerColor="#d4d4d4"
 		android:startColor="#d4d4d4">
-		<stroke android:width="1dp" color="#8dc73f">
+		<stroke android:width="1dp" android:color="#8dc73f">
 			<corners android:radius="5dp">
 				<padding android:left="7dp" android:top="7dp" android:right="7dp"
 					android:bottom="7dp">
diff --git a/res/drawable/icon_list_selector.xml b/res/drawable/icon_list_selector.xml
deleted file mode 100644
index f7c83929..00000000
--- a/res/drawable/icon_list_selector.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
-    <item android:drawable="@color/owncloud_white" android:state_window_focused="false"/>
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="true"/>
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index f7c83929..4af9f6b0 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2010 The Android Open Source Project
+  ownCloud Android client application
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
 
-          http://www.apache.org/licenses/LICENSE-2.0
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
 
-    <item android:drawable="@color/owncloud_white" android:state_window_focused="false"/>
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@android:color/holo_blue_bright" android:state_focused="true"/>
+    <item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
+    <item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
+    <item android:drawable="@color/owncloud_white" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml
index 04bdc465..166b666d 100644
--- a/res/drawable/main_header_bg.xml
+++ b/res/drawable/main_header_bg.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="#1D2D44" 
diff --git a/res/drawable/progress_small.xml b/res/drawable/progress_small.xml
index 7081727f..55eb2dd3 100644
--- a/res/drawable/progress_small.xml
+++ b/res/drawable/progress_small.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
 
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:drawable="@drawable/spinner_inner"
     android:pivotX="50%"
diff --git a/res/drawable/split_action_bg.xml b/res/drawable/split_action_bg.xml
index 633340c6..c0b4731b 100644
--- a/res/drawable/split_action_bg.xml
+++ b/res/drawable/split_action_bg.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="#D0D0D0" 
diff --git a/res/drawable/uploader_list_separator.xml b/res/drawable/uploader_list_separator.xml
index dfad4f10..f1c174fd 100644
--- a/res/drawable/uploader_list_separator.xml
+++ b/res/drawable/uploader_list_separator.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient android:startColor="@color/filelist_icon_backgorund" android:endColor="@color/filelist_icon_backgorund" android:angle="0"/>
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 2f54c960..b8a8fcd0 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -2,10 +2,12 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout-large-land/files.xml b/res/layout-large-land/files.xml
index 6b5d8712..90c5c543 100644
--- a/res/layout-large-land/files.xml
+++ b/res/layout-large-land/files.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2011  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index 641ed1f0..ccc62d19 100644
--- a/res/layout-v14/generic_explanation.xml
+++ b/res/layout-v14/generic_explanation.xml
@@ -2,10 +2,11 @@
 <!-- 
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 62eac2b8..a4868a4e 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -2,10 +2,12 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/action_item.xml b/res/layout/action_item.xml
index 094350c9..22847def 100644
--- a/res/layout/action_item.xml
+++ b/res/layout/action_item.xml
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
diff --git a/res/layout/authenticator_getting_started_fragment.xml b/res/layout/authenticator_getting_started_fragment.xml
index 52ee339c..3a97615f 100644
--- a/res/layout/authenticator_getting_started_fragment.xml
+++ b/res/layout/authenticator_getting_started_fragment.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/edit_box_dialog.xml b/res/layout/edit_box_dialog.xml
index f1d541ce..7dd0b3e5 100644
--- a/res/layout/edit_box_dialog.xml
+++ b/res/layout/edit_box_dialog.xml
@@ -3,9 +3,11 @@
     ownCloud Android client application
 
     Copyright (C) 2012  Bartek Przybylski
+    Copyright (C) 2012-2013 ownCloud Inc.
+
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml
index e487eb47..65dd2b3c 100644
--- a/res/layout/extensions_available_dialog.xml
+++ b/res/layout/extensions_available_dialog.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/extensions_avail"
     android:layout_width="wrap_content" android:layout_height="wrap_content"
diff --git a/res/layout/file_activity_details.xml b/res/layout/file_activity_details.xml
index f37270ba..e325e61e 100644
--- a/res/layout/file_activity_details.xml
+++ b/res/layout/file_activity_details.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/file_details_empty.xml b/res/layout/file_details_empty.xml
index d08d7285..f264cef6 100644
--- a/res/layout/file_details_empty.xml
+++ b/res/layout/file_details_empty.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index 39036778..dcce819e 100644
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/file_display_action_list_element.xml b/res/layout/file_display_action_list_element.xml
index 36ceb5f8..0d6d06e4 100644
--- a/res/layout/file_display_action_list_element.xml
+++ b/res/layout/file_display_action_list_element.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/files.xml b/res/layout/files.xml
index 9bc199bc..5633a57c 100644
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/fragment_changelog.xml b/res/layout/fragment_changelog.xml
new file mode 100644
index 00000000..ac718e81
--- /dev/null
+++ b/res/layout/fragment_changelog.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+  
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/owncloud_white" 
+    android:id="@+id/explanation"
+    android:orientation="vertical">
+
+	<TextView
+		android:id="@+id/message"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="2"
+	    android:padding="10dip"
+	    android:scrollbarAlwaysDrawVerticalTrack="true"
+		android:text="@string/text_placeholder"
+		android:autoLink="all"
+		/>
+    
+    <!-- LinearLayout
+        android:id="@+id/buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+		<Button
+		    android:id="@+id/ok"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="1"
+		    android:text="@string/common_ok" />
+		
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/common_cancel" />
+
+	</LinearLayout -->
+	
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index fbd055e6..54c5b1d4 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -2,10 +2,11 @@
 <!-- 
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/landing_page_fragment.xml b/res/layout/landing_page_fragment.xml
index 95413c0e..46e9a337 100644
--- a/res/layout/landing_page_fragment.xml
+++ b/res/layout/landing_page_fragment.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/landing_page_item.xml b/res/layout/landing_page_item.xml
index 7ef89303..80b049cb 100644
--- a/res/layout/landing_page_item.xml
+++ b/res/layout/landing_page_item.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 4d7a2374..20b317ba 100644
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index ddad38c1..4333d4d5 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 0697bd1f..568d4850 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml
index 745a6064..ef068ef7 100644
--- a/res/layout/no_account_available.xml
+++ b/res/layout/no_account_available.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/pick_account_layout.xml b/res/layout/pick_account_layout.xml
index df3ece99..23a8c79b 100644
--- a/res/layout/pick_account_layout.xml
+++ b/res/layout/pick_account_layout.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index 71eab17e..0b946450 100644
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -2,9 +2,12 @@
 <!--
   ownCloud Android client application
 
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/popup.xml b/res/layout/popup.xml
index 2f2d79a4..2d97d288 100644
--- a/res/layout/popup.xml
+++ b/res/layout/popup.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <RelativeLayout 
   xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
diff --git a/res/layout/progressbar_layout.xml b/res/layout/progressbar_layout.xml
index f398d4cb..e2e4834e 100644
--- a/res/layout/progressbar_layout.xml
+++ b/res/layout/progressbar_layout.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent" android:layout_height="fill_parent"
   android:padding="5dp">
diff --git a/res/layout/selected_account_element.xml b/res/layout/selected_account_element.xml
index fe3146e3..d4000484 100644
--- a/res/layout/selected_account_element.xml
+++ b/res/layout/selected_account_element.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 739f7f48..3cb35575 100644
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -2,10 +2,11 @@
 <!-- 
     ownCloud Android client application
 
-    Copyright (C) 2012  Bartek Przybylski
+    Copyright (C) 2012-2013 ownCloud Inc.
+
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 737d2823..9c1613ac 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -2,10 +2,11 @@
 <!-- 
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 1d22041b..89d49aba 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/layout/uploader_list_item_layout.xml b/res/layout/uploader_list_item_layout.xml
index a5688e03..5ce2dcac 100644
--- a/res/layout/uploader_list_item_layout.xml
+++ b/res/layout/uploader_list_item_layout.xml
@@ -3,9 +3,11 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
diff --git a/res/menu/account_picker.xml b/res/menu/account_picker.xml
index 800dae29..90b87e68 100644
--- a/res/menu/account_picker.xml
+++ b/res/menu/account_picker.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/createAccount" android:title="@string/create_account" android:showAsAction="ifRoom|withText"></item>
     
diff --git a/res/menu/account_picker_long_click.xml b/res/menu/account_picker_long_click.xml
index 8c8083da..a26b96df 100644
--- a/res/menu/account_picker_long_click.xml
+++ b/res/menu/account_picker_long_click.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/delete_account" android:title="@string/delete_account"></item>
     
diff --git a/res/menu/file_context_menu.xml b/res/menu/file_context_menu.xml
index 622c483d..b9bfdb7c 100644
--- a/res/menu/file_context_menu.xml
+++ b/res/menu/file_context_menu.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <menu 	xmlns:android="http://schemas.android.com/apk/res/android">
     
 	<item 	android:id="@+id/open_file_item" 
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index 4bee2e87..9ff7342f 100644
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/startSync" android:title="@string/actionbar_sync" android:icon="@drawable/ic_action_refresh"></item>
diff --git a/res/menu/session_context_menu.xml b/res/menu/session_context_menu.xml
index 53063a7f..303a7630 100644
--- a/res/menu/session_context_menu.xml
+++ b/res/menu/session_context_menu.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/SessionContextEdit" android:title="Edit"></item>
diff --git a/res/raw-de/changelog.html b/res/raw-de/changelog.html
new file mode 100644
index 00000000..c5ceda90
--- /dev/null
+++ b/res/raw-de/changelog.html
@@ -0,0 +1,31 @@
+<html>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+	<body>
+	<p>
+		Dieses Gerät läuft mit Android 4.1.x.
+	</p>
+	<p>
+		In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nötig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App: 
+	</p>
+	<p style="text-align:center">
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+	</p>
+	</body>
+</html>
diff --git a/res/raw-es/changelog.html b/res/raw-es/changelog.html
new file mode 100644
index 00000000..dec13539
--- /dev/null
+++ b/res/raw-es/changelog.html
@@ -0,0 +1,31 @@
+<html>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+	<body>
+	<p>
+		Su dispositivo ejecuta Android 4.1.x. 
+	</p>
+	<p>
+		Para prevenir la pérdida de las credenciales de sus cuentas ownCloud en cada reinicio, por favor, instale esta app gratuita que evita el problema en Jelly Bean:	
+	</p>
+	<p style="text-align:center">
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a>
+	</p>
+	</body>
+</html>
diff --git a/res/raw/changelog.html b/res/raw/changelog.html
new file mode 100644
index 00000000..d982d00d
--- /dev/null
+++ b/res/raw/changelog.html
@@ -0,0 +1,31 @@
+<html>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+	<body>
+	<p>
+		Your device runs Android 4.1.x. 
+	</p>
+	<p>
+		To prevent losing your ownCloud account credentials on every reboot, please, install this free helper app to work around the bug in Jelly Bean:
+	</p>
+	<p style="text-align:center">
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+	</p>
+	</body>
+</html>
diff --git a/res/values-af-rZA/strings.xml b/res/values-af-rZA/strings.xml
new file mode 100644
index 00000000..6834437f
--- /dev/null
+++ b/res/values-af-rZA/strings.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_settings">Instellings</string>
+  <string name="actionbar_settings">Instellings</string>
+  <string name="auth_username">Gebruikersnaam</string>
+  <string name="auth_password">Wagwoord</string>
+  <string name="setup_hint_username">Gebruikersnaam</string>
+  <string name="setup_hint_password">Wagwoord</string>
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index bca2aef2..aec32fd5 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -14,6 +14,7 @@
   <string name="actionbar_upload">Качване</string>
   <string name="actionbar_upload_files">Файлове</string>
   <string name="actionbar_settings">Настройки</string>
+  <string name="prefs_category_general">Общи</string>
   <string name="auth_host_url">Уеб адрес</string>
   <string name="auth_password">Парола</string>
   <string name="sync_string_files">Файлове</string>
@@ -21,7 +22,10 @@
   <string name="uploader_btn_upload_text">Качване</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Изход</string>
   <string name="filedetails_download">Изтегляне</string>
+  <string name="common_cancel_upload">Спри качването</string>
+  <string name="common_error">Грешка</string>
   <string name="sync_string_contacts">Контакти</string>
+  <string name="common_share">Споделяне</string>
   <string name="common_rename">Преименуване</string>
   <string name="common_remove">Премахване</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 2eac06ee..6ab3a5b6 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -55,5 +55,6 @@
   <string name="common_error">সমস্যা</string>
   <string name="uploader_info_dirname">ডিরেক্টরির নাম</string>
   <string name="common_choose_account">একাউন্ট নির্বাচন</string>
+  <string name="common_share">ভাগাভাগি কর</string>
   <string name="common_rename">পূনঃনামকরণ</string>
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 77e664dd..4d14021a 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -164,7 +164,7 @@
   <string name="extensions_avail_title">Erweiterung verfügbar!</string>
   <string name="extensions_avail_message">Scheinbar unterstützt Ihr Server weitere Erweiterungen. Möchten Sie die verfügbaren Erweiterungen für Android sehen?</string>
   <string name="fd_keep_in_sync">Datei aktuell halten</string>
-  <string name="common_share">Freigeben</string>
+  <string name="common_share">Teilen</string>
   <string name="common_rename">Umbenennen</string>
   <string name="common_remove">Löschen</string>
   <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3f557c97..ca26fdce 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -106,8 +106,8 @@
   <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
   <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
   <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
-  <string name="sync_conflicts_in_favourites_content">%1$d synchrongehaltene Dateien konnte nicht synchronisiert werden.</string>
-  <string name="sync_fail_in_favourites_ticker">Synchronhalten schlug fehl.</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d synchron zu haltende Dateien konnte nicht synchronisiert werden.</string>
+  <string name="sync_fail_in_favourites_ticker">Synchron halten schlug fehl.</string>
   <string name="sync_fail_in_favourites_content">Inhalte von %1$d konnte nicht synchronisiert werden (%2$d Konflikte)</string>
   <string name="use_ssl">Sichere Verbindung benutzen</string>
   <string name="location_no_provider">%1$s kann Dein Gerät nicht verfolgen. Bitte überprüfe Deine Standorteinstellungen</string>
@@ -181,7 +181,7 @@
   <string name="sync_file_fail_msg">Die entfernte Datei konnte nicht überprüft werden</string>
   <string name="sync_file_nothing_to_do_msg">Dateiinhalte bereits synchronisiert</string>
   <string name="create_dir_fail_msg">Das Verzeichnis konnte nicht erstellt werden.</string>
-  <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
+  <string name="wait_a_moment">Bitte warte einen Moment.</string>
   <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
   <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
   <string name="ssl_validator_title">Warnung</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d1924067..5b8691a4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -103,7 +103,7 @@
   <string name="downloader_download_failed_content">La descarga de %1$s no se pudo completar</string>
   <string name="common_choose_account">Elige una cuenta</string>
   <string name="sync_string_contacts">Contactos</string>
-  <string name="sync_fail_ticker">Fallór la sincronización</string>
+  <string name="sync_fail_ticker">Falló la sincronización</string>
   <string name="sync_fail_content">La sincronización de %1$s s no se pudo completar</string>
   <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
   <string name="sync_conflicts_in_favourites_content">Falló la sincronización de contenidos de %1$d ficheros</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fc31ce0f..7b3f7608 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -59,7 +59,7 @@
   <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>
   <string name="uploader_wrn_no_content_title">Ez dago igotzeko edukirik</string>
   <string name="uploader_wrn_no_content_text">Ez da edukirik jaso. Ez dago ezer igotzeko.</string>
-  <string name="uploader_error_forbidden_content">ownCloudek ez du baimenik partekatutako edukian sartzeko</string>
+  <string name="uploader_error_forbidden_content">%1$s-(e)k ez du baimenik elkarbanatutako edukian sartzeko</string>
   <string name="uploader_info_uploading">Igotzen</string>
   <string name="uploader_btn_create_dir_text">Sortu igotzeko karpeta bat</string>
   <string name="file_list_empty">Ez dago fitxategirik karpeta honetan.\nFitxategi berriak \"Igo\" menu aukerarekin gehi daitezke.</string>
@@ -195,11 +195,17 @@
   <string name="ssl_validator_not_saved">Ziurtagiria ezin da gorde</string>
   <string name="ssl_validator_btn_details_see">Xehetasunak</string>
   <string name="ssl_validator_btn_details_hide">Ezkutatu</string>
+  <string name="ssl_validator_label_subject">Honi bidalita:</string>
+  <string name="ssl_validator_label_issuer">Honek bidalita:</string>
   <string name="ssl_validator_label_CN">Izen arrunta:</string>
   <string name="ssl_validator_label_O">Erakundea:</string>
+  <string name="ssl_validator_label_OU">Erakunde atala:</string>
   <string name="ssl_validator_label_C">Herrialdea:</string>
   <string name="ssl_validator_label_ST">Estatua:</string>
   <string name="ssl_validator_label_L">Kokapena:</string>
+  <string name="ssl_validator_label_validity">Baliozkotasuna:</string>
+  <string name="ssl_validator_label_validity_from">Noiztik:</string>
+  <string name="ssl_validator_label_validity_to">Noiz arte:</string>
   <string name="ssl_validator_label_signature">Sinadura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmoa:</string>
   <string name="text_placeholder">Hau leku-marka da</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e51845ba..50fb8e34 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -13,13 +13,20 @@
   <string name="main_settings">تنظیمات</string>
   <string name="main_tit_accsetup">نصب حساب کاربری</string>
   <string name="main_wrn_accsetup">حساب کاربری ownCloud در دستگاه شما وجود ندارد. برای استفاده از این برنامه می‌بایست یکی ایجاد کنید.</string>
+  <string name="actionbar_sync">بازنمایی</string>
   <string name="actionbar_upload">بارگزاری</string>
   <string name="actionbar_upload_files">پرونده‌ها</string>
   <string name="actionbar_mkdir">ایجاد پوشه</string>
   <string name="actionbar_search">جست‌و‌جو</string>
   <string name="actionbar_settings">تنظیمات</string>
   <string name="prefs_category_general">عمومی</string>
+  <string name="prefs_category_trackmydevice">ردیابی دستگاه</string>
+  <string name="prefs_add_session">ایجاد جلسه جدید</string>
+  <string name="prefs_create_img_thumbnails">ایجاد پیش نمایش تصاویر</string>
   <string name="prefs_select_oc_account">انتخاب یک حساب</string>
+  <string name="prefs_trackmydevice">ردیابی دستگاه</string>
+  <string name="prefs_trackmydevice_summary_off">برنامه را فعال کنید تا محل دستگاه شما پیگیری شود</string>
+  <string name="prefs_trackmydevice_interval">به روز رسانی بازه</string>
   <string name="prefs_accounts">حساب‌ها</string>
   <string name="auth_host_url">آدرس ownCloud </string>
   <string name="auth_username">نام کاربری</string>
@@ -36,9 +43,16 @@
   <string name="uploader_wrn_no_content_title">هیچ مطلبی بارگزاری نشده‌ است</string>
   <string name="uploader_wrn_no_content_text">هیچ مطلبی دریافت نشده است. هیچ‌‌چیزی بارگزاری نشده.</string>
   <string name="uploader_info_uploading">در حال بارگزاری</string>
+  <string name="uploader_btn_create_dir_text">ایجاد دایرکتوری برای بارگذاری</string>
+  <string name="filedetails_size">اندازه</string>
+  <string name="filedetails_type">نوع:</string>
+  <string name="filedetails_created">ایجاد شده توسط:</string>
+  <string name="filedetails_modified">تغییر یافته توسط:</string>
   <string name="filedetails_download">بارگیری</string>
+  <string name="filedetails_sync_file">بازنمایی</string>
   <string name="filedetails_redownload">بارگزاری دوباره</string>
   <string name="common_yes">بله</string>
+  <string name="common_no">نه</string>
   <string name="common_ok">باشه</string>
   <string name="common_cancel_upload">متوقف کردن بار گذاری</string>
   <string name="common_cancel">منصرف شدن</string>
@@ -54,14 +68,22 @@
   <string name="downloader_download_succeeded_ticker">بارگیری موفقیت‌آمیز بود</string>
   <string name="downloader_download_failed_ticker">بارگیری ناموفق بود</string>
   <string name="sync_string_contacts">ارتباط‌ها</string>
+  <string name="auth_nossl_plain_ok_title">اتصال امن در دسترس نیست</string>
+  <string name="auth_connection_established">اتصال برقرار شد</string>
   <string name="auth_testing_connection">آزمایش اتصال...</string>
+  <string name="auth_unknown_error_title">خطای ناشناخته رخ داده است!</string>
   <string name="auth_login_details">جزئیات ورود</string>
   <string name="crashlog_send_report">ارسال گزارش</string>
   <string name="crashlog_dont_send_report">گزارش را ارسال نکن</string>
   <string name="common_share">اشتراک‌گزاری</string>
   <string name="common_rename">تغییرنام</string>
   <string name="common_remove">حذف</string>
+  <string name="confirmation_remove_remote">پاک کردن از سرور</string>
   <string name="wait_a_moment">لحظه‌ای صبر کنید</string>
   <string name="filedisplay_no_file_selected">هیچ پرونده‌ای انتخاب نشده است</string>
   <string name="ssl_validator_title">اخطار</string>
+  <string name="ssl_validator_btn_details_see">جزییات</string>
+  <string name="ssl_validator_btn_details_hide">پنهان کردن</string>
+  <string name="ssl_validator_label_C">کشور:</string>
+  <string name="instant_upload_on_wifi">تصاویر را فقط از طریق wifi بارگذاری کن</string>
 </resources>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index ab6541d4..280ca694 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -72,6 +72,7 @@
   <string name="filedetails_sync_file">Päivitä</string>
   <string name="filedetails_redownload">Lataa uudelleen</string>
   <string name="filedetails_open">Avaa</string>
+  <string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
   <string name="common_yes">Kyllä</string>
   <string name="common_no">Ei</string>
   <string name="common_ok">OK</string>
@@ -105,6 +106,9 @@
   <string name="sync_fail_ticker">Synkronointi epäonnistui</string>
   <string name="sync_fail_content">Kohteen %1$s synkronointia ei voitu suorittaa loppuun</string>
   <string name="sync_conflicts_in_favourites_ticker">Ristiriitoja löytynyt</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d \"pidä synkronoituna\" tiedostoja ei voitu synkronoida</string>
+  <string name="sync_fail_in_favourites_ticker">\"Pidä synkronoituna\" epäonnistui</string>
+  <string name="sync_fail_in_favourites_content">Hakemiston %1$d tiedostoja ei voitu synkronoida (%2$d konfliktia)</string>
   <string name="use_ssl">Käytä salattua yhteyttä</string>
   <string name="location_no_provider">ownCloud ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
   <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
@@ -164,7 +168,9 @@
   <string name="common_rename">Nimeä uudelleen</string>
   <string name="common_remove">Poista</string>
   <string name="confirmation_remove_alert">Haluatko poistaa kohteen %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Haluatko poistaa kohteen %1$s ja sen sisällön?</string>
   <string name="confirmation_remove_local">Vain paikallinen</string>
+  <string name="confirmation_remove_folder_local">Vain paikallinen sisältö</string>
   <string name="confirmation_remove_remote">Poista palvelimelta</string>
   <string name="confirmation_remove_remote_and_local">Sekä etä- että paikallinen</string>
   <string name="remove_success_msg">Poistettu onnistuneesti</string>
@@ -172,6 +178,8 @@
   <string name="rename_dialog_title">Anna uusi nimi</string>
   <string name="rename_local_fail_msg">Paikallista kopiota ei voitu uudelleennimetä; yritä eri nimellä</string>
   <string name="rename_server_fail_msg">Nimen muutos epäonnistui</string>
+  <string name="sync_file_fail_msg">Etäpään tiedostoa ei voitu tarkistaa</string>
+  <string name="sync_file_nothing_to_do_msg">Tiedoston sisältö on jo synkronoitu</string>
   <string name="create_dir_fail_msg">Kansion luonti epäonnistui</string>
   <string name="wait_a_moment">Odota hetki</string>
   <string name="filedisplay_unexpected_bad_get_content">Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella</string>
@@ -180,6 +188,8 @@
   <string name="ssl_validator_header">Sivuston identiteetin vahvistaminen ei onnistunut</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Palvelimen varmenteeseen ei luoteta</string>
   <string name="ssl_validator_reason_cert_expired">- Palvelimen varmenne on vanhentunut</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Palvelimen varmenteen kelvolliset päivät ovat tulevaisuudessa</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Osoite ei vastaa sertifikaatissa mainittua isäntänimeä</string>
   <string name="ssl_validator_certificate_not_available">Palvelimen varmenteen noutaminen epäonnistui</string>
   <string name="ssl_validator_question">Haluatko silti luottaa tähän varmenteeseen?</string>
   <string name="ssl_validator_not_saved">Varmenteen tallennus epäonnistui</string>
@@ -198,7 +208,9 @@
   <string name="ssl_validator_label_validity_to">Päättyen:</string>
   <string name="ssl_validator_label_signature">Allekirjoitus:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmi:</string>
+  <string name="text_placeholder">Tämä on paikkavaraus</string>
   <string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
+  <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Päivitysristiriita</string>
   <string name="conflict_message">Etätiedostoa %s ei ole synkronoitu paikallisen tiedoston kanssa. Jatkaminen korvaa palvelimella olevan tiedoston sisällön.</string>
   <string name="conflict_keep_both">Säilytä molemmat</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 9ede58b9..4cf5de2a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -4,7 +4,7 @@
   <string name="main_password">Contrasinal:</string>
   <string name="main_login">Nome de usuario:</string>
   <string name="main_button_login">Acceso</string>
-  <string name="main_welcome">Benvido/a a ownCloud</string>
+  <string name="main_welcome">Benvido/a</string>
   <string name="main_files">Ficheiros</string>
   <string name="main_music">Música</string>
   <string name="main_contacts">Contactos</string>
@@ -12,10 +12,10 @@
   <string name="main_bookmarks">Marcadores</string>
   <string name="main_settings">Preferencias</string>
   <string name="main_tit_accsetup">Activar a conta</string>
-  <string name="main_wrn_accsetup">Non hai contas de ownCloud no teu dispositivo. Para empregar o aplicativos necesitas crear unha.</string>
-  <string name="about_message">O cliente de ownCloud para Android\n\nversion: %1$s</string>
+  <string name="main_wrn_accsetup">Non hai ningunha conta configurada no seu dispositivo. Para empregar o aplicativo necesita crear unha.</string>
+  <string name="about_message">O aplicativo  %1$s para Android\n\nversión: %2$s</string>
   <string name="actionbar_sync">Actualizar</string>
-  <string name="actionbar_upload">Subir</string>
+  <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Contido doutros aplicativos</string>
   <string name="actionbar_upload_files">Ficheiros</string>
   <string name="actionbar_mkdir">Crear un directorio</string>
@@ -26,99 +26,101 @@
   <string name="prefs_add_session">Engadir unha nova sesión</string>
   <string name="prefs_create_img_thumbnails">Crear miniaturas das imaxes</string>
   <string name="prefs_select_oc_account">Escoller unha conta</string>
-  <string name="prefs_summary_select_oc_account">Escolle cal das túas contas ten que usar o aplicativo.</string>
+  <string name="prefs_summary_select_oc_account">Escolla cal das súas contas ten que usar o aplicativo.</string>
   <string name="prefs_trackmydevice">Rastrexamento do dispositivo</string>
-  <string name="prefs_trackmydevice_summary_off">Permitir que ownCloud rexistre as posicións do teu dispositivo</string>
-  <string name="prefs_trackmydevice_summary_on">O teu ownCloud mantén o rexistro de posicións do teu dispositivo</string>
+  <string name="prefs_trackmydevice_summary_off">Permitir que este aplicativo rexistre as posicións do seu dispositivo</string>
+  <string name="prefs_trackmydevice_summary_on">Este aplicativo mantén o rexistro de posicións do seu dispositivo</string>
   <string name="prefs_trackmydevice_interval">Intervalo de actualizacións</string>
   <string name="prefs_trackmydevice_interval_summary">Actualizar cada %1$s minutos</string>
   <string name="prefs_accounts">Contas</string>
   <string name="prefs_manage_accounts">Xestionar as contas</string>
-  <string name="prefs_pincode">PIN do aplicativo ownCloud</string>
-  <string name="prefs_pincode_summary">Protexe o teu cliente de ownCloud</string>
-  <string name="prefs_instant_upload">Activar a subida instantánea</string>
-  <string name="prefs_instant_upload_summary">Subir instantaneamente as fotos sacadas coa cámara</string>
-  <string name="auth_host_url">URL de ownCloud</string>
+  <string name="prefs_pincode">PIN do aplicativo</string>
+  <string name="prefs_pincode_summary">Protexe o seu cliente</string>
+  <string name="prefs_instant_upload">Activar o envío instantáneo</string>
+  <string name="prefs_instant_upload_summary">Enviar instantaneamente as fotos tiradas coa cámara</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Nome de usuario</string>
   <string name="auth_password">Contrasinal</string>
-  <string name="auth_register">Son novo en ownCloud</string>
-  <string name="new_session_uri_error">Deuse unha URL errada</string>
-  <string name="new_session_session_name_error">Usuario de sesión errado</string>
+  <string name="auth_register">Son novo en  %1$s</string>
+  <string name="new_session_uri_error">Deuse un enderezo incorrecto</string>
+  <string name="new_session_session_name_error">Nome de sesión incorrecto</string>
   <string name="sync_string_files">Ficheiros</string>
-  <string name="uploader_no_file_selected">Non se escolleron ficheiros para subir</string>
+  <string name="uploader_no_file_selected">Non se escolleron ficheiros para enviar</string>
   <string name="setup_hint_username">Nome de usuario</string>
   <string name="setup_hint_password">Contrasinal</string>
-  <string name="setup_hint_address">Dirección web</string>
-  <string name="setup_hint_show_password">Mostrar o contrasinal?</string>
-  <string name="setup_title">Conectar co teu ownCloud</string>
+  <string name="setup_hint_address">Enderezo web</string>
+  <string name="setup_hint_show_password">Amosar o contrasinal?</string>
+  <string name="setup_title">Conectar co seu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
-  <string name="uploader_btn_upload_text">Subir</string>
+  <string name="uploader_btn_upload_text">Enviar</string>
   <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
-  <string name="uploader_wrn_no_account_text">Non hai contas de ownCloud no teu dispositivo. Crea unha nova conta primeiro.</string>
+  <string name="uploader_wrn_no_account_text">Non hai contas de %1$s no seu dispositivo. Cree unha nova conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Saír</string>
-  <string name="uploader_wrn_no_content_title">Non hai contido para subir</string>
+  <string name="uploader_wrn_no_content_title">Non hai contido para enviar</string>
   <string name="uploader_wrn_no_content_text">Non se recibiu contido. Non hai nada para enviar.</string>
-  <string name="uploader_error_forbidden_content">Non se lle permite a ownCloud a que acceda ao contido compartido</string>
+  <string name="uploader_error_forbidden_content">%1$s non ten permiso para acceder ao contido compartido</string>
   <string name="uploader_info_uploading">Enviando</string>
   <string name="uploader_btn_create_dir_text">Crear un directorio para os envíos</string>
-  <string name="file_list_empty">Non hai ficheiros neste cartafol.\nOs novos ficheiros pódense engadir ca opción do menú «Subir»</string>
-  <string name="filedetails_select_file">Déalle a un ficheiro para que mostre a información adicional</string>
+  <string name="file_list_empty">Non hai ficheiros neste cartafol.\nOs novos ficheiros pódense engadir ca opción do menú «Enviar».</string>
+  <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
   <string name="filedetails_created">Creado:</string>
   <string name="filedetails_modified">Modificado:</string>
-  <string name="filedetails_download">Baixar</string>
+  <string name="filedetails_download">Descargar</string>
   <string name="filedetails_sync_file">Actualizar</string>
-  <string name="filedetails_redownload">Actualizar</string>
+  <string name="filedetails_redownload">Descargar de novo</string>
   <string name="filedetails_open">Abrir</string>
-  <string name="filedetails_renamed_in_upload_msg">O ficheiroi renomeouse a %1$s durante a subida</string>
+  <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado a %1$s durante o envío</string>
   <string name="common_yes">Si</string>
   <string name="common_no">Non</string>
   <string name="common_ok">Aceptar</string>
   <string name="common_cancel_download">Cancelar a descarga</string>
-  <string name="common_cancel_upload">Cancelar a subida</string>
+  <string name="common_cancel_upload">Cancelar o envío</string>
   <string name="common_cancel">Cancelar</string>
-  <string name="common_save_exit">Gardar &amp; Saír</string>
-  <string name="common_exit">Saír de ownCloud</string>
+  <string name="common_save_exit">Gardar e saír</string>
+  <string name="common_exit">Abandonar %1$s</string>
   <string name="common_error">Erro</string>
-  <string name="about_title">Acerca de</string>
+  <string name="about_title">Sobre</string>
   <string name="delete_account">Eliminar a conta</string>
-  <string name="create_account">Crear a conta</string>
-  <string name="upload_chooser_title">Subir desde...</string>
+  <string name="create_account">Crear unha conta</string>
+  <string name="upload_chooser_title">Enviar desde…</string>
   <string name="uploader_info_dirname">Nome do directorio</string>
-  <string name="uploader_upload_in_progress_ticker">Subindo...</string>
-  <string name="uploader_upload_in_progress_content">%1$d%% Subindo %2$s</string>
-  <string name="uploader_upload_succeeded_ticker">Subiuse correctamente</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s subiuse correctamente</string>
-  <string name="uploader_upload_succeeded_content_multiple">Os ficheiros %1$d subíronse correctamente</string>
-  <string name="uploader_upload_failed_ticker">Fallou o envío</string>
-  <string name="uploader_upload_failed_content_single">O envío de %1$s non se puido completar</string>
-  <string name="uploader_upload_failed_content_multiple">Fallou o envío: subíronse %1$d/%2$d ficheiros</string>
-  <string name="downloader_download_in_progress_ticker">Descargando...</string>
-  <string name="downloader_download_in_progress_content">%1$d%% Descargando %2$s</string>
+  <string name="uploader_upload_in_progress_ticker">Enviando…</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% enviando %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Enviado correctamente</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s foi enviado correctamente</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d ficheiros foron enviados correctamente</string>
+  <string name="uploader_upload_failed_ticker">Produciuse un fallou no envío</string>
+  <string name="uploader_upload_failed_content_single">Non foi posíbel completar o envío de %1$s</string>
+  <string name="uploader_upload_failed_content_multiple">Produciuse un fallou no envío: enviáronse %1$d/%2$d ficheiros</string>
+  <string name="downloader_download_in_progress_ticker">Descargando…</string>
+  <string name="downloader_download_in_progress_content">%1$d%% descargando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Completouse a descarga</string>
   <string name="downloader_download_succeeded_content">%1$s descargouse correctamente</string>
-  <string name="downloader_download_failed_ticker">Fallou a descarga</string>
-  <string name="downloader_download_failed_content">Non se puido completar a descarga de %1$s</string>
+  <string name="downloader_download_failed_ticker">Produciuse un fallo na descarga</string>
+  <string name="downloader_download_failed_content">Non foi posíbel completar a descarga de %1$s</string>
   <string name="common_choose_account">Escoller unha conta</string>
   <string name="sync_string_contacts">Contactos</string>
-  <string name="sync_fail_ticker">Fallou a sincronización</string>
-  <string name="sync_fail_content">Non se puido rematar a sincronización de %1$s</string>
+  <string name="sync_fail_ticker">Produciuse un fallo na sincronización</string>
+  <string name="sync_fail_content">Non foi posíbel completar a sincronización de %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Atopáronse conflictos</string>
-  <string name="sync_fail_in_favourites_content">Os contidos dos ficheiros %1$d non se puideron sincronizar (%1$d conflictos)</string>
+  <string name="sync_conflicts_in_favourites_content">Non foi posíbel sincronizar %1$d ficheiros «kept-in-sync»</string>
+  <string name="sync_fail_in_favourites_ticker">Produciuse un fallou ao sincronizar ficheiros «kept-in-sync»</string>
+  <string name="sync_fail_in_favourites_content">Non foi posíbel sincronizar o contido de %1$d ficheiros (%2$d conflitos)</string>
   <string name="use_ssl">Empregar a conexión segura</string>
-  <string name="location_no_provider">ownCloud non pode seguir o teu dispositivo. Comproba as configuracións de de localización.</string>
-  <string name="pincode_enter_pin_code">Introduce o teu PIN de aplicación</string>
-  <string name="pincode_enter_new_pin_code">Introduce o teu PIN da app</string>
-  <string name="pincode_configure_your_pin">Introduce o PIN da app ownCloud</string>
-  <string name="pincode_configure_your_pin_explanation">Pedirase o PIN cada vez que se inicie o aplicativo</string>
-  <string name="pincode_reenter_your_pincode">Volve a introducir o PIN da app ownCloud</string>
-  <string name="pincode_remove_your_pincode">Elimina o PIN da app ownCloud</string>
-  <string name="pincode_mismatch">Os dous PIN da app ownCloud non son iguais</string>
-  <string name="pincode_wrong">PIN incorrecto da app ownCloud</string>
-  <string name="pincode_removed">Eliminouse o PIN da app ownCloud</string>
-  <string name="pincode_stored">Almacenouse o PIN da app ownCloud</string>
+  <string name="location_no_provider">%1$s non pode rastrexar o seu dispositivo. Comprobe as configuracións de localización.</string>
+  <string name="pincode_enter_pin_code">Insira o seu PIN do aplicativo</string>
+  <string name="pincode_enter_new_pin_code">Insira o seu novo PIN do aplicativo</string>
+  <string name="pincode_configure_your_pin">Introduza o seu PIN do aplicativo</string>
+  <string name="pincode_configure_your_pin_explanation">Pediráselle o PIN cada vez que se inicie o aplicativo</string>
+  <string name="pincode_reenter_your_pincode">Volva a introducir o seu PIN do aplicativo</string>
+  <string name="pincode_remove_your_pincode">Retirar o seu PIN do aplicativo</string>
+  <string name="pincode_mismatch">Os PIN do aplicativo non son iguais</string>
+  <string name="pincode_wrong">PIN do aplicativo incorrecto</string>
+  <string name="pincode_removed">O PIN do aplicativo foi retirado</string>
+  <string name="pincode_stored">Almacenouse o PIN do aplicativo</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minutos</item>
     <item>30 minutos</item>
@@ -129,68 +131,68 @@
     <item>30</item>
     <item>60</item>
   </string-array>
-  <string name="auth_trying_to_login">Intentando acceder...</string>
+  <string name="auth_trying_to_login">Tentando acceder…</string>
   <string name="auth_no_net_conn_title">Sen conexión de rede</string>
-  <string name="auth_no_net_conn_message">Non se detectaron conexións a rede. Comproba a conexión a internet e proba de novo.</string>
+  <string name="auth_no_net_conn_message">Non se detectaron conexións de rede. Comprobe a conexión a Internet e tenteo de novo.</string>
   <string name="auth_connect_anyway">Conectar igualmente</string>
   <string name="auth_nossl_plain_ok_title">Non hai conexión seguras dispoñíbeis.</string>
-  <string name="auth_nossl_plain_ok_message">O aplicativo non puido facer unha conexión segura co servidor. Inda que non é segura, hai unha conexión posíbel. Podes continuar ou cancelala.</string>
+  <string name="auth_nossl_plain_ok_message">O aplicativo non puido facer unha conexión segura co servidor. Inda que non é segura, hai unha conexión posíbel. Pode continuar ou cancelala.</string>
   <string name="auth_connection_established">Estabeleceuse a conexión</string>
-  <string name="auth_testing_connection">Comprobando a conexión...</string>
-  <string name="auth_not_configured_title">Configuración errada de ownCloud</string>
-  <string name="auth_not_configured_message">Semella que a túa instancia de ownCloud non está configurada correctamente. Contacta co teu administrador para máis detalles.</string>
-  <string name="auth_unknown_error_title">Ocorreu un erro descoñecido!</string>
-  <string name="auth_unknown_error_message">Ocorreu un erro descoñecido. Contacta cos autores e infórmaos do fallo cos rexistros de erro do teu dispositivo.</string>
-  <string name="auth_unknown_host_title">Non atopou o servidor</string>
-  <string name="auth_unknown_host_message">Non se puido atopar o servidor que se indicou. Comproba o nome do host e proba de novo.</string>
-  <string name="auth_incorrect_path_title">Non se atopa unha instancia de ownCloud</string>
-  <string name="auth_incorrect_path_message">O aplicativo non atopou instancias de ownCloud na rua que se indicou. Comproba a ruta e proba de novo.</string>
-  <string name="auth_timeout_title">O servidor tardou en responder</string>
-  <string name="auth_incorrect_address_title">URL mal formada</string>
-  <string name="auth_ssl_general_error_title">Fallou a inicialización de SSL</string>
-  <string name="auth_ssl_unverified_server_title">Non se verificou a identidade do servidor SSL</string>
-  <string name="auth_bad_oc_version_title">Versión do servidor de ownCloud non recoñecida</string>
-  <string name="auth_wrong_connection_title">Non se pode establecer a conexión</string>
-  <string name="auth_secure_connection">Fíxose unha conexión segura</string>
+  <string name="auth_testing_connection">Comprobando a conexión…</string>
+  <string name="auth_not_configured_title">Configuración errada do servidor</string>
+  <string name="auth_not_configured_message">Semella que a súa instancia do servidor non está configurada correctamente. Contacte co seu administrador para máis detalles.</string>
+  <string name="auth_unknown_error_title">Produciuse un erro descoñecido!</string>
+  <string name="auth_unknown_error_message">Produciuse un erro descoñecido. Contacte cos autores e infórmeos do fallo cos rexistros de erro do seu dispositivo.</string>
+  <string name="auth_unknown_host_title">Non foi posíbel atopar a máquina</string>
+  <string name="auth_unknown_host_message">Non foi posíbel atopar a máquina indicada. Comprobe o nome da máquina e tenteo de novo.</string>
+  <string name="auth_incorrect_path_title">Non se atopou unha instancia do servidor</string>
+  <string name="auth_incorrect_path_message">O aplicativo non atopou instancias do servidor na ruta indicada. Comprobe a ruta e tenteo de novo.</string>
+  <string name="auth_timeout_title">O servidor tardou demasiado en responder</string>
+  <string name="auth_incorrect_address_title">URL incorrecto</string>
+  <string name="auth_ssl_general_error_title">Produciuse un fallo ao iniciar o SSL</string>
+  <string name="auth_ssl_unverified_server_title">A identidade SSL do servidor non foi verficada</string>
+  <string name="auth_bad_oc_version_title">Versión do servidor non recoñecida</string>
+  <string name="auth_wrong_connection_title">Non é posíbel estabelecer a conexión</string>
+  <string name="auth_secure_connection">Estabeleceuse unha conexión segura</string>
   <string name="auth_login_details">Detalles do acceso</string>
   <string name="auth_unauthorized">Usuario ou contrasinal incorrectos</string>
-  <string name="auth_not_found">Deuse unha ruta errada</string>
-  <string name="auth_internal">Erro interno do servidor, código %1$d</string>
-  <string name="crashlog_message">O aplicativo deixou de funcionar de xeito inesperado. Queres enviar un informe desta quebra?</string>
-  <string name="crashlog_send_report">Envíar un informe</string>
-  <string name="crashlog_dont_send_report">Non envíar un informe</string>
-  <string name="extensions_avail_title">Engadido dispoñíbel!</string>
-  <string name="extensions_avail_message">Semella que a túa instancia de ownCloud non soporta engadidos avanzados. Queres ver se hai engadidos dispoñíbeis para Android?</string>
-  <string name="fd_keep_in_sync">Manter o ficheiro ao día</string>
+  <string name="auth_not_found">Deuse unha ruta incorrecta</string>
+  <string name="auth_internal">Produciuse un erro interno do servidor, código %1$d</string>
+  <string name="crashlog_message">O aplicativo deixou de funcionar de xeito inesperado. Quere enviar un informe desta quebra?</string>
+  <string name="crashlog_send_report">Enviar un informe</string>
+  <string name="crashlog_dont_send_report">Non enviar un informe</string>
+  <string name="extensions_avail_title">Extensión dispoñíbel!</string>
+  <string name="extensions_avail_message">Semella que a súa instancia do servidor admite extensións avanzadas. Quere ver se hai extensións dispoñíbeis para Android ?</string>
+  <string name="fd_keep_in_sync">Manter actualizado o ficheiro</string>
   <string name="common_share">Compartir</string>
   <string name="common_rename">Renomear</string>
-  <string name="common_remove">Eliminar</string>
-  <string name="confirmation_remove_alert">Queres eliminar %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Seguro que queres eliminar %1$s e o seu contido?</string>
+  <string name="common_remove">Retirar</string>
+  <string name="confirmation_remove_alert">Confirma que quere retirar %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Confirma que quere retirar %1$s e o seu contido ?</string>
   <string name="confirmation_remove_local">Só local</string>
   <string name="confirmation_remove_folder_local">Só contidos locais</string>
-  <string name="confirmation_remove_remote">Eliminar do servidor</string>
+  <string name="confirmation_remove_remote">Retirar do servidor</string>
   <string name="confirmation_remove_remote_and_local">Remoto e local</string>
-  <string name="remove_success_msg">Eliminouse correctamente</string>
-  <string name="remove_fail_msg">Non se puido eliminar completamente</string>
-  <string name="rename_dialog_title">Inrtoducir un novo nome</string>
-  <string name="rename_local_fail_msg">Non se lle puido cambiar o nome a copia local. Proba con outro nome diferente.</string>
-  <string name="rename_server_fail_msg">Non se rematou o cambio de nome</string>
-  <string name="sync_file_fail_msg">Non se puido comprobar o ficheiro remoto</string>
+  <string name="remove_success_msg">Retirado correctamente</string>
+  <string name="remove_fail_msg">Non foi posíbel retiralo</string>
+  <string name="rename_dialog_title">Introducir un novo nome</string>
+  <string name="rename_local_fail_msg">Non foi posíbel cambiarlle o nome á copia local. Proba con outro nome diferente.</string>
+  <string name="rename_server_fail_msg">Non foi posíbel completar a operación de cambio de nome</string>
+  <string name="sync_file_fail_msg">Non foi posíbel comprobar o ficheiro remoto</string>
   <string name="sync_file_nothing_to_do_msg">Os contidos do ficheiro xa están sincronizados</string>
-  <string name="create_dir_fail_msg">Non se puido crear o directorio</string>
-  <string name="wait_a_moment">Agarda un momento</string>
-  <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Escolle outro aplicativo para seleccionar o ficheiro.</string>
+  <string name="create_dir_fail_msg">Non foi posíbel crear o directorio</string>
+  <string name="wait_a_moment">Agarde un chisco</string>
+  <string name="filedisplay_unexpected_bad_get_content">Produciuse un erro non agardado. Seleccione o ficheiro con outro aplicativo diferente</string>
   <string name="filedisplay_no_file_selected">Non se escolleu ningún ficheiro</string>
-  <string name="ssl_validator_title">Advertencia</string>
-  <string name="ssl_validator_header">A identidade do sitio non se puido verificar</string>
-  <string name="ssl_validator_reason_cert_not_trusted">Non se confía no certificado do servidor</string>
-  <string name="ssl_validator_reason_cert_expired">O certificado do servidor caducou</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid">O certificado do servidor é moi novo</string>
-  <string name="ssl_validator_reason_hostname_not_verified">A URL non coincide co nome de host do certificado</string>
-  <string name="ssl_validator_certificate_not_available">Non se puido obter o certificado do servidor</string>
-  <string name="ssl_validator_question">Queres confiar neste certificado igualmente?</string>
-  <string name="ssl_validator_not_saved">Non se puido gardar o certificado</string>
+  <string name="ssl_validator_title">Aviso</string>
+  <string name="ssl_validator_header">Non foi posíbel verificar a identidade do sitio</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor non é de confianza</string>
+  <string name="ssl_validator_reason_cert_expired">- O certificado do servidor caducou</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- As datas de validez do certificado están son do futuro</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- O URL non coincide co nome de máquina no certificado</string>
+  <string name="ssl_validator_certificate_not_available">Non foi posíbel obter o certificado do servidor</string>
+  <string name="ssl_validator_question">Aínda así, quere fiar neste certificado igualmente?</string>
+  <string name="ssl_validator_not_saved">Non foi posíbel gardar o certificado</string>
   <string name="ssl_validator_btn_details_see">Detalles</string>
   <string name="ssl_validator_btn_details_hide">Agochar</string>
   <string name="ssl_validator_label_subject">Emitido para:</string>
@@ -207,11 +209,11 @@
   <string name="ssl_validator_label_signature">Sinatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmo:</string>
   <string name="text_placeholder">Isto é unha marca de posición</string>
-  <string name="instant_upload_on_wifi">Subir imaxes só con WiFi</string>
-  <string name="instant_upload_path">/SubidaInstantánea</string>
-  <string name="conflict_title">Actualizar o conflito</string>
+  <string name="instant_upload_on_wifi">Enviar imaxes só medinte WiFi</string>
+  <string name="instant_upload_path">/EnvíoInstantáneo</string>
+  <string name="conflict_title">Conflito de actualización</string>
   <string name="conflict_message">O ficheiro remoto %s non está sincronizado co ficheiro local. Continuando substituirase o contido do ficheiro no servidor.</string>
   <string name="conflict_keep_both">Manter ambos</string>
   <string name="conflict_overwrite">Sobrescribir</string>
-  <string name="conflict_dont_upload">Non subir</string>
+  <string name="conflict_dont_upload">Non enviar</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3daa83c0..e70625ec 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="main_settings">सेटिंग्स</string>
+  <string name="actionbar_settings">सेटिंग्स</string>
   <string name="auth_username">प्रयोक्ता का नाम</string>
   <string name="auth_password">पासवर्ड</string>
   <string name="setup_hint_username">प्रयोक्ता का नाम</string>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 6cfa37fb..396995fd 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -4,83 +4,216 @@
   <string name="main_password">Jelszó:</string>
   <string name="main_login">Felhasználói név:</string>
   <string name="main_button_login">Belépés</string>
-  <string name="main_welcome">Üdvözlünk a ownCloud-ban</string>
+  <string name="main_welcome">Üdv</string>
   <string name="main_files">Fájlok</string>
   <string name="main_music">Zene</string>
-  <string name="main_contacts">Kapcsolat</string>
+  <string name="main_contacts">Címjegyzék</string>
   <string name="main_calendar">Naptár</string>
   <string name="main_bookmarks">Könyvjelzők</string>
   <string name="main_settings">Beállítások</string>
   <string name="main_tit_accsetup">Fiók beállítása</string>
+  <string name="main_wrn_accsetup">Nincs beállított fiók a készülékén. Ahhoz, hogy használja ezt a programot, létre kell hozzon egyet.</string>
+  <string name="about_message">%1$s Android alkalmazás\nverzió: %2$s</string>
   <string name="actionbar_sync">Frissítés</string>
   <string name="actionbar_upload">Feltöltés</string>
+  <string name="actionbar_upload_from_apps">Más alkalmazásokból származó tartalom</string>
   <string name="actionbar_upload_files">Fájlok</string>
-  <string name="actionbar_mkdir">Könyvtár létrahozása</string>
+  <string name="actionbar_mkdir">Mappa létrehozása</string>
   <string name="actionbar_search">Keresés</string>
-  <string name="actionbar_settings">beállítások</string>
+  <string name="actionbar_settings">Beállítások</string>
   <string name="prefs_category_general">Általános</string>
+  <string name="prefs_category_trackmydevice">Eszközkövetés</string>
+  <string name="prefs_add_session">Új munkafolyamat létrehozása</string>
   <string name="prefs_create_img_thumbnails">Bélyegkép készítése</string>
-  <string name="prefs_select_oc_account">Válassz egy felhasználó nevet</string>
+  <string name="prefs_select_oc_account">Válasszon egy felhasználónevet</string>
+  <string name="prefs_summary_select_oc_account">Válassza ki, hogy a program milyen fiókot használjon.</string>
+  <string name="prefs_trackmydevice">Eszközkövetés</string>
+  <string name="prefs_trackmydevice_summary_off">Engedélyezze ennek a programnak a helykövetést</string>
+  <string name="prefs_trackmydevice_summary_on">Ez a program eltárolja ennek a készüléknek az útvonalát</string>
+  <string name="prefs_trackmydevice_interval">A frissítés gyakorisága</string>
   <string name="prefs_trackmydevice_interval_summary">Minden %1$s percben</string>
   <string name="prefs_accounts">Fiókok</string>
   <string name="prefs_manage_accounts">Fiókok kezelése</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="prefs_pincode">Alkalmazás PIN</string>
+  <string name="prefs_pincode_summary">Védje meg az alkalmazást</string>
+  <string name="prefs_instant_upload">Az azonnali feltöltés engedélyezése</string>
+  <string name="prefs_instant_upload_summary">Az eszköz által készített fényképek azonnali feltöltése</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Felhasználói név</string>
   <string name="auth_password">Jelszó</string>
+  <string name="auth_register">Új kapcsolat: %1$s</string>
+  <string name="new_session_uri_error">A megadott cím helytelen</string>
+  <string name="new_session_session_name_error">A megadott munkafolyamatnév érvénytelen</string>
   <string name="sync_string_files">Fájlok</string>
   <string name="uploader_no_file_selected">A feltöltéshez nincs fájl kiválasztva</string>
   <string name="setup_hint_username">Felhasználói név</string>
   <string name="setup_hint_password">Jelszó</string>
   <string name="setup_hint_address">Web cím</string>
   <string name="setup_hint_show_password">A jelszó megjelenjen?</string>
-  <string name="setup_title">Kapcsolódás az ownCloud-hoz</string>
+  <string name="setup_title">Kapcsolódás ehhez: %1$s</string>
   <string name="setup_btn_connect">Kapcsolódás</string>
   <string name="uploader_btn_upload_text">Feltöltés</string>
   <string name="uploader_wrn_no_account_title">Nincs ilyen felhasználói fiók</string>
+  <string name="uploader_wrn_no_account_text">Nem található %1$s fiók ezen a készüléken. Hozzon létre egy fiókot előbb.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Beállítás</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Kilépés</string>
+  <string name="uploader_wrn_no_content_title">Nincs feltölthető tartalom</string>
+  <string name="uploader_wrn_no_content_text">Nem jött tartalom. Nincs mit feltölteni.</string>
+  <string name="uploader_error_forbidden_content">%1$s nem jogosult a megosztott tartalom elérésére</string>
   <string name="uploader_info_uploading">Feltöltés</string>
   <string name="uploader_btn_create_dir_text">Könyvtár létrehozása a feltöltésekhez</string>
+  <string name="file_list_empty">Ebben a mappában nincsenek állományok. A \"Feltöltés\" menüpont segítségével tölthet föl fájlokat.</string>
+  <string name="filedetails_select_file">Érintsen meg egy fájlt a további információkért.</string>
   <string name="filedetails_size">Méret:</string>
   <string name="filedetails_type">Tipus:</string>
   <string name="filedetails_created">Készült:</string>
   <string name="filedetails_modified">Módosítva:</string>
   <string name="filedetails_download">Letöltés</string>
   <string name="filedetails_sync_file">Frissítés</string>
-  <string name="filedetails_redownload">Frissítés</string>
+  <string name="filedetails_redownload">Ismételt letöltés</string>
   <string name="filedetails_open">Megnyitás</string>
+  <string name="filedetails_renamed_in_upload_msg">A feltöltés során az állmányt erre neveztük át: %1$s</string>
   <string name="common_yes">Igen</string>
   <string name="common_no">Nem</string>
   <string name="common_ok">OK</string>
-  <string name="common_cancel_upload">Feltöltés megszakítása</string>
+  <string name="common_cancel_download">A letöltés megszakítása</string>
+  <string name="common_cancel_upload">A feltöltés megszakítása</string>
   <string name="common_cancel">Mégsem</string>
   <string name="common_save_exit">Mentés &amp; Kilépés</string>
+  <string name="common_exit">%1$s elhagyása</string>
   <string name="common_error">Hiba</string>
   <string name="about_title">Rólunk</string>
   <string name="delete_account">Fiók törlése</string>
   <string name="create_account">Fiók létrehozása</string>
   <string name="upload_chooser_title">Feltöltés innen ...</string>
-  <string name="uploader_info_dirname">Mappa név</string>
-  <string name="uploader_upload_in_progress_ticker">Feltöltve ...</string>
-  <string name="uploader_upload_succeeded_ticker">Feltöltés sikerült</string>
+  <string name="uploader_info_dirname">Mappanév</string>
+  <string name="uploader_upload_in_progress_ticker">Feltöltés ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Feltöltés %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">A feltöltés sikerült</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s sikeresen fel lett töltve</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d fájl sikeresen fel lett töltve</string>
   <string name="uploader_upload_failed_ticker">A feltöltés nem sikerült</string>
-  <string name="downloader_download_in_progress_ticker">Letöltése ...</string>
+  <string name="uploader_upload_failed_content_single"> %1$s fájl feltöltése sikertelen</string>
+  <string name="uploader_upload_failed_content_multiple">Hibás feltöltés: %1$d/%2$d fájl feltöltve</string>
+  <string name="downloader_download_in_progress_ticker">Letöltés ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Letöltés %2$s</string>
   <string name="downloader_download_succeeded_ticker">A letöltés sikeres</string>
+  <string name="downloader_download_succeeded_content">%1$s sikeresen letöltve</string>
   <string name="downloader_download_failed_ticker">A letöltés sikertelen</string>
-  <string name="common_choose_account">Válasz azonosítót</string>
-  <string name="sync_string_contacts">Kapcsolat</string>
+  <string name="downloader_download_failed_content">A letöltésből %1$s nem lett befejezve</string>
+  <string name="common_choose_account">Válasszon azonosítót</string>
+  <string name="sync_string_contacts">Címtár</string>
   <string name="sync_fail_ticker">A szinkronizálás sikertelen</string>
+  <string name="sync_fail_content">%1$s szinkronizációját nem sikerült befejezni</string>
+  <string name="sync_conflicts_in_favourites_ticker">Ütközések vannak</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d szinkronizálandó állományokat nem sikerült szinkronizálni</string>
+  <string name="sync_fail_in_favourites_ticker">A szinkronizálandó fájlokat nem sikerült szinkronizálni</string>
+  <string name="sync_fail_in_favourites_content">%1$d fájl szinkronizálása nem sikerült (%2$d ütközés)</string>
   <string name="use_ssl">Biztonságos kapcsolat használata</string>
-  <string name="pincode_enter_pin_code">Kérlek add meg az App PIN kódját</string>
-  <string name="pincode_enter_new_pin_code">Kérlek add meg az új APP PIN kódját</string>
-  <string name="pincode_configure_your_pin">ownCloud App PIN kója</string>
+  <string name="location_no_provider">%1$s nem tudja követni az eszközét. Kérem ellenőrizze a helybeállításait</string>
+  <string name="pincode_enter_pin_code">Kérem adja meg az alkalmazás PIN-kódját</string>
+  <string name="pincode_enter_new_pin_code">Kérem adja meg az alkalmazás új PIN-kódját</string>
+  <string name="pincode_configure_your_pin">Az alkalmazás PIN-kódja</string>
+  <string name="pincode_configure_your_pin_explanation">A PIN-t kötelező lesz megadni az alkalmazás minden indításakor</string>
+  <string name="pincode_reenter_your_pincode">Kérem, adja meg újra az alkalmazás PIN-kódját</string>
+  <string name="pincode_remove_your_pincode">Az alkalmazás PIN-kódjának eltávolítása</string>
+  <string name="pincode_mismatch">A megadott PIN-ek nem egyeznek meg</string>
+  <string name="pincode_wrong">Rossz a megadott PIN</string>
+  <string name="pincode_removed">Az alkalmazás PIN-ját eltávolítottuk</string>
+  <string name="pincode_stored">Az alkalmazás PIN-jét eltároltuk</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 perc</item>
+    <item>30 perc</item>
+    <item>60 perc</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Bejelentkezés...</string>
+  <string name="auth_no_net_conn_title">Nincs hálózati kapcsolat</string>
+  <string name="auth_no_net_conn_message">Nem található hálózati kapcsolat, ellenőrizze az internetkapcsolatát, és próbálja újra.</string>
+  <string name="auth_connect_anyway">Csatlakozás mindenképpen</string>
+  <string name="auth_nossl_plain_ok_title">Nem érhető el biztonságos kapcsolat.</string>
+  <string name="auth_nossl_plain_ok_message">Az alkalmazás nem tudott titkosított kapcsolatot kialakítani a kiszolgálóval. A nem titkosított kapcsolat elérhető. Folytathatja vagy kiléphet.</string>
+  <string name="auth_connection_established">A kapcsolat létrejött</string>
+  <string name="auth_testing_connection">Kapcsolat tesztelése...</string>
+  <string name="auth_not_configured_title">Hibás a kiszolgáló beállítása</string>
+  <string name="auth_not_configured_message">Úgy tűnik a kiszolgáló nincs megfelelően beállítva. Lépjen kapcsolatba a rendszergazdával további információkért.</string>
+  <string name="auth_unknown_error_title">Ismeretlen hiba történt!</string>
+  <string name="auth_unknown_error_message">Ismeretlen hiba történt. Értesítse a terméktámogatást csatolva a az eszközének a naplóbejegyzéseit.</string>
+  <string name="auth_unknown_host_title">A kiszolgáló nem található</string>
+  <string name="auth_unknown_host_message">Nem található a keresett kiszolgáló. Ellenőrizze a nevét és a szerver elérhetőségét majd próbálja újra.</string>
+  <string name="auth_incorrect_path_title">Kiszolgáló nem található</string>
+  <string name="auth_incorrect_path_message">A program nem találta a kiszolgálót a megadott útvonalon. Kérem ellenőrizze az útvonalat, majd próbálja újra.</string>
+  <string name="auth_timeout_title">A kiszolgáló túl sokára válaszolt</string>
+  <string name="auth_incorrect_address_title">Hibás URL</string>
+  <string name="auth_ssl_general_error_title">Nem sikerült az SSL kapcsolat felépítése</string>
+  <string name="auth_ssl_unverified_server_title">Nem ellenőrizhető az kiszolgáló biztonsági tanúsítványa</string>
+  <string name="auth_bad_oc_version_title">Ismeretlen változat a kiszolgálón</string>
+  <string name="auth_wrong_connection_title">A kapcsolat nem hozható létre</string>
+  <string name="auth_secure_connection">Létrejött a titkosított kapcsolat</string>
+  <string name="auth_login_details">Belépési adatok</string>
+  <string name="auth_unauthorized">Érvénytelen felhasználónév / jelszó</string>
+  <string name="auth_not_found">Rossz a megadott útvonal</string>
+  <string name="auth_internal">Belső hiba történt a kiszolgálón, hibakód: %1$d</string>
+  <string name="crashlog_message">A program összeomlott. El akar küldeni egy összeomlási jelentést?</string>
+  <string name="crashlog_send_report">Jelentés küldése</string>
+  <string name="crashlog_dont_send_report">Ne küldjön jelentést</string>
+  <string name="extensions_avail_title">Kiegészítők állnak rendelkezésre!</string>
+  <string name="extensions_avail_message">Úgy tűnik a programja támogatja a haladó kiterjesztéseket. Látni akarja az androidon elérhető kiterjesztéseket?</string>
+  <string name="fd_keep_in_sync">Automatikusan frissítse a fájlokat</string>
   <string name="common_share">Megosztás</string>
   <string name="common_rename">Átnevezés</string>
   <string name="common_remove">Eltávolítás</string>
-  <string name="confirmation_remove_alert">Tényleg szeretnéd törölni  %1$s ?</string>
-  <string name="confirmation_remove_local">Csak helyből</string>
+  <string name="confirmation_remove_alert">Tényleg szeretné törölni  ezt: %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Tényleg törölni akarja ezt a tartalmával együtt: %1$s?</string>
+  <string name="confirmation_remove_local">Csak a helyi példány</string>
+  <string name="confirmation_remove_folder_local">Csak a helyi tartalmat</string>
   <string name="confirmation_remove_remote">Törlés a szerverről</string>
-  <string name="confirmation_remove_remote_and_local">Törlés a szerverről és helyből</string>
+  <string name="confirmation_remove_remote_and_local">A szerveren levő és a helyi példány törlése</string>
+  <string name="remove_success_msg">Az eltávolítás sikerült</string>
+  <string name="remove_fail_msg">Az eltávolítás nem sikerült</string>
+  <string name="rename_dialog_title">Adj meg egy új nevet</string>
+  <string name="rename_local_fail_msg">A helyi példány nem nevezhető át, adjon másik nevet</string>
+  <string name="rename_server_fail_msg">Az átnevezés nem sikerült</string>
+  <string name="sync_file_fail_msg">A távoli fájl nem volt ellenőrizhető</string>
+  <string name="sync_file_nothing_to_do_msg">Az állományok már szinkonizálva vannak</string>
+  <string name="create_dir_fail_msg">A mappa nem hozható létre</string>
+  <string name="wait_a_moment">Egy pillanat...</string>
+  <string name="filedisplay_unexpected_bad_get_content">Váratlan hiba; válassza ki a fájlt más programból</string>
+  <string name="filedisplay_no_file_selected">Egy fájl sincs kiválasztva</string>
   <string name="ssl_validator_title">Figyelmeztetés</string>
+  <string name="ssl_validator_header">A kiszolgálót nem sikerült azonosítani</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- A kiszolgáló tanúsítványa nem megbízható</string>
+  <string name="ssl_validator_reason_cert_expired">- A kiszolgáló tanúsítványának lejárt az érvényessége</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- A kiszolgáló tanúsítványa most még nem érvényes</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- Az URL nem egyezik a tanúsítványban szereplő kiszolgálónévvel</string>
+  <string name="ssl_validator_certificate_not_available">A kiszolgáló tanúsítványa nem érhető el</string>
+  <string name="ssl_validator_question">Mégis megbízik ebben a tanúsítványban?</string>
+  <string name="ssl_validator_not_saved">A tanúsítvány nem menthető el</string>
+  <string name="ssl_validator_btn_details_see">Részletek</string>
+  <string name="ssl_validator_btn_details_hide">Elrejtés</string>
+  <string name="ssl_validator_label_subject">A tanúsítvány birtokosa:</string>
+  <string name="ssl_validator_label_issuer">Kiadta:</string>
+  <string name="ssl_validator_label_CN">Név:</string>
+  <string name="ssl_validator_label_O">Szervezet:</string>
+  <string name="ssl_validator_label_OU">Szervezeti egység:</string>
+  <string name="ssl_validator_label_C">Ország:</string>
+  <string name="ssl_validator_label_ST">Állam:</string>
+  <string name="ssl_validator_label_L">Hely:</string>
+  <string name="ssl_validator_label_validity">Érvényesség:</string>
+  <string name="ssl_validator_label_validity_from">Ettől a dátumtól:</string>
+  <string name="ssl_validator_label_validity_to">Eddig a dátumig:</string>
+  <string name="ssl_validator_label_signature">Aláírás:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
+  <string name="text_placeholder">Ez egy helykitöltő</string>
+  <string name="instant_upload_on_wifi">Képeket csak WiFi kapcsolaton keresztül töltsünk föl</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Frissítési ütközés</string>
+  <string name="conflict_message">%s távoli állományt nem szinkronizáltuk a helyi példánnyal. Ha folytatja, akkor a távoli állományt felülírjuk.</string>
+  <string name="conflict_keep_both">Mindkettő megtartása</string>
+  <string name="conflict_overwrite">Felülírás</string>
+  <string name="conflict_dont_upload">Ne töltsük föl</string>
 </resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 1faad74b..6823f046 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -1,13 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Password:</string>
+  <string name="main_login">Nama Pengguna:</string>
   <string name="main_button_login">login</string>
+  <string name="main_welcome">Selamat Datang</string>
+  <string name="main_files">Berkas</string>
+  <string name="main_music">Musik</string>
   <string name="main_contacts">kontak</string>
+  <string name="main_calendar">Kalendar</string>
+  <string name="main_bookmarks">Bookmark</string>
   <string name="main_settings">pengaturan</string>
+  <string name="main_tit_accsetup">Mengatur Akun</string>
+  <string name="main_wrn_accsetup">Tidak ada akun yang diatur di alat anda. Dalam rangka menggunakan App ini, anda hrus membuatnya.</string>
+  <string name="actionbar_upload_files">Berkas</string>
   <string name="actionbar_settings">pengaturan</string>
   <string name="prefs_category_general">umum</string>
   <string name="auth_host_url">tautan</string>
   <string name="auth_username">nama pengguna</string>
   <string name="auth_password">kata kunci</string>
+  <string name="sync_string_files">Berkas</string>
   <string name="setup_hint_username">nama pengguna</string>
   <string name="setup_hint_password">kata kunci</string>
   <string name="filedetails_download">unduh</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
new file mode 100644
index 00000000..09a564b1
--- /dev/null
+++ b/res/values-ka/strings.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_files">ფაილები</string>
+  <string name="actionbar_upload_files">ფაილები</string>
+  <string name="auth_password">პაროლი</string>
+  <string name="sync_string_files">ფაილები</string>
+  <string name="setup_hint_password">პაროლი</string>
+  <string name="filedetails_download">გადმოწერა</string>
+</resources>
diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml
new file mode 100644
index 00000000..379374c1
--- /dev/null
+++ b/res/values-ku-rIQ/strings.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_music">مۆسیقا</string>
+  <string name="main_bookmarks">دڵخوازه‌کان</string>
+  <string name="main_settings">ده‌ستكاری</string>
+  <string name="actionbar_upload">بارکردن</string>
+  <string name="actionbar_settings">ده‌ستكاری</string>
+  <string name="auth_host_url">ناونیشانی به‌سته‌ر</string>
+  <string name="auth_username">ناوی به‌کارهێنه‌ر</string>
+  <string name="auth_password">وشەی تێپەربو</string>
+  <string name="setup_hint_username">ناوی به‌کارهێنه‌ر</string>
+  <string name="setup_hint_password">وشەی تێپەربو</string>
+  <string name="uploader_btn_upload_text">بارکردن</string>
+  <string name="filedetails_download">داگرتن</string>
+  <string name="filedetails_open">کردنه‌وه</string>
+  <string name="common_error">هه‌ڵه</string>
+  <string name="ssl_validator_title">ئاگاداری</string>
+</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 2b7d3d5c..2569e5dc 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -2,12 +2,44 @@
 <resources>
   <string name="app_name">ownCloud</string>
   <string name="main_password">Passwuert:</string>
+  <string name="main_login">Benotzernumm:</string>
+  <string name="main_button_login">Login</string>
+  <string name="main_files">Dateien</string>
   <string name="main_music">Musek</string>
   <string name="main_contacts">Kontakter</string>
+  <string name="main_calendar">Kalenner</string>
+  <string name="main_bookmarks">Bookmarks</string>
   <string name="main_settings">Astellungen</string>
+  <string name="main_tit_accsetup">Account erstellen</string>
+  <string name="actionbar_upload">Eroplueden</string>
+  <string name="actionbar_upload_files">Dateien</string>
+  <string name="actionbar_mkdir">Dossier erstellen</string>
+  <string name="actionbar_search">Sichen</string>
   <string name="actionbar_settings">Astellungen</string>
+  <string name="prefs_category_general">Allgemeng</string>
+  <string name="prefs_add_session">Nei Sessioun bäisetzen</string>
+  <string name="prefs_select_oc_account">Account auswielen</string>
+  <string name="prefs_accounts">Accounten</string>
+  <string name="auth_username">Benotzernumm</string>
+  <string name="auth_password">Passwuert</string>
+  <string name="sync_string_files">Dateien</string>
+  <string name="setup_hint_username">Benotzernumm</string>
+  <string name="setup_hint_password">Passwuert</string>
+  <string name="setup_hint_show_password">Passwuert uweisen?</string>
+  <string name="setup_btn_connect">Verbannen</string>
+  <string name="uploader_btn_upload_text">Eroplueden</string>
+  <string name="uploader_wrn_no_account_title">Keen Account fonnt</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
+  <string name="filedetails_size">Gréisst:</string>
+  <string name="filedetails_type">Typ:</string>
+  <string name="filedetails_created">Erstallt:</string>
+  <string name="filedetails_modified">Geännert:</string>
   <string name="filedetails_download">Download</string>
+  <string name="filedetails_open">Opmaachen</string>
   <string name="common_yes">Jo</string>
+  <string name="common_no">Nee</string>
+  <string name="common_ok">OK</string>
   <string name="common_cancel_upload">Upload ofbriechen</string>
   <string name="common_cancel">Ofbriechen</string>
   <string name="common_error">Fehler</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3d49b8fb..b449d662 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,20 +1,219 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="main_files">Faili</string>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Parole:</string>
+  <string name="main_login">Lietotājvārds:</string>
+  <string name="main_button_login">Ierakstīties</string>
+  <string name="main_welcome">Laipni lūgti</string>
+  <string name="main_files">Datnes</string>
   <string name="main_music">MÅ«zika</string>
+  <string name="main_contacts">Kontakti</string>
+  <string name="main_calendar">Kalendārs</string>
+  <string name="main_bookmarks">Grāmatzīmes</string>
   <string name="main_settings">Iestatījumi</string>
-  <string name="actionbar_upload">Augšuplādet</string>
-  <string name="actionbar_upload_files">Faili</string>
+  <string name="main_tit_accsetup">Iestatīt kontu</string>
+  <string name="main_wrn_accsetup">Uz šīs ierīces nav iestatīta konta. Lai lietotu šo lietotni, tāds ir jāizveido.</string>
+  <string name="about_message">%1$s Android lietotne\n\nversija: %2$s</string>
+  <string name="actionbar_sync">Atsvaidzināt</string>
+  <string name="actionbar_upload">Augšupielādēt</string>
+  <string name="actionbar_upload_from_apps">Saturs no citām lietotnēm</string>
+  <string name="actionbar_upload_files">Datnes</string>
+  <string name="actionbar_mkdir">Izveidot direktoriju</string>
+  <string name="actionbar_search">Meklēt</string>
   <string name="actionbar_settings">Iestatījumi</string>
+  <string name="prefs_category_general">Vispārīgi</string>
+  <string name="prefs_category_trackmydevice">Ierīces izsekošana</string>
+  <string name="prefs_add_session">Pievienot jaunu sesiju</string>
+  <string name="prefs_create_img_thumbnails">Izveidot attēlu sīktēlus</string>
+  <string name="prefs_select_oc_account">Izvēlieties kontu</string>
+  <string name="prefs_summary_select_oc_account">Izvēlieties, kuru no kontiem jūsu lietotnei vajadzētu izmantot</string>
+  <string name="prefs_trackmydevice">Ierīču izsekošana</string>
+  <string name="prefs_trackmydevice_summary_off">Aktivējiet šo lietotni, lai izsekotu savas ierīces atrašanās vietu</string>
+  <string name="prefs_trackmydevice_summary_on">Šī lietotne izseko šo ierīci</string>
+  <string name="prefs_trackmydevice_interval">Atjaunināšanas intervāls</string>
+  <string name="prefs_trackmydevice_interval_summary">Atjaunināt katras %1$s minūtes</string>
+  <string name="prefs_accounts">Konti</string>
+  <string name="prefs_manage_accounts">Pārvaldīt kontus</string>
+  <string name="prefs_pincode">Lietotnes PIN</string>
+  <string name="prefs_pincode_summary">Aizsargā savu klientu</string>
+  <string name="prefs_instant_upload">Aktivēt tūlītējo augšupielādēšanu</string>
+  <string name="prefs_instant_upload_summary">Nekavējoties augšupielādēt kameras uzņemtos attēlus</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Lietotājvārds</string>
   <string name="auth_password">Parole</string>
-  <string name="sync_string_files">Faili</string>
+  <string name="auth_register">Esmu %1$s iesācējs</string>
+  <string name="new_session_uri_error">Ir dota nepareiza adrese</string>
+  <string name="new_session_session_name_error">Nepareizs sesijas nosaukums</string>
+  <string name="sync_string_files">Datnes</string>
+  <string name="uploader_no_file_selected">Neviena datne nav izvēlēta augšupielādei</string>
   <string name="setup_hint_username">Lietotājvārds</string>
   <string name="setup_hint_password">Parole</string>
-  <string name="uploader_btn_upload_text">Augšuplādet</string>
-  <string name="filedetails_download">Lejuplādēt</string>
-  <string name="common_cancel_upload">Atcelt augšuplādi</string>
-  <string name="common_error">Kļūme</string>
-  <string name="common_share">Līdzdalīt</string>
-  <string name="common_rename">Pārdēvēt</string>
+  <string name="setup_hint_address">Tīmekļa adrese</string>
+  <string name="setup_hint_show_password">Rādīt paroli?</string>
+  <string name="setup_title">Savienoties ar savu %1$s</string>
+  <string name="setup_btn_connect">Savienoties</string>
+  <string name="uploader_btn_upload_text">Augšupielādēt</string>
+  <string name="uploader_wrn_no_account_title">Nav atrastu kontu</string>
+  <string name="uploader_wrn_no_account_text">Uz šīs ierīces nav %1$s kontu. Lūdzu, vispirms iestatiet kontu.</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Iestatīt</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Iziet</string>
+  <string name="uploader_wrn_no_content_title">Nav satura, ko augšupielādēt</string>
+  <string name="uploader_wrn_no_content_text">Nav saņemts nekāds saturs. Nav ko augšupielādēt.</string>
+  <string name="uploader_error_forbidden_content">%1$s nedrīkst piekļūt koplietotajam saturam</string>
+  <string name="uploader_info_uploading">Augšupielādē</string>
+  <string name="uploader_btn_create_dir_text">Izveidot direktoriju augšupielādēšanai</string>
+  <string name="file_list_empty">Šajā mapē nav datņu.\nJaunas datnes var pievienot ar izvēlnes opciju “Augšupielādēt”</string>
+  <string name="filedetails_select_file">Uzsitiet uz datnes, lai redzētu papildinformāciju.</string>
+  <string name="filedetails_size">Izmērs:</string>
+  <string name="filedetails_type">Tips:</string>
+  <string name="filedetails_created">Izveidota:</string>
+  <string name="filedetails_modified">Modificēta:</string>
+  <string name="filedetails_download">Lejupielādēt</string>
+  <string name="filedetails_sync_file">Atsvaidzināt</string>
+  <string name="filedetails_redownload">Atkārtoti lejupielādēt</string>
+  <string name="filedetails_open">Atvērt</string>
+  <string name="filedetails_renamed_in_upload_msg">Datne tika pārsaukta uz %1$s augšupielādes laikā</string>
+  <string name="common_yes">Jā</string>
+  <string name="common_no">Nē</string>
+  <string name="common_ok">Labi</string>
+  <string name="common_cancel_download">Atcelt lejupielādi</string>
+  <string name="common_cancel_upload">Atcelt augšupielādi</string>
+  <string name="common_cancel">Atcelt</string>
+  <string name="common_save_exit">Saglabāt un iziet</string>
+  <string name="common_exit">Pamest %1$s</string>
+  <string name="common_error">Kļūda</string>
+  <string name="about_title">Par</string>
+  <string name="delete_account">Dzēst kontu</string>
+  <string name="create_account">Izveidot kontu</string>
+  <string name="upload_chooser_title">Augšupielādēt no...</string>
+  <string name="uploader_info_dirname">Direktorijas nosaukums</string>
+  <string name="uploader_upload_in_progress_ticker">Augšupielādē ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% augšupielādē %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Augšupielāde ir veiksmīga</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s tika veiksmīgi augšupielādēts</string>
+  <string name="uploader_upload_succeeded_content_multiple">%1$d datnes tika veiksmīgi augšupielādētas</string>
+  <string name="uploader_upload_failed_ticker">Neizdevās augšupielādēt</string>
+  <string name="uploader_upload_failed_content_single">Nevarēja pabeigt %1$s augšupielādēšanu</string>
+  <string name="uploader_upload_failed_content_multiple">Neizdevās augšupielādēt: tika augšupielādētas %1$d/%2$d datnes</string>
+  <string name="downloader_download_in_progress_ticker">Lejupielādē ...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% lejupielādē %2$s</string>
+  <string name="downloader_download_succeeded_ticker">Lejupielāde beidzās veiksmīgi</string>
+  <string name="downloader_download_succeeded_content">%1$s tika veiksmīgi lejupielādēts</string>
+  <string name="downloader_download_failed_ticker">Neizdevās lejupielādēt</string>
+  <string name="downloader_download_failed_content">Nevarēja pabeigt %1$s lejupielādēšanu</string>
+  <string name="common_choose_account">Izvēlieties kontu</string>
+  <string name="sync_string_contacts">Kontakti</string>
+  <string name="sync_fail_ticker">Neizdevās sinhronizēties</string>
+  <string name="sync_fail_content">Nevarēja pabeigt %1$s sinhronizēšanu</string>
+  <string name="sync_conflicts_in_favourites_ticker">Ir atrasti konflikti</string>
+  <string name="sync_conflicts_in_favourites_content">Nevarēja sinhronizēt %1$d kept-in-sync datnes</string>
+  <string name="sync_fail_in_favourites_ticker">Kept-in-sync datnes cieta neveiksmi</string>
+  <string name="sync_fail_in_favourites_content">Nevarēja sinhronizēt %1$d datņu saturu (%2$d konflikti)</string>
+  <string name="use_ssl">Lietot drošo savienojumu</string>
+  <string name="location_no_provider">%1$s nevar izsekot šo ierīci. Lūdzu, pārbaudiet savus vietas iestatījumus</string>
+  <string name="pincode_enter_pin_code">LÅ«dzu, ierakstiet savu lietotnes PIN</string>
+  <string name="pincode_enter_new_pin_code">LÅ«dzu, ierakstiet savu jauno lietotnes PIN</string>
+  <string name="pincode_configure_your_pin">Ievadiet savu lietotnes PIN</string>
+  <string name="pincode_configure_your_pin_explanation">PIN tiks pieprasīts katrā lietotnes palaišanas reizē</string>
+  <string name="pincode_reenter_your_pincode">Lūdzu, vēlreiz ievadiet savu lietotnes PIN</string>
+  <string name="pincode_remove_your_pincode">Izņemt savu lietotnes PIN</string>
+  <string name="pincode_mismatch">Lietotņu PIN nav vienādi</string>
+  <string name="pincode_wrong">Nepareizs lietotnes PIN</string>
+  <string name="pincode_removed">Lietotnes PIN ir izņemts</string>
+  <string name="pincode_stored">Lietotnes PIN ir noglabāts</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 minūtes</item>
+    <item>30 minūtes</item>
+    <item>60 minūtes</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Mēģina ierakstīties...</string>
+  <string name="auth_no_net_conn_title">Nav tīkla savienojumu</string>
+  <string name="auth_no_net_conn_message">Nav atklātu tīkla savienojumu. Pārbaudiet interneta savienojumus un mēģiniet vēlreiz.</string>
+  <string name="auth_connect_anyway">Tomēr savienoties</string>
+  <string name="auth_nossl_plain_ok_title">Nav pieejams drošs savienojums.</string>
+  <string name="auth_nossl_plain_ok_message">Lietotne nevar izveidot drošu savienojumu ar serveri. Ir pieejams nedrošs savienojums. Jūs varat turpināt vai atcelt.</string>
+  <string name="auth_connection_established">Savienojums ir izveidots</string>
+  <string name="auth_testing_connection">Testē savienojumu...</string>
+  <string name="auth_not_configured_title">Slikti formatēta servera konfigurācija</string>
+  <string name="auth_not_configured_message">Izskatās, ka jūsu servera instance nav pareizi konfigurēta. Sazinieties ar servera administratoru, lai uzzinātu vairāk.</string>
+  <string name="auth_unknown_error_title">Gadījās nezināma kļūda!</string>
+  <string name="auth_unknown_error_message">Gadījās nezināma kļūda. Lūdzu, sazinieties ar atbalstu un pievienojiet žurnālus no savas ierīces.</string>
+  <string name="auth_unknown_host_title">Nevarēja atrast datoru</string>
+  <string name="auth_unknown_host_message">Nevarēja atrast ievadīto datoru. Lūdzu, pārliecinieties ka datora nosaukums ir ievadīts pareizi un ka serveris ir pieejams.</string>
+  <string name="auth_incorrect_path_title">Servera instance nav atrasta</string>
+  <string name="auth_incorrect_path_message">Lietotne uz dotā ceļa nevarēja atrast servera instanci. Lūdzu, pārbaudiet ceļu un mēģiniet vēlreiz.</string>
+  <string name="auth_timeout_title">Serveris pārāk ilgi neatbildēja</string>
+  <string name="auth_incorrect_address_title">Slikti formatēts URL</string>
+  <string name="auth_ssl_general_error_title">Neizdevās inicializēt SSL</string>
+  <string name="auth_ssl_unverified_server_title">Nepārbaudīta SSL servera identitāte</string>
+  <string name="auth_bad_oc_version_title">Neatpazīta servera versija</string>
+  <string name="auth_wrong_connection_title">Nevarēja izveidot savienojumu</string>
+  <string name="auth_secure_connection">Ir izveidots drošs savienojums</string>
+  <string name="auth_login_details">Sīkāka informācija par ierakstīšanos</string>
+  <string name="auth_unauthorized">Nederīgs lietotājvārds/parole</string>
+  <string name="auth_not_found">Dots nepareizs ceļš</string>
+  <string name="auth_internal">Iekšējā servera kļūda, kods %1$d</string>
+  <string name="crashlog_message">Lietotne negaidīti beidza darbu. Vai vēlaties iesniegt kļūdas ziņojumu?</string>
+  <string name="crashlog_send_report">Sūtīt ziņojumu</string>
+  <string name="crashlog_dont_send_report">Nesūtīt ziņojumu</string>
+  <string name="extensions_avail_title">Ir pieejams paplašinājums!</string>
+  <string name="extensions_avail_message">Izskatās, ka jūsu servera instance atbalsta papildu paplašinājumus. Vai vēlaties redzēt paplašinājumus, kas ir pieejami uz android?</string>
+  <string name="fd_keep_in_sync">Uzturēt datni aktuālu</string>
+  <string name="common_share">Dalīties</string>
+  <string name="common_rename">Pārsaukt</string>
+  <string name="common_remove">Izņemt</string>
+  <string name="confirmation_remove_alert">Vai tiešām vēlaties izņemt %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Vai vēlaties izņemt %1$s un tā saturu?</string>
+  <string name="confirmation_remove_local">Tikai lokālos</string>
+  <string name="confirmation_remove_folder_local">Tikai lokālo saturu</string>
+  <string name="confirmation_remove_remote">Izņemt no servera</string>
+  <string name="confirmation_remove_remote_and_local">Attālinātās un lokālās</string>
+  <string name="remove_success_msg">Veiksmīgi izņemts</string>
+  <string name="remove_fail_msg">Neizdevās izņemt</string>
+  <string name="rename_dialog_title">Ievadīt jaunu nosaukumu</string>
+  <string name="rename_local_fail_msg">Nevarēja pārsaukt lokālo kopiju; pamēģiniet citu nosaukumu</string>
+  <string name="rename_server_fail_msg">Nevarēja pabeigt pārsaukšanu</string>
+  <string name="sync_file_fail_msg">Nevarēja atzīmēt attālinātas datnes</string>
+  <string name="sync_file_nothing_to_do_msg">Datnes saturs jau ir sinhronizēts</string>
+  <string name="create_dir_fail_msg">Nevarēja izveidot direktoriju</string>
+  <string name="wait_a_moment">Uzgaidīt brīdi</string>
+  <string name="filedisplay_unexpected_bad_get_content">Negaidīta problēma; lūdzu, izvēlieties datni no citas lietotnes</string>
+  <string name="filedisplay_no_file_selected">Netika izvēlēta neviena datne</string>
+  <string name="ssl_validator_title">Brīdinājums</string>
+  <string name="ssl_validator_header">Šīs vietnes identitāti nevarēja pārbaudīt</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Nav uzticības servera sertifikātam</string>
+  <string name="ssl_validator_reason_cert_expired">- Servera sertifikātam ir beidzies termiņš</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Servera sertifikāta datumi ir nākotnē</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL sertifikātā neatbilst datora nosaukumam</string>
+  <string name="ssl_validator_certificate_not_available">Nevarēja saņemt sertifikātu</string>
+  <string name="ssl_validator_question">Vai tomēr uzticēties sertifikātam?</string>
+  <string name="ssl_validator_not_saved">Nevarēja saglabāt sertifikātu</string>
+  <string name="ssl_validator_btn_details_see">Sīkāka informācija</string>
+  <string name="ssl_validator_btn_details_hide">Slēpt</string>
+  <string name="ssl_validator_label_subject">Izsniegts:</string>
+  <string name="ssl_validator_label_issuer">Izsniedza:</string>
+  <string name="ssl_validator_label_CN">Kopīgais nosaukums:</string>
+  <string name="ssl_validator_label_O">Organizācija:</string>
+  <string name="ssl_validator_label_OU">Organizācijas vienība:</string>
+  <string name="ssl_validator_label_C">Valsts:</string>
+  <string name="ssl_validator_label_ST">Å tats:</string>
+  <string name="ssl_validator_label_L">Vieta:</string>
+  <string name="ssl_validator_label_validity">Derīgums:</string>
+  <string name="ssl_validator_label_validity_from">No:</string>
+  <string name="ssl_validator_label_validity_to">Kam:</string>
+  <string name="ssl_validator_label_signature">Paraksts:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritms:</string>
+  <string name="text_placeholder">Å is ir vietturis</string>
+  <string name="instant_upload_on_wifi">Attēlus augšupielādēt tikai caur WiFi</string>
+  <string name="instant_upload_path">/TūlītējaAugšupielāde</string>
+  <string name="conflict_title">Atjaunināšanas konflikts</string>
+  <string name="conflict_message">Attālinātā datne %s nav sinhronizēta ar lokālo datni. Turpināšana aizstās datņu servera saturu.</string>
+  <string name="conflict_keep_both">Paturēt abas</string>
+  <string name="conflict_overwrite">Pārrakstīt</string>
+  <string name="conflict_dont_upload">Neaugšupielādēt</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
new file mode 100644
index 00000000..b304e63e
--- /dev/null
+++ b/res/values-my/strings.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_files">ဖိုင်များ</string>
+  <string name="main_calendar">ပြက္ခဒိန်</string>
+  <string name="actionbar_upload_files">ဖိုင်များ</string>
+  <string name="auth_username">သုံးစွဲသူအမည်</string>
+  <string name="auth_password">စကားဝှက်</string>
+  <string name="sync_string_files">ဖိုင်များ</string>
+  <string name="setup_hint_username">သုံးစွဲသူအမည်</string>
+  <string name="setup_hint_password">စကားဝှက်</string>
+  <string name="filedetails_download">ဒေါင်းလုတ်</string>
+  <string name="common_yes">ဟုတ်</string>
+  <string name="common_no">မဟုတ်ဘူး</string>
+  <string name="common_cancel">ပယ်ဖျက်မည်</string>
+</resources>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index 2eacd46d..d86ae9d4 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -10,40 +10,48 @@
   <string name="main_contacts">Kontakter</string>
   <string name="main_calendar">Kalender</string>
   <string name="main_bookmarks">Bokmerker</string>
-  <string name="main_settings">Innstilinger</string>
+  <string name="main_settings">Innstillinger</string>
   <string name="main_tit_accsetup">Sett opp konto</string>
   <string name="main_wrn_accsetup">Det finnes ingen ownClound kontoer for din enhent. For å bruker denne appen må du opprette en,</string>
   <string name="actionbar_sync">Oppdater</string>
-  <string name="actionbar_upload">Opplasting</string>
+  <string name="actionbar_upload">Last opp</string>
+  <string name="actionbar_upload_from_apps">Innhold fra andre applikasjoner</string>
   <string name="actionbar_upload_files">Filer</string>
   <string name="actionbar_mkdir">Opprett katalog</string>
   <string name="actionbar_search">Søk</string>
   <string name="actionbar_settings">Innstillinger</string>
-  <string name="prefs_category_general">Generellt</string>
-  <string name="prefs_category_trackmydevice">Enherssporing</string>
-  <string name="prefs_create_img_thumbnails">Lag minityrbilder</string>
+  <string name="prefs_category_general">Generelt</string>
+  <string name="prefs_category_trackmydevice">Enhetssporing</string>
+  <string name="prefs_add_session">Legg til ny sesjon</string>
+  <string name="prefs_create_img_thumbnails">Opprett miniatyrbilder</string>
   <string name="prefs_select_oc_account">Velg konto</string>
   <string name="prefs_trackmydevice">Enhetssporing</string>
   <string name="prefs_trackmydevice_interval">Oppdateringsfrekvens</string>
+  <string name="prefs_trackmydevice_interval_summary">Oppdater hvert %1$s minutt</string>
   <string name="prefs_accounts">Kontoer</string>
+  <string name="prefs_instant_upload_summary">Last opp bilder tatt med kamera øyeblikkelig</string>
   <string name="auth_host_url">URL</string>
   <string name="auth_username">Brukernavn</string>
   <string name="auth_password">Passord</string>
   <string name="sync_string_files">Filer</string>
+  <string name="uploader_no_file_selected">Ingen fil valgt for opplasting</string>
   <string name="setup_hint_username">Brukernavn</string>
   <string name="setup_hint_password">Passord</string>
   <string name="setup_hint_address">Internettadresse</string>
   <string name="setup_hint_show_password">Vise passord?</string>
-  <string name="setup_btn_connect">Kople til</string>
-  <string name="uploader_btn_upload_text">Last op</string>
+  <string name="setup_btn_connect">Koble til</string>
+  <string name="uploader_btn_upload_text">Last opp</string>
   <string name="uploader_wrn_no_account_title">Ingen konto funnet</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Avslutt</string>
+  <string name="uploader_wrn_no_content_title">Intet innhold å laste opp</string>
+  <string name="uploader_wrn_no_content_text">Intet innhold ble mottatt. Intet å laste opp.</string>
   <string name="uploader_info_uploading">Laster opp</string>
   <string name="uploader_btn_create_dir_text">Opprett mappe for opplasting</string>
+  <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
   <string name="filedetails_size">Størrelse:</string>
   <string name="filedetails_type">Type:</string>
-  <string name="filedetails_created">Opprette:</string>
+  <string name="filedetails_created">Opprettet:</string>
   <string name="filedetails_modified">Endret:</string>
   <string name="filedetails_download">Last ned</string>
   <string name="filedetails_sync_file">Oppdater</string>
@@ -55,40 +63,83 @@
   <string name="common_cancel_download">Avbryt nedlasting</string>
   <string name="common_cancel_upload">Avbryt opplasting</string>
   <string name="common_cancel">Avbryt</string>
-  <string name="common_save_exit">Lager og avslutt</string>
+  <string name="common_save_exit">Lagre og avslutt</string>
   <string name="common_error">Feil</string>
   <string name="about_title">Om</string>
   <string name="delete_account">Slett konto</string>
-  <string name="create_account">Opprett Konto</string>
+  <string name="create_account">Opprett konto</string>
   <string name="upload_chooser_title">Last opp fra...</string>
   <string name="uploader_info_dirname">Katalognavn</string>
   <string name="uploader_upload_in_progress_ticker">Laster opp...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Laster opp %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Opplasting fullført</string>
   <string name="uploader_upload_failed_ticker">Opplasting feilet</string>
+  <string name="uploader_upload_failed_content_single">Opplasting av %1$s kunne ikke fullføres</string>
+  <string name="uploader_upload_failed_content_multiple">Opplasting feilet: %1$d/%2$d filer ble lastet opp</string>
   <string name="downloader_download_in_progress_ticker">Laster ned...</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Laster ned %2$s</string>
   <string name="downloader_download_succeeded_ticker">Nedlasting fullført</string>
   <string name="downloader_download_failed_ticker">Nedlasting feilet</string>
+  <string name="downloader_download_failed_content">Nedlasting av %1$s kunne ikke fullføres</string>
   <string name="common_choose_account">Velg konto</string>
   <string name="sync_string_contacts">Kontakter</string>
+  <string name="sync_fail_ticker">Synkronisering feilet</string>
+  <string name="sync_fail_content">Synkronisering av %1$s kunne ikke fullføres</string>
   <string name="sync_conflicts_in_favourites_ticker">Konflikter funnet</string>
   <string name="use_ssl">Bruk sikker tilkobling</string>
+  <string name="pincode_enter_pin_code">Vennligst tast inn din App-PIN</string>
+  <string name="pincode_enter_new_pin_code">Vennligst tast inn ny App-PIN</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 minutter</item>
+    <item>30 minutter</item>
+    <item>60 minutter</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
   <string name="auth_trying_to_login">Prøver å logge inn...</string>
-  <string name="auth_no_net_conn_title">Ingen nettverkstilgang</string>
+  <string name="auth_no_net_conn_title">Ingen nettverkstilkobling</string>
   <string name="auth_connect_anyway">Koble til likevel</string>
-  <string name="auth_testing_connection">Tester tilgang...</string>
+  <string name="auth_nossl_plain_ok_title">Sikker tilkobling ikke tilgjengelig.</string>
+  <string name="auth_connection_established">Tilkobling opprettet</string>
+  <string name="auth_testing_connection">Tester tilkobling...</string>
+  <string name="auth_unknown_error_title">Ukjent feil oppstod!</string>
+  <string name="auth_unknown_host_title">Fant ikke tjener</string>
+  <string name="auth_unknown_host_message">Fant ikke spesifisert tjener.  Vennligst sjekk tjenernavnet og server-tilgjengeligheten, og prøv på nytt.</string>
+  <string name="auth_timeout_title">Serveren brukte for lang tid på å svare</string>
+  <string name="auth_incorrect_address_title">Feil formatert URL</string>
+  <string name="auth_ssl_general_error_title">Oppstart av SSL feilet</string>
+  <string name="auth_ssl_unverified_server_title">Uverifisert SSL-servers identitet</string>
+  <string name="auth_wrong_connection_title">Klarte ikke å opprette tilkobling</string>
+  <string name="auth_secure_connection">Sikker tilkobling opprettet</string>
+  <string name="auth_login_details">Innloggingsdetaljer</string>
   <string name="auth_unauthorized">Ugyldig brukernavn / passord</string>
   <string name="crashlog_send_report">Send rapport</string>
   <string name="crashlog_dont_send_report">Ikke send rapport</string>
+  <string name="extensions_avail_title">Utvidelser tilgjengelig!</string>
+  <string name="fd_keep_in_sync">Hold filen oppdatert</string>
   <string name="common_share">Del</string>
   <string name="common_rename">Endre navn</string>
   <string name="common_remove">Fjern</string>
+  <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
   <string name="confirmation_remove_local">Kun lokalt</string>
+  <string name="confirmation_remove_remote">Fjern fra server</string>
+  <string name="rename_server_fail_msg">Klarte ikke å endre navn</string>
+  <string name="create_dir_fail_msg">Mappe kunne ikke opprettes</string>
+  <string name="wait_a_moment">Vent et øyeblikk</string>
+  <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
   <string name="ssl_validator_title">Advarsel</string>
+  <string name="ssl_validator_header">Identiteten til siden kunne ikke verifiseres</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Serverens sertifikat er ikke til å stole på</string>
+  <string name="ssl_validator_reason_cert_expired">- Serverens sertifikat er utløpt</string>
   <string name="ssl_validator_btn_details_see">Detaljer</string>
   <string name="ssl_validator_btn_details_hide">Skjul</string>
   <string name="ssl_validator_label_C">Land:</string>
   <string name="ssl_validator_label_validity_from">Fra:</string>
   <string name="ssl_validator_label_validity_to">Til:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
+  <string name="text_placeholder">Dette er en plassholder</string>
   <string name="conflict_keep_both">Behold begge</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bec3b10e..0c071269 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3,8 +3,8 @@
   <string name="app_name">ownCloud</string>
   <string name="main_password">Hasło:</string>
   <string name="main_login">Nazwa użytkownika:</string>
-  <string name="main_button_login">Login</string>
-  <string name="main_welcome">Witaj w ownCloud</string>
+  <string name="main_button_login">Zaloguj</string>
+  <string name="main_welcome">Witaj</string>
   <string name="main_files">Pliki</string>
   <string name="main_music">Muzyka</string>
   <string name="main_contacts">Kontakty</string>
@@ -12,58 +12,58 @@
   <string name="main_bookmarks">Zakładki</string>
   <string name="main_settings">Ustawienia</string>
   <string name="main_tit_accsetup">Załóż konto</string>
-  <string name="main_wrn_accsetup">Nie wykryto kont ownCloud, załóż konto w celu używania aplikacji.</string>
-  <string name="about_message">ownCloud Android klient⏎ ⏎ wersja: %1$s</string>
+  <string name="main_wrn_accsetup">Nie wykryto kont ownCloud. Aby korzystać z tej aplikacji, musisz utworzyć konto.</string>
+  <string name="about_message">%1$s Android App⏎ ⏎ wersja: %2$s</string>
   <string name="actionbar_sync">Odśwież</string>
   <string name="actionbar_upload">Wyślij plik</string>
-  <string name="actionbar_upload_from_apps">Zasoby innej aplikacji</string>
-  <string name="actionbar_upload_files">Pliki z telefonu</string>
+  <string name="actionbar_upload_from_apps">Zasoby innych aplikacji</string>
+  <string name="actionbar_upload_files">Pliki</string>
   <string name="actionbar_mkdir">Nowy katalog</string>
   <string name="actionbar_search">Szukaj</string>
   <string name="actionbar_settings">Ustawienia</string>
   <string name="prefs_category_general">Ogólne</string>
-  <string name="prefs_category_trackmydevice">Śledzenie urządzeń</string>
-  <string name="prefs_add_session">Dodaj sesje</string>
-  <string name="prefs_create_img_thumbnails">Nie można utworzyć podglądu</string>
+  <string name="prefs_category_trackmydevice">Śledzenie urządzenia</string>
+  <string name="prefs_add_session">Dodaj nową sesję</string>
+  <string name="prefs_create_img_thumbnails">Utwórz miniaturki obrazów</string>
   <string name="prefs_select_oc_account">Wybierz konto</string>
-  <string name="prefs_summary_select_oc_account">Wybierz aplikację, której chcesz użyć.</string>
+  <string name="prefs_summary_select_oc_account">Wybierz konto, z którego ma korzystać aplikacja.</string>
   <string name="prefs_trackmydevice">Śledzenie urządzeń</string>
-  <string name="prefs_trackmydevice_summary_off">Włącz śledzenie lokalizacji urządzenia w ownCloud</string>
-  <string name="prefs_trackmydevice_summary_on">Twój ownCloud trzyma informacje o tym urządzeniu</string>
-  <string name="prefs_trackmydevice_interval">Interwał aktualizacji</string>
+  <string name="prefs_trackmydevice_summary_off">Włącz śledzenie lokalizacji urządzenia przez tę aplikację</string>
+  <string name="prefs_trackmydevice_summary_on">Ta aplikacja śledzi to urządzenie</string>
+  <string name="prefs_trackmydevice_interval">Odstęp aktualizacji</string>
   <string name="prefs_trackmydevice_interval_summary">Aktualizuj co %1$ minut</string>
   <string name="prefs_accounts">Konta</string>
   <string name="prefs_manage_accounts">Zarządzaj kontami</string>
-  <string name="prefs_pincode">Pin aplikacji ownCloud</string>
-  <string name="prefs_pincode_summary">Chroni klienta ownCloud</string>
-  <string name="prefs_instant_upload">Włącz automatyczne wysyłanie</string>
-  <string name="prefs_instant_upload_summary">Natychmiast wyślij zdjęcia zrobione przez aparat fotograficzny</string>
-  <string name="auth_host_url">URL ownCloud</string>
+  <string name="prefs_pincode">PIN aplikacji</string>
+  <string name="prefs_pincode_summary">Chroń klienta</string>
+  <string name="prefs_instant_upload">Włącz natychmiastowe wysyłanie</string>
+  <string name="prefs_instant_upload_summary">Natychmiast wysyłaj zdjęcia zrobione aparatem</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Nazwa użytkownika</string>
   <string name="auth_password">Hasło</string>
-  <string name="auth_register">Jestem nowy na ownCloud</string>
-  <string name="new_session_uri_error">Niepoprawny URL</string>
-  <string name="new_session_session_name_error">Zła nazwa sesji</string>
+  <string name="auth_register">Jestem nowym użytkownikiem %1$s</string>
+  <string name="new_session_uri_error">Podano niepoprawny adres</string>
+  <string name="new_session_session_name_error">Niepoprawna nazwa sesji</string>
   <string name="sync_string_files">Pliki</string>
-  <string name="uploader_no_file_selected">Nie wybrano plików do przesłania</string>
+  <string name="uploader_no_file_selected">Nie wybrano plików do wysłania</string>
   <string name="setup_hint_username">Nazwa użytkownika</string>
   <string name="setup_hint_password">Hasło</string>
-  <string name="setup_hint_address">Adres sieciowy</string>
-  <string name="setup_hint_show_password">Pokaż hasło</string>
-  <string name="setup_title">Połącz do ownCloud</string>
+  <string name="setup_hint_address">Adres internetowy</string>
+  <string name="setup_hint_show_password">Wyświetlić hasło?</string>
+  <string name="setup_title">Połącz z %1$s</string>
   <string name="setup_btn_connect">Połącz</string>
-  <string name="uploader_btn_upload_text">Wyslij</string>
-  <string name="uploader_wrn_no_account_title">Nie znaleziono kont</string>
-  <string name="uploader_wrn_no_account_text">Nie wykryto kont ownCloud, załóż konto w celu używania aplikacji.</string>
+  <string name="uploader_btn_upload_text">Wyślij</string>
+  <string name="uploader_wrn_no_account_title">Nie znaleziono konta</string>
+  <string name="uploader_wrn_no_account_text">Nie wykryto kont %1$s na twoim urządzeniu. Załóż konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ustawienia</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Wyjdź</string>
   <string name="uploader_wrn_no_content_title">Brak danych do wysłania</string>
-  <string name="uploader_wrn_no_content_text">Nie otrzymano danych. Nic do wysłania.</string>
-  <string name="uploader_error_forbidden_content">ownCloud niema dostępu do udostępnionych zawartości</string>
-  <string name="uploader_info_uploading">Przesyłanie</string>
-  <string name="uploader_btn_create_dir_text">Stwórz katalog do przesłania</string>
-  <string name="file_list_empty">Nie ma plików w tym folderze.⏎ Nowe pliki można dodac klikając \"Załaduj\"  opcje menu.</string>
-  <string name="filedetails_select_file">Dotknij po dodatkowe informacje</string>
+  <string name="uploader_wrn_no_content_text">Nie otrzymano danych. Nie ma nic do wysłania.</string>
+  <string name="uploader_error_forbidden_content">%1$s nie ma dostępu do udostępnionych treści</string>
+  <string name="uploader_info_uploading">Wysyłanie</string>
+  <string name="uploader_btn_create_dir_text">Stwórz katalog do wysyłania</string>
+  <string name="file_list_empty">Nie ma plików w tym katalogu.⏎ Nowe pliki można dodać wybierając w menu Wyślij.</string>
+  <string name="filedetails_select_file">Dotknij plik aby wyświetlić dodatkowe informacje</string>
   <string name="filedetails_size">Rozmiar:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Utworzono:</string>
@@ -72,59 +72,59 @@
   <string name="filedetails_sync_file">Odśwież</string>
   <string name="filedetails_redownload">Pobierz ponownie</string>
   <string name="filedetails_open">Otwórz</string>
-  <string name="filedetails_renamed_in_upload_msg">Podczas ładowania nazwa pliku została zmieniona na %1$s</string>
+  <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania nazwa pliku została zmieniona na %1$s</string>
   <string name="common_yes">Tak</string>
   <string name="common_no">Nie</string>
   <string name="common_ok">OK</string>
   <string name="common_cancel_download">Anuluj pobieranie</string>
-  <string name="common_cancel_upload">Przestań wysyłać</string>
+  <string name="common_cancel_upload">Anuluj wysyłanie</string>
   <string name="common_cancel">Anuluj</string>
   <string name="common_save_exit">Zapisz i wyjdź</string>
-  <string name="common_exit">Opuść ownCloud</string>
+  <string name="common_exit">Opuść %1$s</string>
   <string name="common_error">Błąd</string>
   <string name="about_title">O aplikacji</string>
   <string name="delete_account">Usuń konto</string>
   <string name="create_account">Utwórz konto</string>
-  <string name="upload_chooser_title">Prześlij plik z …</string>
+  <string name="upload_chooser_title">Wyślij plik z …</string>
   <string name="uploader_info_dirname">Nazwa katalogu</string>
-  <string name="uploader_upload_in_progress_ticker">Przesyłam…</string>
-  <string name="uploader_upload_in_progress_content">%1$d%% Przesyłam %2$s</string>
-  <string name="uploader_upload_succeeded_ticker">Przesyłanie zakończone</string>
-  <string name="uploader_upload_succeeded_content_single">Nie można przesłać pliku %1$s</string>
-  <string name="uploader_upload_succeeded_content_multiple">Przesłano %1$d plików</string>
-  <string name="uploader_upload_failed_ticker">Przesyłanie nieudane</string>
-  <string name="uploader_upload_failed_content_single">Przesyłanie %1$s plików nie powiodło się</string>
-  <string name="uploader_upload_failed_content_multiple">Przesyłanie nieudane: przesłano %1$d/%2$d plików</string>
-  <string name="downloader_download_in_progress_ticker">Pobieram …</string>
+  <string name="uploader_upload_in_progress_ticker">Wysyłam…</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Wysyłanie %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Wysyłanie zakończone powodzeniem</string>
+  <string name="uploader_upload_succeeded_content_single">Wysyłanie %1$s zakończone sukcesem</string>
+  <string name="uploader_upload_succeeded_content_multiple">Wysłano %1$d plików</string>
+  <string name="uploader_upload_failed_ticker">Wysyłanie nie powiodło się</string>
+  <string name="uploader_upload_failed_content_single">Wysyłanie %1$s nie powiodło się</string>
+  <string name="uploader_upload_failed_content_multiple">Wysyłanie nieudane: wysłano %1$d/%2$d plików</string>
+  <string name="downloader_download_in_progress_ticker">Pobieranie …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Pobieranie %2$s</string>
   <string name="downloader_download_succeeded_ticker">Pobieranie zakończone</string>
   <string name="downloader_download_succeeded_content">Pobrano %1$s plików</string>
   <string name="downloader_download_failed_ticker">Pobieranie nieudane</string>
-  <string name="downloader_download_failed_content">Pobieranie %1$s plików nie powiodło się</string>
+  <string name="downloader_download_failed_content">Pobieranie %1$s nie powiodło się</string>
   <string name="common_choose_account">Wybierz konto</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Błąd synchronizacji</string>
-  <string name="sync_fail_content">Synchronizacja %1$s nie została zakończona</string>
+  <string name="sync_fail_content">Nie można było ukończyć synchronizacji %1$s </string>
   <string name="sync_conflicts_in_favourites_ticker">Znaleziono konflikty</string>
-  <string name="sync_conflicts_in_favourites_content">%1$d nie może zostać zsynchronizowany</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d synchronizowanych plików nie może zostać zsynchronizowanych</string>
   <string name="sync_fail_in_favourites_ticker">Synchronizacja plików nie powiodła się</string>
   <string name="sync_fail_in_favourites_content">Zawartość %1$d plików nie może zostać synchronizowana (%2$d konfliktów)</string>
   <string name="use_ssl">Użyj bezpiecznego połączenia</string>
-  <string name="location_no_provider">ownCloud nie można śledzić urządzenia. Sprawdź ustawienia lokalizacji</string>
-  <string name="pincode_enter_pin_code">Podaj PIN</string>
-  <string name="pincode_enter_new_pin_code">Podaj nowy PIN</string>
-  <string name="pincode_configure_your_pin">Wpisz PIN</string>
-  <string name="pincode_configure_your_pin_explanation">Kod PIN bedzie wymagany za każdym razem, kiedy ta aplikacje wystartuje.</string>
-  <string name="pincode_reenter_your_pincode">Podaj PIN ponownie</string>
-  <string name="pincode_remove_your_pincode">Usuń PIN</string>
+  <string name="location_no_provider">%1$s nie może śledzić urządzenia. Sprawdź ustawienia lokalizacji</string>
+  <string name="pincode_enter_pin_code">Podaj PIN aplikacji</string>
+  <string name="pincode_enter_new_pin_code">Podaj nowy PIN aplikacji</string>
+  <string name="pincode_configure_your_pin">Wpisz PIN aplikacji</string>
+  <string name="pincode_configure_your_pin_explanation">Kod PIN będzie wymagany za każdym razem, gdy aplikacja będzie uruchamiana.</string>
+  <string name="pincode_reenter_your_pincode">Ponownie wpisz PIN aplikacji</string>
+  <string name="pincode_remove_your_pincode">Usuń PIN aplikacji</string>
   <string name="pincode_mismatch">Podane numery PIN są różne</string>
-  <string name="pincode_wrong">Niepoprawny PIN</string>
-  <string name="pincode_removed">Usunięto PIN</string>
-  <string name="pincode_stored">Zapisano PIN</string>
+  <string name="pincode_wrong">Niepoprawny PIN aplikacji</string>
+  <string name="pincode_removed">Usunięto PIN aplikacji</string>
+  <string name="pincode_stored">Zapisano PIN aplikacji</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
-    <item>15 Minut</item>
-    <item>30 Minut</item>
-    <item>60 Minut</item>
+    <item>15 minut</item>
+    <item>30 minut</item>
+    <item>60 minut</item>
   </string-array>
   <string-array name="prefs_trackmydevice_intervall_values">
     <item>15</item>
@@ -133,78 +133,78 @@
   </string-array>
   <string name="auth_trying_to_login">Próbuję się zalogować...</string>
   <string name="auth_no_net_conn_title">Brak połączenia sieciowego</string>
-  <string name="auth_no_net_conn_message">Wykryto brak połączenia z siecią, sprawdź połączenie internetowe i spróbuj ponownie.</string>
+  <string name="auth_no_net_conn_message">Nie znaleziono połączenia sieciowego. Sprawdź połączenie internetowe i spróbuj ponownie.</string>
   <string name="auth_connect_anyway">Połącz mimo wszystko</string>
   <string name="auth_nossl_plain_ok_title">Nie można nawiązać bezpiecznego połączenia.</string>
-  <string name="auth_nossl_plain_ok_message">Aplikacji nie można ustanowić bezpiecznego połączenia z serwerem. Niezabezpieczone połączenie jest dostępne. Może kontynuować lub przyciśnij Anuluj.</string>
+  <string name="auth_nossl_plain_ok_message">Aplikacja nie można ustanowić bezpiecznego połączenia z serwerem. Niezabezpieczone połączenie jest dostępne. Możesz kontynuować lub anulować.</string>
   <string name="auth_connection_established">Połączenie nawiązane</string>
   <string name="auth_testing_connection">Testowanie połączenia…</string>
-  <string name="auth_not_configured_title">Uszkodzona configuracja ownCloud</string>
-  <string name="auth_not_configured_message">Wydaje się, że instancja ownCloud nie jest poprawnie skonfigurowana. Aby uzyskać więcej informacji, skontaktuj się z administratorem.</string>
-  <string name="auth_unknown_error_title">Napotkano nieznany błąd</string>
-  <string name="auth_unknown_error_message">Wystąpił nieznany błąd. Proszę skontaktować się z autorem i dodać dzienniki z urządzenia.</string>
+  <string name="auth_not_configured_title">Uszkodzona konfiguracja serwera</string>
+  <string name="auth_not_configured_message">Wygląda na to, że twoja instancja ownCloud nie jest poprawnie skonfigurowana. Aby uzyskać więcej informacji, skontaktuj się z administratorem.</string>
+  <string name="auth_unknown_error_title">Wystąpił nieznany błąd!</string>
+  <string name="auth_unknown_error_message">Wystąpił nieznany błąd. Proszę skontaktować się z autorami i dodać dzienniki z urządzenia.</string>
   <string name="auth_unknown_host_title">Nie mogę znaleźć hosta</string>
-  <string name="auth_unknown_host_message">Nie można znaleźć podanego hosta. Sprawdź dostępność nazwy hosta i serwera i spróbuj ponownie.</string>
+  <string name="auth_unknown_host_message">Nie można znaleźć podanego hosta. Sprawdź nazwę hosta oraz dostępność serwera i spróbuj ponownie.</string>
   <string name="auth_incorrect_path_title">Nie znaleziono instancji ownCloud</string>
-  <string name="auth_incorrect_path_message">Aplikacja nie odnalazła  instancji ownCloud. Sprawdź ścieżkę i spróbuj ponownie.</string>
+  <string name="auth_incorrect_path_message">Aplikacja nie odnalazła instancji serwera pod podaną ścieżką. Sprawdź ścieżkę i spróbuj ponownie.</string>
   <string name="auth_timeout_title">Serwer zbyt długo nie odpowiadał</string>
   <string name="auth_incorrect_address_title">Zły format adresu URL</string>
-  <string name="auth_ssl_general_error_title">Nie powiodło się inicjowanie SSL</string>
-  <string name="auth_ssl_unverified_server_title">Niezweryfikowany SSL serwera tożsamości</string>
-  <string name="auth_bad_oc_version_title">Nie rozpoznano wersji serwera ownCloud</string>
+  <string name="auth_ssl_general_error_title">Inicjowanie SSL nie powiodło się</string>
+  <string name="auth_ssl_unverified_server_title">Tożsamość SSL serwera niezweryfikowana</string>
+  <string name="auth_bad_oc_version_title">Nie rozpoznano wersji serwera</string>
   <string name="auth_wrong_connection_title">Nie można ustanowić połączenia</string>
   <string name="auth_secure_connection">Nawiązano bezpieczne połączenie</string>
   <string name="auth_login_details">Szczegóły logowania</string>
-  <string name="auth_unauthorized">Nieprawidłowa nazwa użytkownika/hasło</string>
+  <string name="auth_unauthorized">Nieprawidłowa nazwa użytkownika / hasło</string>
   <string name="auth_not_found">Wprowadzono nieprawidłową ścieżkę</string>
   <string name="auth_internal">Wewnętrzny błąd serwera, kod %1$d</string>
   <string name="crashlog_message">Aplikacja została nieoczekiwanie zakończona. Czy chcesz przesłać raport awarii?</string>
   <string name="crashlog_send_report">Wyślij raport</string>
   <string name="crashlog_dont_send_report">Nie wysyłaj raportu</string>
   <string name="extensions_avail_title">Rozszerzenie dostępne!</string>
-  <string name="extensions_avail_message">ownCloud wspiera zaawansowane rozszerzenia. Czy chcesz zobaczyć rozszerzenia dostępne dla Androida?</string>
+  <string name="extensions_avail_message">Twoja instancja serwera wspiera zaawansowane rozszerzenia. Czy chcesz zobaczyć rozszerzenia dostępne dla systemu Android?</string>
   <string name="fd_keep_in_sync">Automatyczne aktualizuj plik</string>
   <string name="common_share">Udostępnij</string>
   <string name="common_rename">Zmień nazwę</string>
   <string name="common_remove">Usuń</string>
-  <string name="confirmation_remove_alert">Czy chcesz usunąć %1$s ?</string>
+  <string name="confirmation_remove_alert">Czy na pewno chcesz usunąć %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Czy usunąć %1$s oraz jego zawartość?</string>
   <string name="confirmation_remove_local">Tylko lokalnie</string>
-  <string name="confirmation_remove_folder_local">Tylko treści lokalne</string>
+  <string name="confirmation_remove_folder_local">Tylko zasoby lokalne</string>
   <string name="confirmation_remove_remote">Usuń z serwera</string>
   <string name="confirmation_remove_remote_and_local">Z serwera i telefonu</string>
   <string name="remove_success_msg">Usunięto</string>
-  <string name="remove_fail_msg">Nie można usunąć pliku</string>
+  <string name="remove_fail_msg">Nie można usunąć</string>
   <string name="rename_dialog_title">Wprowadź nową nazwę</string>
-  <string name="rename_local_fail_msg">Nie można zmienić nazwy lokalnej kopii; Spróbuj inną nową nazwę </string>
-  <string name="rename_server_fail_msg">Nie można zmienić nazwy</string>
+  <string name="rename_local_fail_msg">Nie można zmienić nazwy kopii lokalnej; spróbuj wybrać inną nazwę </string>
+  <string name="rename_server_fail_msg">Zmiana nazwy nie powiodła się</string>
   <string name="sync_file_fail_msg">Nie można sprawdzić zdalnego pliku</string>
   <string name="sync_file_nothing_to_do_msg">Zawartość pliku została już synchronizowana</string>
   <string name="create_dir_fail_msg">Nie można utworzyć katalogu</string>
   <string name="wait_a_moment">Poczekaj chwilę</string>
-  <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; Spróbuj innych aplikacji do wybierz plik</string>
-  <string name="filedisplay_no_file_selected">Nie wybrano żadnego pliku</string>
+  <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
+  <string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
   <string name="ssl_validator_title">Uwaga</string>
-  <string name="ssl_validator_header">Nie można zweryfikować strony</string>
-  <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat jest niezaufany</string>
-  <string name="ssl_validator_reason_cert_expired">- Certyfikat wygasł</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid">- Certyfikat jest przedwczesny</string>
-  <string name="ssl_validator_reason_hostname_not_verified">- URL nie pasuje do certyfikatu</string>
-  <string name="ssl_validator_certificate_not_available">Nie można uzyskać certyfikatu</string>
-  <string name="ssl_validator_question">Zaakceptować certyfikat?</string>
+  <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat serwera jest niezaufany</string>
+  <string name="ssl_validator_reason_cert_expired">- Certyfikat serwera wygasł</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- Certyfikat serwera jest wystawiony w przyszłości</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL nie pasuje do nazwy hosta w certyfikacie</string>
+  <string name="ssl_validator_certificate_not_available">Nie można uzyskać certyfikatu serwera</string>
+  <string name="ssl_validator_question">Zaakceptować certyfikat mimo wszystko?</string>
   <string name="ssl_validator_not_saved">Nie można zapisać certyfikatu</string>
   <string name="ssl_validator_btn_details_see">Szczegóły</string>
-  <string name="ssl_validator_btn_details_hide">Schowaj</string>
-  <string name="ssl_validator_label_subject">Wydane dla:</string>
-  <string name="ssl_validator_label_issuer">Wydane przez:</string>
+  <string name="ssl_validator_btn_details_hide">Ukryj</string>
+  <string name="ssl_validator_label_subject">Wydany dla:</string>
+  <string name="ssl_validator_label_issuer">Wydany przez:</string>
   <string name="ssl_validator_label_CN">Nazwa:</string>
   <string name="ssl_validator_label_O">Organizacja:</string>
   <string name="ssl_validator_label_OU">Jednostka organizacyjna:</string>
-  <string name="ssl_validator_label_C">Państwo:</string>
-  <string name="ssl_validator_label_ST">Województwo:</string>
+  <string name="ssl_validator_label_C">Kraj:</string>
+  <string name="ssl_validator_label_ST">Stan:</string>
   <string name="ssl_validator_label_L">Lokalizacja:</string>
   <string name="ssl_validator_label_validity">Ważność:</string>
-  <string name="ssl_validator_label_validity_from">Z:</string>
+  <string name="ssl_validator_label_validity_from">Od:</string>
   <string name="ssl_validator_label_validity_to">Do:</string>
   <string name="ssl_validator_label_signature">Sygnatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorytm:</string>
@@ -212,8 +212,8 @@
   <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Konflikt aktualizacji</string>
-  <string name="conflict_message">Zdalny plik %s nie jest zsynchronizowany z plikiem lokalnym. Nadal będzie zastąpować zawartość pliku na serwerze.</string>
-  <string name="conflict_keep_both">Utrzymanie obu</string>
+  <string name="conflict_message">Zdalny plik %s nie jest zsynchronizowany z plikiem lokalnym. Kontynuując zastąpisz zawartość pliku na serwerze.</string>
+  <string name="conflict_keep_both">Zatrzymaj oba</string>
   <string name="conflict_overwrite">Zastąp</string>
   <string name="conflict_dont_upload">Nie wysyłaj</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6262585f..8851c6c2 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">ownCloud</string>
-  <string name="main_password">Senha</string>
-  <string name="main_login">Nome de usuário</string>
+  <string name="main_password">Senha:</string>
+  <string name="main_login">Nome de usuário:</string>
   <string name="main_button_login">Login</string>
-  <string name="main_welcome">Bem-vindo ao seu ownCloud</string>
+  <string name="main_welcome">Bem-vindo</string>
   <string name="main_files">Arquivos</string>
   <string name="main_music">Música</string>
-  <string name="main_contacts">Contato</string>
+  <string name="main_contacts">Contatos</string>
   <string name="main_calendar">Calendário</string>
   <string name="main_bookmarks">Favoritos</string>
   <string name="main_settings">Ajustes</string>
@@ -85,17 +85,17 @@
   <string name="about_title">Sobre</string>
   <string name="delete_account">Remover conta</string>
   <string name="create_account">Criar conta</string>
-  <string name="upload_chooser_title">Enviando de ...</string>
+  <string name="upload_chooser_title">Enviar de …</string>
   <string name="uploader_info_dirname">Nome do diretório</string>
-  <string name="uploader_upload_in_progress_ticker">Enviando ...</string>
+  <string name="uploader_upload_in_progress_ticker">Enviando …</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Enviando %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Envio bem sucedido</string>
   <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
   <string name="uploader_upload_succeeded_content_multiple">%1$d arquivos foram enviados com sucesso</string>
-  <string name="uploader_upload_failed_ticker">Envio falhou</string>
+  <string name="uploader_upload_failed_ticker">Falha no envio</string>
   <string name="uploader_upload_failed_content_single">Envio de %1$s não pôde ser completado</string>
   <string name="uploader_upload_failed_content_multiple">Envio falhou: %1$d/%2$d arquivos foram enviados</string>
-  <string name="downloader_download_in_progress_ticker">Baixando ...</string>
+  <string name="downloader_download_in_progress_ticker">Baixando …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download bem sucedido</string>
   <string name="downloader_download_succeeded_content">%1$s foi baixado com sucesso</string>
@@ -106,22 +106,25 @@
   <string name="sync_fail_ticker">Sincronização falhou</string>
   <string name="sync_fail_content">Sincronização de %1$s não pôde ser completada</string>
   <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d arquivos \"manter sincronizados\" não puderam ser sincronizados</string>
+  <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
+  <string name="sync_fail_in_favourites_content">O conteúdo de %1$d arquivos não puderam ser sincronizados (%2$d conflitos)</string>
   <string name="use_ssl">Usar Conexão Segura</string>
-  <string name="location_no_provider">ownCloud não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
-  <string name="pincode_enter_pin_code">Por favor insira o PIN da sua aplicação</string>
-  <string name="pincode_enter_new_pin_code">Por favor, insira seu novo App PIN</string>
-  <string name="pincode_configure_your_pin">Digite ownCloud App PIN</string>
+  <string name="location_no_provider">%1$s não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
+  <string name="pincode_enter_pin_code">Por favor, insira o seu PIN de Aplicativo</string>
+  <string name="pincode_enter_new_pin_code">Por favor, insira seu novo PIN de Aplicativo</string>
+  <string name="pincode_configure_your_pin">Insira seu PIN de Aplicativo</string>
   <string name="pincode_configure_your_pin_explanation">O PIN (senha) será solicitado toda vez que o aplicativo for iniciado</string>
-  <string name="pincode_reenter_your_pincode">Redigite ownCloud App PIN, por favor</string>
-  <string name="pincode_remove_your_pincode">Remova seu ownCloud App PIN</string>
-  <string name="pincode_mismatch">Ambos ownCloud App PIN não são o mesmo</string>
-  <string name="pincode_wrong">ownCloud App PIN incorreto</string>
-  <string name="pincode_removed">ownCloud App PIN removido</string>
-  <string name="pincode_stored">ownCloud App PIN armazenado</string>
+  <string name="pincode_reenter_your_pincode">Por favor, reinsira seu PIN de Aplicativo</string>
+  <string name="pincode_remove_your_pincode">Remova seu PIN de Aplicativo</string>
+  <string name="pincode_mismatch">Os PINs de Aplicativo não são iguais</string>
+  <string name="pincode_wrong">PIN de Aplicativo incorreto</string>
+  <string name="pincode_removed">PIN de Aplicativo removido</string>
+  <string name="pincode_stored">PIN de Aplicativo armazenado</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>60 Minutos</item>
+    <item>15 minutos</item>
+    <item>30 minutos</item>
+    <item>60 minutos</item>
   </string-array>
   <string-array name="prefs_trackmydevice_intervall_values">
     <item>15</item>
@@ -133,17 +136,17 @@
   <string name="auth_no_net_conn_message">Nenhuma conexão foi detectada, verifique sua conexão com a Internet e tente novamente.</string>
   <string name="auth_connect_anyway">Conectar mesmo assim</string>
   <string name="auth_nossl_plain_ok_title">Conexão segura indisponível.</string>
-  <string name="auth_nossl_plain_ok_message">Aplicação não pôde estabelecer uma conexão segura. Entretanto conexão não-segura está disponível. Você pode continuar ou cancelar.</string>
+  <string name="auth_nossl_plain_ok_message">O aplicativo não pôde estabelecer uma conexão segura. Uma conexão não-segura está disponível. Você pode continuar ou cancelar.</string>
   <string name="auth_connection_established">Conexão estabelecida</string>
   <string name="auth_testing_connection">Testando conexão...</string>
-  <string name="auth_not_configured_title">Configuração ownCloud mal formada</string>
-  <string name="auth_not_configured_message">Parece que sua instância ownCloud não está corretamente configurada. Contate seu administrador para mais detalhes.</string>
-  <string name="auth_unknown_error_title">Erro desconhecido ocorreu!</string>
-  <string name="auth_unknown_error_message">Erro desconhecido ocorreu. Por favor contate os desenvolvedores e inclua dos logs do seu dispositivo.</string>
+  <string name="auth_not_configured_title">Configuração do servidor mal formada</string>
+  <string name="auth_not_configured_message">Parece que a instância do seu servidor não está corretamente configurada. Contate seu administrador para mais detalhes.</string>
+  <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
+  <string name="auth_unknown_error_message">Ocorreu um erro desconhecido. Por favor contate o suporte e inclua registros do seu dispositivo.</string>
   <string name="auth_unknown_host_title">Não pôde encontrar host</string>
   <string name="auth_unknown_host_message">Couldn\'t find the entered host. Por favor verifique o nome de host, disponibilidade do servidor e tente novamente.</string>
-  <string name="auth_incorrect_path_title">Instância ownCloud não encontrada</string>
-  <string name="auth_incorrect_path_message">Aplicação não pôde encontrar uma instância ownCloud no caminho dado. Por favor, verifique e tente novamente.</string>
+  <string name="auth_incorrect_path_title">Instância de servidor não encontrada</string>
+  <string name="auth_incorrect_path_message">O aplicativo não pôde encontrar uma instância de servidor no caminho indicado. Por favor, verifique-o e tente novamente.</string>
   <string name="auth_timeout_title">O servidor demorou demais a responder</string>
   <string name="auth_incorrect_address_title">URL mal formada</string>
   <string name="auth_ssl_general_error_title">Inicialização SSL falhou</string>
@@ -155,7 +158,7 @@
   <string name="auth_unauthorized">Login / senha inválida</string>
   <string name="auth_not_found">Caminho dado está errado</string>
   <string name="auth_internal">Erro interno do servidor, código %1$d</string>
-  <string name="crashlog_message">Aplicação terminou inesperadamente. Gostaria de submeter um relatório de erros?</string>
+  <string name="crashlog_message">O aplicativo terminou inesperadamente. Gostaria de enviar um relatório de erros?</string>
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
   <string name="extensions_avail_title">Extensões disponíveis!</string>
@@ -179,7 +182,7 @@
   <string name="sync_file_nothing_to_do_msg">Conteúdo do arquivo já foi sincronizado</string>
   <string name="create_dir_fail_msg">Diretório não pôde ser criado</string>
   <string name="wait_a_moment">Aguarde um momento</string>
-  <string name="filedisplay_unexpected_bad_get_content">Problema inesperado ; por favor, tente usar outro app para selecionar o arquivo</string>
+  <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, tente selecionar o arquivo com outro app</string>
   <string name="filedisplay_no_file_selected">Nenhum arquivo foi selecionado</string>
   <string name="ssl_validator_title">Aviso</string>
   <string name="ssl_validator_header">A identidade do site não pode ser verificada</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f7ebf10b..8b54214f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">owncloud</string>
+  <string name="app_name">ownCloud</string>
   <string name="main_password">Palavra-passe:</string>
   <string name="main_login">Nome de Utilizador:</string>
   <string name="main_button_login">Login</string>
@@ -12,8 +12,8 @@
   <string name="main_bookmarks">Marcadores</string>
   <string name="main_settings">Definições</string>
   <string name="main_tit_accsetup">Configurar conta</string>
-  <string name="main_wrn_accsetup">Não há contas ownCloud no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
-  <string name="about_message">cliente Android ownCloud\n\nversão: %1$s</string>
+  <string name="main_wrn_accsetup">Não há contas no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
+  <string name="about_message">cliente Android  %1$s\n\nversão: %1$s</string>
   <string name="actionbar_sync">Actualizar</string>
   <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Conteúdo das outras apps</string>
@@ -41,7 +41,7 @@
   <string name="auth_host_url">URL ownCloud</string>
   <string name="auth_username">Nome de Utilizador</string>
   <string name="auth_password">Palavra-passe</string>
-  <string name="auth_register">Sou novo na ownCloud</string>
+  <string name="auth_register">Sou novo na  %1$s</string>
   <string name="new_session_uri_error">URL dado errado</string>
   <string name="new_session_session_name_error">Nome de sessão errado</string>
   <string name="sync_string_files">Ficheiros</string>
@@ -50,16 +50,16 @@
   <string name="setup_hint_password">Palavra-passe</string>
   <string name="setup_hint_address">Endereço web</string>
   <string name="setup_hint_show_password">Mostrar palavra-passe?</string>
-  <string name="setup_title">Ligar à sua ownCloud</string>
+  <string name="setup_title">Ligar à sua  %1$s</string>
   <string name="setup_btn_connect">Ligar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
-  <string name="uploader_wrn_no_account_text">Não tem nenhuma conta ownCloud no seu dispositivo. Configure uma conta.</string>
+  <string name="uploader_wrn_no_account_text">Não tem nenhuma conta  %1$s no seu dispositivo. Configure uma conta.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
   <string name="uploader_wrn_no_content_title">Sem conteúdo para carregar</string>
   <string name="uploader_wrn_no_content_text">Não foi recebido nenhum conteúdo. Nada para enviar.</string>
-  <string name="uploader_error_forbidden_content">O ownCloud não está autorizado a aceder aos ficheiro partilhados.</string>
+  <string name="uploader_error_forbidden_content">O  %1$s não está autorizado a aceder aos ficheiro partilhados.</string>
   <string name="uploader_info_uploading">A enviar</string>
   <string name="uploader_btn_create_dir_text">Criar directoria para envio</string>
   <string name="file_list_empty">Não existem ficheiros nesta pasta.\nPode adicionar ficheiros com a opção \"Enviar\" no menu.</string>
@@ -80,7 +80,7 @@
   <string name="common_cancel_upload">Cancelar envio</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar &amp; Sair</string>
-  <string name="common_exit">Sair de ownCloud</string>
+  <string name="common_exit">Sair de  %1$s</string>
   <string name="common_error">Erro</string>
   <string name="about_title">Sobre</string>
   <string name="delete_account">Apagar conta</string>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index 193c74d4..1ccdd0b9 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -3,7 +3,7 @@
   <string name="app_name">ownCloud</string>
   <string name="main_password">Heslo:</string>
   <string name="main_login">Meno:</string>
-  <string name="main_button_login">Login</string>
+  <string name="main_button_login">Prihlásenie</string>
   <string name="main_welcome">Vitajte vo svojom ownCloud</string>
   <string name="main_files">Súbory</string>
   <string name="main_music">Hudba</string>
@@ -12,7 +12,8 @@
   <string name="main_bookmarks">Záložky</string>
   <string name="main_settings">Nastavenia</string>
   <string name="main_tit_accsetup">Nastavenie účtu</string>
-  <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty ownCloud. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
+  <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
+  <string name="about_message">%1$s Android App\n\nverzia: %2$s</string>
   <string name="actionbar_sync">Obnoviť</string>
   <string name="actionbar_upload">Nahraj súbor</string>
   <string name="actionbar_upload_from_apps">Obsah z inej aplikácie</string>
@@ -24,7 +25,7 @@
   <string name="prefs_category_trackmydevice">Sledovanie zariadenia</string>
   <string name="prefs_add_session">Vytvoriť nové sedenie</string>
   <string name="prefs_create_img_thumbnails">Vytvor náhľad obrázku</string>
-  <string name="prefs_select_oc_account">Výbor účet</string>
+  <string name="prefs_select_oc_account">Vyber účet</string>
   <string name="prefs_summary_select_oc_account">Vyberte účet pre túto aplikáciu.</string>
   <string name="prefs_trackmydevice">Sledovanie zariadenia</string>
   <string name="prefs_trackmydevice_summary_off">Povoliť sledovanie polohy zariadenia</string>
@@ -38,27 +39,31 @@
   <string name="prefs_instant_upload">Zapnúť okamžité odosielanie</string>
   <string name="prefs_instant_upload_summary">Okamžite odosielať fotky z fotoaparátu</string>
   <string name="auth_host_url">ownCloud URL</string>
-  <string name="auth_username">Používateľská meno</string>
+  <string name="auth_username">Používateľské meno</string>
   <string name="auth_password">Heslo</string>
-  <string name="auth_register">Som nový v ownCloud</string>
-  <string name="new_session_uri_error">Zadané nesprávne URL</string>
+  <string name="auth_register">Som nový v %1$s</string>
+  <string name="new_session_uri_error">Zadaná nesprávna URL</string>
   <string name="new_session_session_name_error">Nesprávny názov sedenia</string>
   <string name="sync_string_files">Súbory</string>
   <string name="uploader_no_file_selected">Nebol označený žiadny súbor pre odoslanie</string>
-  <string name="setup_hint_username">Meno užívateľa</string>
+  <string name="setup_hint_username">Meno používateľa</string>
   <string name="setup_hint_password">Heslo</string>
   <string name="setup_hint_address">Web adresa</string>
   <string name="setup_hint_show_password">Zobraziť heslo?</string>
   <string name="setup_title">Pripojiť k ownCloud</string>
   <string name="setup_btn_connect">Pripoj</string>
   <string name="uploader_btn_upload_text">Nahrať</string>
-  <string name="uploader_wrn_no_account_title">Účet sa nenašie</string>
+  <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
   <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny ownCloud účet. Zadajte ho prosím.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Koniec</string>
   <string name="uploader_wrn_no_content_title">Žiadny obsah pre odoslanie</string>
+  <string name="uploader_wrn_no_content_text">Nedodaný žiaden obsah. Nič na odoslanie.</string>
+  <string name="uploader_error_forbidden_content">%1$s nemá práva pre prístup k zdieľanému obsahu</string>
   <string name="uploader_info_uploading">Nahrávanie</string>
-  <string name="uploader_btn_create_dir_text">Vytvoriť adresár pre nahrávanie</string>
+  <string name="uploader_btn_create_dir_text">Vytvoriť priečinok pre nahrávanie</string>
+  <string name="file_list_empty">Priečinok neobsahuje súbory.\nNové súbory môžete pridať cez \"Upload\".</string>
+  <string name="filedetails_select_file">Viac informácií získate kliknutím na súbor.</string>
   <string name="filedetails_size">Veľkosť:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Vytvorený:</string>
@@ -67,18 +72,21 @@
   <string name="filedetails_sync_file">Obnoviť</string>
   <string name="filedetails_redownload">Obnoviť</string>
   <string name="filedetails_open">Otvoriť</string>
+  <string name="filedetails_renamed_in_upload_msg">Súbor bol premenovaný na %1$s počas nahrávania</string>
   <string name="common_yes">Áno</string>
   <string name="common_no">Nie</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_download">Zrušiť sťahovanie</string>
   <string name="common_cancel_upload">Zrušiť odosielanie</string>
   <string name="common_cancel">Zrušiť</string>
   <string name="common_save_exit">Uložiť a ukončiť</string>
   <string name="common_exit">Opustiť ownCloud</string>
   <string name="common_error">Chyba</string>
+  <string name="about_title">O</string>
   <string name="delete_account">Zmazať účet</string>
   <string name="create_account">Vytvoriť účet</string>
   <string name="upload_chooser_title">Odoslať z ...</string>
-  <string name="uploader_info_dirname">Názov adresára</string>
+  <string name="uploader_info_dirname">Názov priečinka</string>
   <string name="uploader_upload_in_progress_ticker">Odosielam ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Odosielam %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Odoslanie bolo úspešné</string>
@@ -86,20 +94,29 @@
   <string name="uploader_upload_succeeded_content_multiple">%1$d súborov bolo úspešne odoslaných</string>
   <string name="uploader_upload_failed_ticker">Odoslanie bolo neúspešné</string>
   <string name="uploader_upload_failed_content_single">Odoslanie %1$s nemohlo byť dokončené</string>
+  <string name="uploader_upload_failed_content_multiple">Nahrávanie zlyhalo: %1$d/%2$d súborov bolo odoslaných</string>
   <string name="downloader_download_in_progress_ticker">SÅ¥ahujem ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% SÅ¥ahovanie %2$s</string>
   <string name="downloader_download_succeeded_ticker">Sťahovanie bolo úspešné</string>
+  <string name="downloader_download_succeeded_content">%1$s bol úspešne stiahnutý</string>
   <string name="downloader_download_failed_ticker">Stiahnutie zlyhalo</string>
+  <string name="downloader_download_failed_content">Sťahovanie %1$s nebolo dokončené</string>
   <string name="common_choose_account">Zvoliť účet</string>
   <string name="sync_string_contacts">Kontakty</string>
   <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
+  <string name="sync_fail_content">Synchronizáciu %1$s nemožno dokončiť</string>
+  <string name="sync_conflicts_in_favourites_ticker">Objavené konflikty</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d súborov z automatickej synchronizácie nemožno synchronizovať</string>
+  <string name="sync_fail_in_favourites_ticker">Automatická synchronizácia súborov zlyhala</string>
+  <string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
   <string name="use_ssl">Použiť zabezpečené pripojenie</string>
   <string name="location_no_provider">ownCloud nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
   <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
-  <string name="pincode_enter_new_pin_code">Zadajte nové PIN aplikácie</string>
-  <string name="pincode_configure_your_pin">Zadajte PIN ownCloud aplikácie</string>
-  <string name="pincode_reenter_your_pincode">Zadajte znovu PIN ownCloud aplikácie</string>
-  <string name="pincode_remove_your_pincode">Zrušiť PIN pre ownCloud aplikáciu</string>
+  <string name="pincode_enter_new_pin_code">Zadajte nový PIN aplikácie</string>
+  <string name="pincode_configure_your_pin">Zadajte PIN aplikácie</string>
+  <string name="pincode_configure_your_pin_explanation">Pri každom spustení aplikácie bude vyžadovaný PIN</string>
+  <string name="pincode_reenter_your_pincode">Zadajte znovu PIN aplikácie</string>
+  <string name="pincode_remove_your_pincode">Zrušiť PIN pre aplikáciu</string>
   <string name="pincode_mismatch">PIN sa neshodujú</string>
   <string name="pincode_wrong">Nesprávny PIN aplikácie</string>
   <string name="pincode_removed">PIN aplikácie bol odstránený</string>
@@ -115,42 +132,88 @@
     <item>60</item>
   </string-array>
   <string name="auth_trying_to_login">Pokus o pripojenie...</string>
-  <string name="auth_no_net_conn_title">Bez siete</string>
+  <string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
   <string name="auth_no_net_conn_message">Skontrolujte pripojenie k sieti a opakujte pripojenie znovu.</string>
   <string name="auth_connect_anyway">Aj tak pripojiť</string>
   <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
+  <string name="auth_nossl_plain_ok_message">Aplikácia nemôže nadviazať zabezpečené spojenie so serverom. Nezabezpečené pripojenie je k dispozícii. Môžete pokračovať alebo prerušiť spojenie.</string>
   <string name="auth_connection_established">Pripojenie vytvorené</string>
   <string name="auth_testing_connection">Testovane pripojenia...</string>
   <string name="auth_not_configured_title">Nesprávna konfigurácia ownCloud</string>
+  <string name="auth_not_configured_message">Nastavenie ownCloud nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
   <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
-  <string name="auth_incorrect_path_title">ownCloud instance not found</string>
+  <string name="auth_unknown_error_message">Nastala neznáma chyba. Kontaktujte podporu a pripojte záznam z Vášho zariadenia.</string>
+  <string name="auth_unknown_host_title">Nemožno nájsť hosta</string>
+  <string name="auth_unknown_host_message">Nemôžm sa pripojiť k serveru. Skontrolujte nastavenia servera, či beží a skúste to znovu.</string>
+  <string name="auth_incorrect_path_title">ownCloud inštancia nebola nájdená</string>
+  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu ownCloud. Skontrolujte cestu a skúste to znovu.</string>
   <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
+  <string name="auth_incorrect_address_title">Poškodená URL</string>
   <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
+  <string name="auth_ssl_unverified_server_title">Neoverená SSL identita servera</string>
+  <string name="auth_bad_oc_version_title">Nerozpoznaná verzia servera</string>
   <string name="auth_wrong_connection_title">Nie je možne vytvoriť spojenie</string>
   <string name="auth_secure_connection">Vytvorené zabezpečené spojenie</string>
   <string name="auth_login_details">Podrobnosti prihlásenia</string>
+  <string name="auth_unauthorized">Neplatné prihlasovacie meno / heslo</string>
+  <string name="auth_not_found">Je zadaná neplatná cesta</string>
+  <string name="auth_internal">Interná chyba servera, kód %1$d</string>
+  <string name="crashlog_message">Aplikácia neočakávane ukončila činnosť. Chcete poslať správu o chybe?</string>
   <string name="crashlog_send_report">Poslať výpis</string>
   <string name="crashlog_dont_send_report">Neposlať výpis</string>
   <string name="extensions_avail_title">Sú dostupné rozšírenia.</string>
+  <string name="extensions_avail_message">Vaša inštancia ownCloud podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
   <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_share">Zdieľaj</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
   <string name="confirmation_remove_alert">Naozaj odstrániť %1$s ?</string>
+  <string name="confirmation_remove_folder_alert">Chcete odstrániť %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Iba lokálne</string>
+  <string name="confirmation_remove_folder_local">Len lokálny obsah</string>
   <string name="confirmation_remove_remote">Zmazať zo servera</string>
+  <string name="confirmation_remove_remote_and_local">Vzdialené a lokálne</string>
   <string name="remove_success_msg">Úspešne odstránené</string>
+  <string name="remove_fail_msg">Odstránenie zlyhalo</string>
+  <string name="rename_dialog_title">Zadajte nové meno</string>
+  <string name="rename_local_fail_msg">Lokálna kópia sa nedá premenovať; skúste iné meno</string>
   <string name="rename_server_fail_msg">Nie je možné premenovať</string>
+  <string name="sync_file_fail_msg">Vzdialený súbor nemohol byť prekontrolovaný</string>
+  <string name="sync_file_nothing_to_do_msg">Obsah súboru je zosynchronizovaný</string>
   <string name="create_dir_fail_msg">Priečinok nie je možné vytvoriť</string>
   <string name="wait_a_moment">Počkať chvíľu</string>
+  <string name="filedisplay_unexpected_bad_get_content">Neočakávaný problém; skúste vybrať súbor inou aplikáciou</string>
   <string name="filedisplay_no_file_selected">Nebol vybraný súbor</string>
   <string name="ssl_validator_title">Upozornenie</string>
+  <string name="ssl_validator_header">Identitu stránky nemožno overiť</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Certifikát servera nie je overený</string>
   <string name="ssl_validator_reason_cert_expired">- Platnosť certifikátu servera vypršala</string>
   <string name="ssl_validator_reason_cert_not_yet_valid">- Certifikát servera je príliš mladý</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL nezodpovedá hodnote hostname certifikátu</string>
   <string name="ssl_validator_certificate_not_available">Nie je možné získať certifikát servera</string>
   <string name="ssl_validator_question">Chcete veriť tomuto certifikátu v každom prípade ?</string>
   <string name="ssl_validator_not_saved">Certifikát nemôže byť uložený</string>
+  <string name="ssl_validator_btn_details_see">Podrobnosti</string>
   <string name="ssl_validator_btn_details_hide">Skyť</string>
+  <string name="ssl_validator_label_subject">Vydané pre:</string>
+  <string name="ssl_validator_label_issuer">Vydal:</string>
+  <string name="ssl_validator_label_CN">Obvyklé meno:</string>
+  <string name="ssl_validator_label_O">Organizácia:</string>
+  <string name="ssl_validator_label_OU">Organizačná jednotka:</string>
+  <string name="ssl_validator_label_C">Krajina:</string>
+  <string name="ssl_validator_label_ST">Štát:</string>
+  <string name="ssl_validator_label_L">Miesto:</string>
+  <string name="ssl_validator_label_validity">Platnosť:</string>
+  <string name="ssl_validator_label_validity_from">Z:</string>
+  <string name="ssl_validator_label_validity_to">Do: </string>
+  <string name="ssl_validator_label_signature">Podpis:</string>
+  <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
+  <string name="text_placeholder">To je zástupný znak</string>
   <string name="instant_upload_on_wifi">Odoslať fotografie iba cez WiFi</string>
+  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">Konflikt pri aktualizácii</string>
+  <string name="conflict_message">Vzdialený súbor %s nie je zosynchronizovaný s lokálnym. Pokračovanie prepíše obsah súboru na serveri.</string>
+  <string name="conflict_keep_both">Ponechať oba</string>
+  <string name="conflict_overwrite">Prepísať</string>
+  <string name="conflict_dont_upload">Nenahrávajte</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-sk/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a1efac3f..81124e86 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,26 +1,153 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">ownCloud</string>
+  <string name="main_password">Лозинка:</string>
   <string name="main_login">Корисничко име:</string>
-  <string name="main_button_login">Пријава</string>
-  <string name="main_files">Фајлови</string>
+  <string name="main_button_login">Пријави ме</string>
+  <string name="main_files">Датотеке</string>
   <string name="main_music">Музика</string>
   <string name="main_contacts">Контакти</string>
-  <string name="main_settings">Подешавања</string>
-  <string name="actionbar_upload">Пошаљи</string>
-  <string name="actionbar_upload_files">Фајлови</string>
-  <string name="actionbar_settings">Подешавања</string>
+  <string name="main_calendar">Календар</string>
+  <string name="main_bookmarks">Обележивачи</string>
+  <string name="main_settings">Поставке</string>
+  <string name="main_tit_accsetup">Подешавање налога</string>
+  <string name="actionbar_sync">Освежи</string>
+  <string name="actionbar_upload">Отпреми</string>
+  <string name="actionbar_upload_from_apps">Садржај са других апликација</string>
+  <string name="actionbar_upload_files">Датотеке</string>
+  <string name="actionbar_mkdir">Направи фасциклу</string>
+  <string name="actionbar_search">Претражи</string>
+  <string name="actionbar_settings">Поставке</string>
+  <string name="prefs_category_general">Опште</string>
+  <string name="prefs_category_trackmydevice">Праћење уређаја</string>
+  <string name="prefs_add_session">Додај нову сесију</string>
+  <string name="prefs_create_img_thumbnails">Направи умањене приказе слика</string>
+  <string name="prefs_select_oc_account">Изаберите налог</string>
+  <string name="prefs_trackmydevice_interval_summary">Ажурирај на %1$s мин.</string>
+  <string name="prefs_accounts">Налози</string>
+  <string name="prefs_instant_upload_summary">Тренутно отпремај фотографије сликане камером</string>
   <string name="auth_username">Корисничко име</string>
   <string name="auth_password">Лозинка</string>
   <string name="sync_string_files">Фајлови</string>
+  <string name="uploader_no_file_selected">Нисте изабрали датотеку за отпремање</string>
   <string name="setup_hint_username">Корисничко име</string>
   <string name="setup_hint_password">Лозинка</string>
-  <string name="uploader_btn_upload_text">Пошаљи</string>
-  <string name="filedetails_download">Преузимање</string>
+  <string name="setup_hint_address">Веб адреса</string>
+  <string name="setup_hint_show_password">Приказати лозинку?</string>
+  <string name="setup_btn_connect">Повежи ме</string>
+  <string name="uploader_btn_upload_text">Отпреми</string>
+  <string name="uploader_wrn_no_account_title">Нема налога</string>
+  <string name="uploader_wrn_no_account_setup_btn_text">Подеси</string>
+  <string name="uploader_wrn_no_account_quit_btn_text">Изађи</string>
+  <string name="uploader_wrn_no_content_title">Нема садржаја за отпремање</string>
+  <string name="uploader_wrn_no_content_text">Садржај није примљен. Нема ништа да се отпреми.</string>
+  <string name="uploader_info_uploading">Отпремање</string>
+  <string name="uploader_btn_create_dir_text">Направи фасциклу за отпремање</string>
+  <string name="file_list_empty">Нема датотека у овој фасцикли.\nНове датотеке можете да додате путем опције „Отпреми“.</string>
+  <string name="filedetails_select_file">Додирните датотеку ради приказа додатних информација.</string>
+  <string name="filedetails_size">Величина:</string>
+  <string name="filedetails_type">Врста:</string>
+  <string name="filedetails_created">Направљено:</string>
+  <string name="filedetails_modified">Измењено:</string>
+  <string name="filedetails_download">Преузми</string>
+  <string name="filedetails_sync_file">Освежи</string>
+  <string name="filedetails_open">Отвори</string>
   <string name="common_yes">Да</string>
+  <string name="common_no">Не</string>
+  <string name="common_ok">У реду</string>
   <string name="common_cancel_upload">Прекини слање</string>
   <string name="common_cancel">Откажи</string>
+  <string name="common_save_exit">Сачувај и изађи</string>
   <string name="common_error">Грешка</string>
+  <string name="about_title">О програму</string>
+  <string name="delete_account">Обриши налог</string>
+  <string name="create_account">Отвори налог</string>
+  <string name="upload_chooser_title">Отпреми из…</string>
+  <string name="uploader_info_dirname">Име фасцикле</string>
+  <string name="uploader_upload_in_progress_ticker">Отпремам…</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% Отпремам %2$s</string>
+  <string name="uploader_upload_succeeded_ticker">Отпремање је успело</string>
+  <string name="uploader_upload_failed_ticker">Отпремање није успело</string>
+  <string name="uploader_upload_failed_content_single">Не могу да довршим отпремање датотеке %1$s</string>
+  <string name="uploader_upload_failed_content_multiple">Отпремање није успело. Отпремљено датотека: %1$d/%2$d</string>
+  <string name="downloader_download_in_progress_ticker">Преузимам…</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Преузимам %2$s</string>
+  <string name="downloader_download_failed_ticker">Преузимање није успело</string>
+  <string name="downloader_download_failed_content">Не могу да довршим преузимање датотеке %1$s</string>
+  <string name="common_choose_account">Изабери налог</string>
   <string name="sync_string_contacts">Контакти</string>
-  <string name="common_share">Дељење</string>
+  <string name="sync_fail_ticker">Синхронизовање није успело</string>
+  <string name="sync_fail_content">Не могу да довршим синхронизацију датотеке %1$s</string>
+  <string name="use_ssl">Безбедна веза</string>
+  <string name="pincode_enter_pin_code">Унесите PIN апликације</string>
+  <string name="pincode_enter_new_pin_code">Унесите нови PIN апликације</string>
+  <string name="pincode_configure_your_pin_explanation">Са сваким покретањем апликације мораћете да унесете PIN</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 минута</item>
+    <item>30 минута</item>
+    <item>60 минута</item>
+  </string-array>
+  <string-array name="prefs_trackmydevice_intervall_values">
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+  </string-array>
+  <string name="auth_trying_to_login">Покушавам да вас пријавим…</string>
+  <string name="auth_no_net_conn_title">Нема мрежне везе</string>
+  <string name="auth_connect_anyway">Ипак ме повежи</string>
+  <string name="auth_nossl_plain_ok_title">Безбедна веза није доступна.</string>
+  <string name="auth_connection_established">Веза је успостављена</string>
+  <string name="auth_testing_connection">Тестирам везу…</string>
+  <string name="auth_unknown_error_title">Дошло је до непознате грешке.</string>
+  <string name="auth_unknown_host_title">Не могу да пронађем домаћина</string>
+  <string name="auth_unknown_host_message">Не могу да пронађем наведеног домаћина. Проверите име домаћина и доступност сервера па покушајте поново.</string>
+  <string name="auth_incorrect_path_title">Не могу да пронађем примерак сервера</string>
+  <string name="auth_timeout_title">Серверу је требало предуго да се одазове</string>
+  <string name="auth_incorrect_address_title">Погрешно уобличена адреса</string>
+  <string name="auth_ssl_general_error_title">Покретање SSL-а није успело</string>
+  <string name="auth_ssl_unverified_server_title">Непроверен идентитет SSL сервера</string>
+  <string name="auth_wrong_connection_title">Не могу да успоставим везу</string>
+  <string name="auth_secure_connection">Безбедна веза је успостављена</string>
+  <string name="auth_login_details">Подаци за пријаву</string>
+  <string name="crashlog_send_report">Пошаљи извештај</string>
+  <string name="crashlog_dont_send_report">Не шаљи извештај</string>
+  <string name="extensions_avail_title">Доступна су проширења.</string>
+  <string name="fd_keep_in_sync">Редовно ажурирај датотеку</string>
+  <string name="common_share">Дели</string>
   <string name="common_rename">Преименуј</string>
+  <string name="common_remove">Уклони</string>
+  <string name="confirmation_remove_alert">Желите ли да уклоните %1$s?</string>
+  <string name="confirmation_remove_local">Само локално</string>
+  <string name="confirmation_remove_remote">Уклони са сервера</string>
+  <string name="confirmation_remove_remote_and_local">Удаљено и локално</string>
+  <string name="rename_server_fail_msg">Не могу да довршим преименовање</string>
+  <string name="create_dir_fail_msg">Не могу да направим фасциклу</string>
+  <string name="wait_a_moment">Сачекајте тренутак</string>
+  <string name="filedisplay_no_file_selected">Нисте изабрали датотеку</string>
+  <string name="ssl_validator_title">Упозорење</string>
+  <string name="ssl_validator_header">Не могу да проверим идентитет сајта</string>
+  <string name="ssl_validator_reason_cert_not_trusted">– Сертификат сервера није поверљив</string>
+  <string name="ssl_validator_reason_cert_expired">– Сертификат сервера је истекао</string>
+  <string name="ssl_validator_reason_hostname_not_verified">– Адреса се не поклапа са именом домаћина у сертификату</string>
+  <string name="ssl_validator_certificate_not_available">Не могу да прибавим сертификат сервера</string>
+  <string name="ssl_validator_question">Желите ли ипак да означите сертификат као поверљив?</string>
+  <string name="ssl_validator_not_saved">Не могу да сачувам сертификат</string>
+  <string name="ssl_validator_btn_details_see">Подаци</string>
+  <string name="ssl_validator_btn_details_hide">Сакриј</string>
+  <string name="ssl_validator_label_subject">Издато за:</string>
+  <string name="ssl_validator_label_issuer">Издао/ла:</string>
+  <string name="ssl_validator_label_CN">Уобичајено име:</string>
+  <string name="ssl_validator_label_O">Организација:</string>
+  <string name="ssl_validator_label_OU">Организациона јединица:</string>
+  <string name="ssl_validator_label_C">Земља:</string>
+  <string name="ssl_validator_label_ST">Држава:</string>
+  <string name="ssl_validator_label_L">Локација:</string>
+  <string name="ssl_validator_label_validity">Ваљаност:</string>
+  <string name="ssl_validator_label_validity_from">Од:</string>
+  <string name="ssl_validator_label_validity_to">За:</string>
+  <string name="ssl_validator_label_signature">Потпис:</string>
+  <string name="ssl_validator_label_signature_algorithm">Алгоритам:</string>
+  <string name="text_placeholder">Ово је чувар места</string>
+  <string name="instant_upload_on_wifi">Отпремај слике само путем бежичне мреже</string>
+  <string name="conflict_title">Ажурирај сукоб</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f1786dc1..6aec4a69 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -13,7 +13,7 @@
   <string name="main_settings">Inställningar</string>
   <string name="main_tit_accsetup">Skapa konto</string>
   <string name="main_wrn_accsetup">Det finns inget konto för ownCloud på denna enhet. För att kunna använda ownCloud så måste du skapa ett konto.</string>
-  <string name="about_message">ownCloud Android klient\n\nversion: %1$s</string>
+  <string name="about_message">%1$s Android klient\n\nversion: %2$s</string>
   <string name="actionbar_sync">Uppdatera</string>
   <string name="actionbar_upload">Ladda upp</string>
   <string name="actionbar_upload_from_apps">Innehåll från andra program</string>
@@ -41,7 +41,7 @@
   <string name="auth_host_url">ownCloud URL</string>
   <string name="auth_username">Användare</string>
   <string name="auth_password">Lösenord</string>
-  <string name="auth_register">ownCloud är nytt för mig</string>
+  <string name="auth_register">%1$s är nytt för mig</string>
   <string name="new_session_uri_error">Felaktig URL angavs</string>
   <string name="new_session_session_name_error">Felaktigt sessionsnamn</string>
   <string name="sync_string_files">Filer</string>
@@ -50,16 +50,16 @@
   <string name="setup_hint_password">Lösenord</string>
   <string name="setup_hint_address">Webbadress</string>
   <string name="setup_hint_show_password">Visa lösenord?</string>
-  <string name="setup_title">Anslut till ownCloud</string>
+  <string name="setup_title">Anslut till %1$s</string>
   <string name="setup_btn_connect">Anslut</string>
   <string name="uploader_btn_upload_text">Ladda upp</string>
   <string name="uploader_wrn_no_account_title">Hittar inget konto</string>
-  <string name="uploader_wrn_no_account_text">Det finns inga konton för ownCloud på denna enhet. Var god skapa ett konto först.</string>
+  <string name="uploader_wrn_no_account_text">Det finns inga konton för %1$s på denna enhet. Var god skapa ett konto först.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Skapa</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Avsluta</string>
   <string name="uploader_wrn_no_content_title">Inget att ladda upp</string>
   <string name="uploader_wrn_no_content_text">Inget innehåll mottaget. Inget att ladda upp.</string>
-  <string name="uploader_error_forbidden_content">ownCloud har inte rättighet till det delade innehållet</string>
+  <string name="uploader_error_forbidden_content">%1$s har inte rättighet till det delade innehållet</string>
   <string name="uploader_info_uploading">Laddar upp</string>
   <string name="uploader_btn_create_dir_text">Skapa mapp för att ladda upp</string>
   <string name="file_list_empty">Det finns inga filer i denna mapp.\nNya filer kan läggas till med \"Ladda upp\" i menyn.</string>
@@ -80,7 +80,7 @@
   <string name="common_cancel_upload">Avbryt uppladdning</string>
   <string name="common_cancel">Avbryt</string>
   <string name="common_save_exit">Spara &amp; Avsluta</string>
-  <string name="common_exit">Lämna ownCloud</string>
+  <string name="common_exit">Lämna %1$s</string>
   <string name="common_error">Fel</string>
   <string name="about_title">Om</string>
   <string name="delete_account">Radera konto</string>
@@ -110,7 +110,7 @@
   <string name="sync_fail_in_favourites_ticker">Filer flaggade som HÃ¥ll-filen-uppdaterad misslyckades</string>
   <string name="sync_fail_in_favourites_content">Innehållet i %1$d filer kunde inte synkas (%2$d konflikter)</string>
   <string name="use_ssl">Använd säker anslutning</string>
-  <string name="location_no_provider">ownCloud  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
+  <string name="location_no_provider">%1$s  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
   <string name="pincode_enter_pin_code">Ange din PIN</string>
   <string name="pincode_enter_new_pin_code">Ange din nya PIN</string>
   <string name="pincode_configure_your_pin">Ange ownCloud PIN</string>
diff --git a/res/values-sw-rKE/strings.xml b/res/values-sw-rKE/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/res/values-sw-rKE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 15e88100..2b3f7805 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -72,9 +72,11 @@
   <string name="filedetails_sync_file">รีเฟรช</string>
   <string name="filedetails_redownload">ดาวน์โหลดใหม่อีกครั้ง</string>
   <string name="filedetails_open">เปิด</string>
+  <string name="filedetails_renamed_in_upload_msg">ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %1$s ในระหว่างการอัพโหลด</string>
   <string name="common_yes">ตกลง</string>
   <string name="common_no">ไม่ตกลง</string>
   <string name="common_ok">ตกลง</string>
+  <string name="common_cancel_download">ยกเลิกการดาวน์โหลด</string>
   <string name="common_cancel_upload">ยกเลิกการอัพโหลด</string>
   <string name="common_cancel">ยกเลิก</string>
   <string name="common_save_exit">บันทึก &amp; ออก</string>
@@ -103,6 +105,10 @@
   <string name="sync_string_contacts">ข้อมูลผู้ิติดต่อ</string>
   <string name="sync_fail_ticker">การเชื่อมผสานข้อมูลล้มเหลว</string>
   <string name="sync_fail_content">การเชื่อมผสานข้อมูลของ %1$s ไม่สามารถดำเนินการให้เสร็จสมบูรณ์ได้</string>
+  <string name="sync_conflicts_in_favourites_ticker">ตรวจพบความขัดแย้ง</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d ไฟล์ kept-in-sync ไม่สามารถผสานเชื่อมข้อมูลได้</string>
+  <string name="sync_fail_in_favourites_ticker">ไฟล์ Kept-in-sync ล้มเหลว</string>
+  <string name="sync_fail_in_favourites_content">เนื้อหาของไฟล์ %1$d ไม่สามารถผสานเชื่อมข้อมูลได้ (ความขัดแย้ง %2$d รายการ)</string>
   <string name="use_ssl">ใช้การเชื่อมต่อที่มีการรักษาความปลอดภัย</string>
   <string name="location_no_provider">ownCloud ไม่สามารถตรวจหาอุปกรณ์ของคุณได้ กรุณาตรวจสอบการตั้งค่าตำแหน่งที่อยู่ของคุณ</string>
   <string name="pincode_enter_pin_code">กรุณาใส่ PIN แอปของคุณ</string>
@@ -149,6 +155,9 @@
   <string name="auth_wrong_connection_title">ไม่สามารถเชื่อมต่อได้</string>
   <string name="auth_secure_connection">ดำเนินการติดตั้งการเชื่อมต่อแบบปลอดภัยเรียบร้อย</string>
   <string name="auth_login_details">รายละเอียดการเข้าสู่ระบบ</string>
+  <string name="auth_unauthorized">ชื่อล็อคอิน/รหัสผ่าน ไม่ถูกต้อง</string>
+  <string name="auth_not_found">กรอกตำแหน่งพาธไม่ถูกต้อง</string>
+  <string name="auth_internal">เกิดข้อผิดพลาดภายในเซิร์ฟเวอร์ รหัส %1$d</string>
   <string name="crashlog_message">แอพพลิเคชั่นได้สิ้นสุดการทำงานอย่างไม่คาดคิด คุณต้องการแจ้งข้อมูลความบกพร่องดังกล่าวหรือไม่?</string>
   <string name="crashlog_send_report">ส่งรายงาน</string>
   <string name="crashlog_dont_send_report">ไม่ต้องส่งรายงาน</string>
@@ -159,13 +168,18 @@
   <string name="common_rename">เปลี่ยนชื่อ</string>
   <string name="common_remove">ลบออก</string>
   <string name="confirmation_remove_alert">คุณแน่ใจแล้วหรือว่าต้องการลบ %1$s?</string>
+  <string name="confirmation_remove_folder_alert">คุณแน่ใจแล้วหรือว่าต้องการลบ %1$s และเนื้อหาที่อยู่ข้างในทิ้งไป?</string>
   <string name="confirmation_remove_local">เฉพาะเซิร์ฟเวอร์ภายในเท่านั้น</string>
+  <string name="confirmation_remove_folder_local">เนื้อหาที่อยู่ในเครื่องเท่านั้น</string>
   <string name="confirmation_remove_remote">ลบออกจากเซิร์ฟเวอร์</string>
   <string name="confirmation_remove_remote_and_local">ทั้งเซิร์ฟเวอร์ระยะไกลและเซิร์ฟเวอร์ภายใน</string>
   <string name="remove_success_msg">ลบเรียบร้อยแล้ว</string>
   <string name="remove_fail_msg">การลบออกไม่สามารถดำเนินการได้อย่างเสร็จสมบูรณ์</string>
+  <string name="rename_dialog_title">กรอกชื่อใหม่</string>
   <string name="rename_local_fail_msg">ไฟล์คัดลอกภายในไม่สามารถเปลี่ยนชื่อได้, กรุณาเปลี่ยนเป็นชื่อใหม่</string>
   <string name="rename_server_fail_msg">ไม่สามารถเปลี่ยนชื่อได้</string>
+  <string name="sync_file_fail_msg">ไม่สามารถตรวจสอบไฟล์ระยะไกลได้</string>
+  <string name="sync_file_nothing_to_do_msg">เนื้อหาของไฟล์ถูกผสานข้อมูลอยู่แล้ว</string>
   <string name="create_dir_fail_msg">ไม่สามารถสร้างไดเร็กทอรี่ได้</string>
   <string name="wait_a_moment">กรุณารอสักครู่</string>
   <string name="filedisplay_unexpected_bad_get_content">เกิดปัญหาที่ไม่คาดคิด ; กรุณาลองใช้งานแอปฯอื่นๆ เพื่อเลือกไฟล์</string>
@@ -196,6 +210,7 @@
   <string name="ssl_validator_label_signature_algorithm">อัลกอริทึ่ม:</string>
   <string name="text_placeholder">นี่เป็นตัวยึด</string>
   <string name="instant_upload_on_wifi">อัพโหลดรูปภาพผ่านทาง WiFi เท่านั้น</string>
+  <string name="instant_upload_path">/อัพโหลดทันที</string>
   <string name="conflict_title">ปรับปรุงปัญหาความขัดแย้ง</string>
   <string name="conflict_message">ไฟล์ระยะไกล %s ยังไม่ได้ถูกผสานข้อมูลกับไฟล์ในเครื่อง การดำเนินการต่อไปจะเป็นการแทนที่เนื้อหาของไฟล์ที่อยู่บนเซิร์ฟเวอร์</string>
   <string name="conflict_keep_both">เก็บไว้ทั้งสองอย่าง</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 905a8ae0..be221b2b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,6 +15,7 @@
   <string name="main_wrn_accsetup">Cihazınızda ownCloud hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için ownCloud hesabı oluşturmalısınız.</string>
   <string name="actionbar_sync">Eşitleme hesabi</string>
   <string name="actionbar_upload">Dosya yükle</string>
+  <string name="actionbar_upload_from_apps">Diğer uygulamalardan içerik</string>
   <string name="actionbar_upload_files">Dosyalar</string>
   <string name="actionbar_mkdir">Klasör yarat</string>
   <string name="actionbar_search">Arama</string>
@@ -56,9 +57,11 @@
   <string name="uploader_wrn_no_account_setup_btn_text">Kurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıkış</string>
   <string name="uploader_wrn_no_content_title">Yüklenecek içerik yok</string>
+  <string name="uploader_wrn_no_content_text">Yüklenecek içerik yok. Yüklenecek dosya yok.</string>
   <string name="uploader_error_forbidden_content">ownCloud, paylaşılan içeriğe erişim izni vermiyor</string>
   <string name="uploader_info_uploading">Yükleniyor</string>
   <string name="uploader_btn_create_dir_text">Yükleme için dizin oluştur</string>
+  <string name="file_list_empty">Klasörde dosya yok. Yeni dosyalar yükle\'ye tıklayarak eklenebilir.</string>
   <string name="filedetails_select_file">Ek bilgileri görmek için dosyaya tıklayınız.</string>
   <string name="filedetails_size">Boyut:</string>
   <string name="filedetails_type">Tür:</string>
@@ -99,12 +102,14 @@
   <string name="common_choose_account">Hesap seçiniz</string>
   <string name="sync_string_contacts">Kontaklar</string>
   <string name="sync_fail_ticker">Eşitleme başarısız</string>
+  <string name="sync_fail_content">%1$s Senkronizasyonu tamamlanamadı</string>
   <string name="sync_conflicts_in_favourites_ticker">Çakışma bulundu</string>
   <string name="use_ssl">Güvenli bağlanti kullan</string>
   <string name="location_no_provider">ownCloud cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
   <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
   <string name="pincode_enter_new_pin_code">Lütfen yeni uygulama PIN\'ınızı giriniz</string>
   <string name="pincode_configure_your_pin">ownCloud App PIN giriniz</string>
+  <string name="pincode_configure_your_pin_explanation">PIN uygulama yeniden başladığında tekrar sorulacak</string>
   <string name="pincode_reenter_your_pincode">Lütfen, ownCloud App PIN ni tekrar giriniz</string>
   <string name="pincode_remove_your_pincode">ownCloud App PIN\'nizi kaldırınız.</string>
   <string name="pincode_mismatch">Her iki ownCloud App PIN aynı değil.</string>
@@ -171,7 +176,10 @@
   <string name="filedisplay_unexpected_bad_get_content">Beklenmeyen problem ; lütfen, dosya seçmek için diğer uygulamayı deneyin</string>
   <string name="filedisplay_no_file_selected">Hiçbir dosya seçilmedi</string>
   <string name="ssl_validator_title">Uyarı</string>
+  <string name="ssl_validator_header">Bu sitenin sertifikası doğrulanamadı</string>
+  <string name="ssl_validator_reason_cert_not_trusted">- Sunucu sertifikası güvenilmez</string>
   <string name="ssl_validator_reason_cert_expired">- Sunucu sertifikasının süresi geçmiş</string>
+  <string name="ssl_validator_reason_hostname_not_verified">- URL adresi sunucu isminin sertifikası ile uyuşmuyor</string>
   <string name="ssl_validator_certificate_not_available">Sunucu sertifikası elde edilemedi</string>
   <string name="ssl_validator_question">Sertifikaya yine de güvenmek istiyor musunuz?</string>
   <string name="ssl_validator_not_saved">Sertifika kaydedilemedi</string>
@@ -189,6 +197,7 @@
   <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
   <string name="text_placeholder">Bu bir yer tutucudur</string>
   <string name="instant_upload_on_wifi">Resimleri sadece WiFi bağlantısında yükle</string>
+  <string name="instant_upload_path">/AnındaYükle</string>
   <string name="conflict_title">Çakışmayı güncelle</string>
   <string name="conflict_keep_both">Ä°kisini de koru</string>
   <string name="conflict_overwrite">Üzerine yaz</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b7f4c4d4..a835f25e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -13,7 +13,7 @@
   <string name="main_settings">Налаштування</string>
   <string name="main_tit_accsetup">Налаштування облікового запису</string>
   <string name="main_wrn_accsetup">На Вашому пристрої відсутні облікові запси ownCloud. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
-  <string name="about_message">ownCloud Android клієнт\n\nверсія: %1$s</string>
+  <string name="about_message">%1$s Android клієнт\n\nверсія: %2$s</string>
   <string name="actionbar_sync">Оновити</string>
   <string name="actionbar_upload">Відвантажити</string>
   <string name="actionbar_upload_from_apps">Вміст із інших програм</string>
@@ -31,7 +31,7 @@
   <string name="prefs_trackmydevice_summary_off">Дозволити ownCloud стежити за місцезнаходженням Вашого пристрою</string>
   <string name="prefs_trackmydevice_summary_on">Ваш ownCloud стежить за цим пристроєм</string>
   <string name="prefs_trackmydevice_interval">Інтервал оновлення</string>
-  <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$ хвилин</string>
+  <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$s хвилин</string>
   <string name="prefs_accounts">Облікові записи</string>
   <string name="prefs_manage_accounts">Управління обліковими записами</string>
   <string name="prefs_pincode">ownCloud програмний PIN</string>
@@ -98,13 +98,13 @@
   <string name="downloader_download_in_progress_ticker">Зкачування …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Зкачування %2$s</string>
   <string name="downloader_download_succeeded_ticker">Успішно зкачано</string>
-  <string name="downloader_download_succeeded_content">%1$ успішно завантажено</string>
+  <string name="downloader_download_succeeded_content">%1$s успішно завантажено</string>
   <string name="downloader_download_failed_ticker">Завантаження не вдалося</string>
-  <string name="downloader_download_failed_content">Завантаження %1$ не вдається завершити</string>
+  <string name="downloader_download_failed_content">Завантаження %1$s не вдається завершити</string>
   <string name="common_choose_account">Оберіть обліковий запис</string>
   <string name="sync_string_contacts">Контакти</string>
   <string name="sync_fail_ticker">Помилка синхронізації</string>
-  <string name="sync_fail_content">Синхронізація %1$не вдалась</string>
+  <string name="sync_fail_content">Синхронізація %1$s не вдалась</string>
   <string name="sync_conflicts_in_favourites_ticker">Конфліктів знайдено</string>
   <string name="sync_conflicts_in_favourites_content">%1$d файли, які мають бути синхронізованими не можуть синхронізуватися</string>
   <string name="sync_fail_in_favourites_ticker">Синхронізувати файли не вдалося</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
new file mode 100644
index 00000000..1f54d776
--- /dev/null
+++ b/res/values-ur-rPK/strings.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="main_settings">سیٹینگز</string>
+  <string name="actionbar_settings">سیٹینگز</string>
+  <string name="auth_username">یوزر نیم</string>
+  <string name="auth_password">پاسورڈ</string>
+  <string name="setup_hint_username">یوزر نیم</string>
+  <string name="setup_hint_password">پاسورڈ</string>
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 86092fc2..58755312 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -106,6 +106,8 @@
   <string name="sync_fail_ticker">Đồng bộ thất bại</string>
   <string name="sync_fail_content">Đồng bộ %1$s không thể hoàn thành</string>
   <string name="sync_conflicts_in_favourites_ticker">Tìm thấy xung đột</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d file trong hàng đợi đồng bộ không thể được đồng bộ</string>
+  <string name="sync_fail_in_favourites_ticker">Các file trong hàng đợi đồng bộ không thành công</string>
   <string name="sync_fail_in_favourites_content">Nội dung tập tin %1$d không thể đồng bộ (%2$d xung đột)</string>
   <string name="use_ssl">Sử dụng kết nối an toàn</string>
   <string name="location_no_provider">ownCloud không thể theo dõi điện thoại của bạn. Vui lòng kiểm tra cài đặt vị trí của bạn</string>
@@ -153,6 +155,7 @@
   <string name="auth_wrong_connection_title">Không thể thiết lập kết nối</string>
   <string name="auth_secure_connection">Kết nối an toàn đã được thiết lập</string>
   <string name="auth_login_details">Chi tiết đăng nhập</string>
+  <string name="auth_unauthorized">Sai tên đăng nhập/ mật khẩu</string>
   <string name="auth_not_found">Đường dẫn đã cho không đúng</string>
   <string name="auth_internal">Lỗi máy chủ nội bộ, mã lỗi %1$d</string>
   <string name="crashlog_message">Ứng dụng chấm dứt đột ngột. Bạn có muốn gửi báo cáo sự cố?</string>
@@ -167,6 +170,7 @@
   <string name="confirmation_remove_alert">Bạn có thực sự muốn xóa %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Bạn có thật sự muốn xóa %1$s và nội dung của nó ?</string>
   <string name="confirmation_remove_local">Chỉ cục bộ</string>
+  <string name="confirmation_remove_folder_local">Chỉ nội dung trên máy</string>
   <string name="confirmation_remove_remote">Xóa từ máy chủ</string>
   <string name="confirmation_remove_remote_and_local">Remote và local</string>
   <string name="remove_success_msg">Xóa thành công</string>
@@ -206,6 +210,7 @@
   <string name="ssl_validator_label_signature_algorithm">Thuật toán :</string>
   <string name="text_placeholder">Vị trí này đã được đặt chỗ trước</string>
   <string name="instant_upload_on_wifi">Tải hình ảnh lên thông qua WiFi</string>
+  <string name="instant_upload_path">/Upload tức thì</string>
   <string name="conflict_title">Cập nhật xung đột</string>
   <string name="conflict_message">%s là tập tin từ xa nó không đồng bộ với tập tin máy bạn . Nếu bạn tiếp tục sẽ thay đổi nội dung của tập tin trên máy chủ.</string>
   <string name="conflict_keep_both">Giữ cho cả hai</string>
diff --git a/res/values-zh-rBG/strings.xml b/res/values-zh-rBG/strings.xml
index b45ca46e..c56e4ca2 100644
--- a/res/values-zh-rBG/strings.xml
+++ b/res/values-zh-rBG/strings.xml
@@ -72,9 +72,11 @@
   <string name="filedetails_sync_file">刷新</string>
   <string name="filedetails_redownload">重新下载</string>
   <string name="filedetails_open">打开</string>
+  <string name="filedetails_renamed_in_upload_msg">文件在上传过程中被重命名为 %1$s </string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
   <string name="common_ok">好</string>
+  <string name="common_cancel_download">取消下载</string>
   <string name="common_cancel_upload">取消上传</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">保存 &amp; 退出</string>
@@ -103,6 +105,8 @@
   <string name="sync_string_contacts">联系人</string>
   <string name="sync_fail_ticker">同步失败</string>
   <string name="sync_fail_content">不能完成 %1$s 的同步</string>
+  <string name="sync_conflicts_in_favourites_ticker">存在冲突</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d 计划同步文件无法同步</string>
   <string name="use_ssl">使用安全连接</string>
   <string name="location_no_provider">ownCloud 不能跟踪您的设备。请检查您的位置设置</string>
   <string name="pincode_enter_pin_code">请插入您的应用 PIN</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e85f14ae..a0437a57 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -106,6 +106,8 @@
   <string name="sync_fail_ticker">同步失败</string>
   <string name="sync_fail_content"> %1$s同步未完成。</string>
   <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d 文件无法同步</string>
+  <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
   <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="use_ssl">使用安全链接</string>
   <string name="location_no_provider">ownCloud不能跟踪你的设备。请检查你的位置设置。</string>
@@ -208,6 +210,7 @@
   <string name="ssl_validator_label_signature_algorithm">算法：</string>
   <string name="text_placeholder">占位符一枚</string>
   <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>
+  <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">上传冲突</string>
   <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
   <string name="conflict_keep_both">保留两者</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5da07670..7e3df8da 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -4,7 +4,7 @@
   <string name="main_password">密碼：</string>
   <string name="main_login">使用者名稱：</string>
   <string name="main_button_login">登入</string>
-  <string name="main_welcome">歡迎來到您的ownCloud</string>
+  <string name="main_welcome">歡迎</string>
   <string name="main_files">檔案</string>
   <string name="main_music">音樂</string>
   <string name="main_contacts">通訊錄</string>
@@ -12,30 +12,40 @@
   <string name="main_bookmarks">書籤</string>
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">設定帳號</string>
-  <string name="main_wrn_accsetup">您尚未在裝置上設定您的ownCloud帳號. 您必需建立一組帳號才能繼續使用.</string>
-  <string name="actionbar_sync">更新</string>
+  <string name="main_wrn_accsetup">您尚未在裝置上設定您的 ownCloud 帳號，您必需建立一組帳號才能繼續使用。</string>
+  <string name="actionbar_sync">重新整理</string>
   <string name="actionbar_upload">上傳檔案</string>
   <string name="actionbar_upload_files">檔案</string>
   <string name="actionbar_mkdir">建立目錄</string>
   <string name="actionbar_search">搜尋</string>
   <string name="actionbar_settings">設定</string>
   <string name="prefs_category_general">一般</string>
+  <string name="prefs_category_trackmydevice">裝置追蹤</string>
+  <string name="prefs_add_session">增加新連線</string>
   <string name="prefs_create_img_thumbnails">建立圖片縮圖</string>
   <string name="prefs_select_oc_account">選擇一個帳號</string>
+  <string name="prefs_summary_select_oc_account">您要使用哪幾個帳號？</string>
+  <string name="prefs_trackmydevice">裝置追蹤</string>
+  <string name="prefs_trackmydevice_summary_off">啓用此應用程式以追蹤所在位置</string>
+  <string name="prefs_trackmydevice_summary_on">此應用程式會追蹤這個裝置</string>
   <string name="prefs_trackmydevice_interval">更新間隔</string>
   <string name="prefs_trackmydevice_interval_summary">每 %1$s 分鐘更新</string>
   <string name="prefs_accounts">帳號</string>
   <string name="prefs_manage_accounts">管理帳號</string>
   <string name="prefs_pincode_summary">保護您的ownCloud用戶端</string>
   <string name="prefs_instant_upload">啟用即時上傳</string>
-  <string name="auth_host_url">網址URL</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">使用者名稱</string>
   <string name="auth_password">密碼</string>
-  <string name="new_session_uri_error">錯誤的URL</string>
+  <string name="new_session_uri_error">錯誤的位址</string>
+  <string name="new_session_session_name_error">錯誤的連線名稱</string>
   <string name="sync_string_files">檔案</string>
+  <string name="uploader_no_file_selected">未選擇任何要上傳的檔案</string>
   <string name="setup_hint_username">使用者名稱</string>
   <string name="setup_hint_password">密碼</string>
-  <string name="setup_title">連線至您的ownCloud</string>
+  <string name="setup_hint_address">網頁位址</string>
+  <string name="setup_hint_show_password">顯示密碼？</string>
+  <string name="setup_title">連線至您的 %1$s</string>
   <string name="setup_btn_connect">連線</string>
   <string name="uploader_btn_upload_text">上傳</string>
   <string name="uploader_wrn_no_account_title">找不到帳號</string>
@@ -44,6 +54,7 @@
   <string name="uploader_wrn_no_account_quit_btn_text">離開</string>
   <string name="uploader_info_uploading">上傳中</string>
   <string name="uploader_btn_create_dir_text">建立上傳目錄</string>
+  <string name="filedetails_select_file">在檔案上輕觸來顯示更多資訊。</string>
   <string name="filedetails_size">容量:</string>
   <string name="filedetails_type">類型:</string>
   <string name="filedetails_created">建立:</string>
@@ -54,8 +65,10 @@
   <string name="filedetails_open">開啟</string>
   <string name="common_yes">是</string>
   <string name="common_no">否</string>
+  <string name="common_ok">好</string>
   <string name="common_cancel_upload">取消上傳</string>
   <string name="common_cancel">取消</string>
+  <string name="common_save_exit">儲存並離開</string>
   <string name="common_exit">離開ownCloud</string>
   <string name="common_error">錯誤</string>
   <string name="about_title">關於</string>
@@ -73,16 +86,48 @@
   <string name="downloader_download_failed_ticker">下載失敗</string>
   <string name="common_choose_account">選擇帳號</string>
   <string name="sync_string_contacts">通訊錄</string>
+  <string name="use_ssl">使用安全連線</string>
+  <string name="location_no_provider">%1$s 無法追蹤您的裝置，請檢查定位服務設定</string>
+  <string name="pincode_enter_pin_code">請輸入您的 App PIN</string>
+  <string name="pincode_enter_new_pin_code">請輸入您的新 App PIN</string>
+  <string name="pincode_configure_your_pin">輸入您的 App PIN</string>
+  <string name="pincode_reenter_your_pincode">請重新輸入您的 App PIN</string>
+  <string name="pincode_remove_your_pincode">移除您的 App PIN</string>
+  <string name="pincode_mismatch">App PIN 不相符</string>
+  <string name="pincode_wrong">App PIN 不正確</string>
+  <string name="pincode_removed">App PIN 已移除</string>
+  <string name="pincode_stored">App PIN 已儲存</string>
+  <string-array name="prefs_trackmydevice_intervall_keys">
+    <item>15 分鐘</item>
+    <item>30 分鐘</item>
+    <item>60 分鐘</item>
+  </string-array>
   <string-array name="prefs_trackmydevice_intervall_values">
     <item>15</item>
     <item>30</item>
     <item>60</item>
   </string-array>
+  <string name="auth_trying_to_login">嘗試登入...</string>
+  <string name="auth_no_net_conn_title">沒有網際網路連線</string>
+  <string name="auth_no_net_conn_message">沒有偵測到網際網路連線，請檢查您的連線然後再試一次。</string>
+  <string name="auth_connect_anyway">繼續連線</string>
+  <string name="auth_nossl_plain_ok_title">安全連線不可用。</string>
+  <string name="auth_nossl_plain_ok_message">無法與伺服器建立安全連線，可以使用不安全連線（未加密）以繼續，您可以繼續或取消。</string>
+  <string name="auth_connection_established">連線已建立</string>
+  <string name="auth_testing_connection">測試連線...</string>
+  <string name="auth_not_configured_title">伺服器設定有問題</string>
+  <string name="auth_not_configured_message">看起來您的伺服器並未被正確設定，請聯絡服務管理者以取得協助。</string>
+  <string name="auth_unknown_error_title">發生未知的錯誤！</string>
+  <string name="auth_unknown_error_message">發生未知的錯誤，請聯絡支援服務並附上您的記錄檔。</string>
+  <string name="auth_incorrect_path_title">找不到伺服器</string>
+  <string name="auth_incorrect_path_message">在指定的路徑找不到伺服器，請檢查您的路徑然後再試一次。</string>
   <string name="auth_incorrect_address_title">URL 不正確</string>
   <string name="auth_ssl_general_error_title">SSL 初始化失敗</string>
   <string name="auth_ssl_unverified_server_title">未經驗證的 SSL 伺服器身份</string>
   <string name="auth_bad_oc_version_title">無法辨識的ownCloud伺服器版本</string>
   <string name="auth_wrong_connection_title">無法建立連線</string>
+  <string name="auth_secure_connection">安全連線已建立</string>
+  <string name="auth_login_details">登入細節</string>
   <string name="fd_keep_in_sync">讓檔案保持最新的</string>
   <string name="common_share">分享</string>
   <string name="common_rename">重新命名</string>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 7ca86c6a..b23e4967 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <!-- Default boolean values -->
 <resources>
     <bool name="large_layout">false</bool>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 26a029b4..3300a203 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <resources>
+    
     <color name="filelist_icon_backgorund">#DDDDDD</color>
+    <color name="owncloud_blue_bright">#00ddff</color>
     <color name="owncloud_white">#F7F7F7</color>
     
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21938f09..512f6569 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,7 +25,6 @@
     <string name="actionbar_settings">Settings</string>
     
     <string name="prefs_category_general">General</string>
-    <string name="prefs_category_trackmydevice">Device tracking</string>
     <string name="prefs_add_session">Add new session</string>
     <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
     <string name="prefs_select_oc_account">Select an account</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6cbed998..ef0cc095 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <resources>
 	<style name="Animations" />
 
diff --git a/res/values/urls.xml b/res/values/urls.xml
index b4098270..6ce6c6d6 100644
--- a/res/values/urls.xml
+++ b/res/values/urls.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <resources>
     <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
index ae32f0dc..67d02c04 100644
--- a/res/xml/authenticator.xml
+++ b/res/xml/authenticator.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
                        android:accountType="owncloud"
                        android:icon="@drawable/icon"
diff --git a/res/xml/contacts.xml b/res/xml/contacts.xml
deleted file mode 100644
index e55f1264..00000000
--- a/res/xml/contacts.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ContactsDataKind
-        android:mimeType="vnd.android.cursor.item/vnd.owncloud.contact.profile"
-        android:icon="@drawable/icon"
-        android:summaryColumn="data2"
-        android:detailColumn="data3"
-        android:detailSocialSummary="true" 
-        android:syncable="true"/>
-
-</ContactsSource>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f3c49525..3b168f54 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 	<PreferenceCategory android:title="@string/prefs_category_general">
     
diff --git a/res/xml/preferences_new_session.xml b/res/xml/preferences_new_session.xml
index da7d6657..abb6e316 100644
--- a/res/xml/preferences_new_session.xml
+++ b/res/xml/preferences_new_session.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
     <EditTextPreference></EditTextPreference>
diff --git a/res/xml/syncadapter_contacts.xml b/res/xml/syncadapter_contacts.xml
deleted file mode 100644
index f85b7ca2..00000000
--- a/res/xml/syncadapter_contacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.contacts"
-    android:accountType="owncloud"
-    android:supportsUploading="true"
-/>
diff --git a/res/xml/syncadapter_files.xml b/res/xml/syncadapter_files.xml
index 3285ea8b..7512477c 100644
--- a/res/xml/syncadapter_files.xml
+++ b/res/xml/syncadapter_files.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/**
- * Copyright (c) 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <!-- The attributes in this XML file provide configuration information -->
diff --git a/src/com/owncloud/android/AccountUtils.java b/src/com/owncloud/android/AccountUtils.java
index 06ab31a9..fba0c368 100644
--- a/src/com/owncloud/android/AccountUtils.java
+++ b/src/com/owncloud/android/AccountUtils.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -61,7 +62,9 @@ public class AccountUtils {
                     break;
                 }
             }
-        } else if (ocAccounts.length != 0) {
+        }
+        
+        if (defaultAccount == null && ocAccounts.length != 0) {
             // we at least need to take first account as fallback
             defaultAccount = ocAccounts[0];
         }
@@ -84,11 +87,26 @@ public class AccountUtils {
     }
     
     
-    public static void setCurrentOwnCloudAccount(Context context, String name) {
-        SharedPreferences.Editor appPrefs = PreferenceManager
-                .getDefaultSharedPreferences(context).edit();
-        appPrefs.putString("select_oc_account", name);
-        appPrefs.commit();
+    public static boolean setCurrentOwnCloudAccount(Context context, String accountName) {
+        boolean result = false;
+        if (accountName != null) {
+            Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
+                    AccountAuthenticator.ACCOUNT_TYPE);
+            boolean found = false;
+            for (Account account : ocAccounts) {
+                found = (account.name.equals(accountName));
+                if (found) {
+                    SharedPreferences.Editor appPrefs = PreferenceManager
+                            .getDefaultSharedPreferences(context).edit();
+                    appPrefs.putString("select_oc_account", accountName);
+    
+                    appPrefs.commit();
+                    result = true;
+                    break;
+                }
+            }
+        }
+        return result;
     }
 
     /**
diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/com/owncloud/android/DisplayUtils.java
index a9cfe1dc..70a96727 100644
--- a/src/com/owncloud/android/DisplayUtils.java
+++ b/src/com/owncloud/android/DisplayUtils.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -18,18 +19,25 @@
 
 package com.owncloud.android;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import android.util.Log;
 
 /**
  * A helper class for some string operations.
  * 
  * @author Bartek Przybylski
- * 
+ * @author David A. Velasco
  */
 public class DisplayUtils {
-
-    private static final String[] suffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
+    
+    private static String TAG = DisplayUtils.class.getSimpleName(); 
+    
+    private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
 
     private static HashMap<String, String> mimeType2HUmanReadable;
     static {
@@ -48,6 +56,22 @@ public class DisplayUtils {
 
     }
 
+    private static final String TYPE_APPLICATION = "application";
+    private static final String TYPE_AUDIO = "audio";
+    private static final String TYPE_IMAGE = "image";
+    private static final String TYPE_TXT = "text";
+    private static final String TYPE_VIDEO = "video";
+    
+    private static final String SUBTYPE_PDF = "pdf";
+    private static final String[] SUBTYPES_DOCUMENT = { "msword", "mspowerpoint", "msexcel", 
+                                                        "vnd.oasis.opendocument.presentation",
+                                                        "vnd.oasis.opendocument.spreadsheet",
+                                                        "vnd.oasis.opendocument.text"
+                                                        };
+    private static Set<String> SUBTYPES_DOCUMENT_SET = new HashSet<String>(Arrays.asList(SUBTYPES_DOCUMENT));
+    private static final String[] SUBTYPES_COMPRESSED = {"x-tar", "x-gzip", "zip"};
+    private static final Set<String> SUBTYPES_COMPRESSED_SET = new HashSet<String>(Arrays.asList(SUBTYPES_COMPRESSED));
+    
     /**
      * Converts the file size in bytes to human readable output.
      * 
@@ -57,12 +81,12 @@ public class DisplayUtils {
     public static String bytesToHumanReadable(long bytes) {
         double result = bytes;
         int attachedsuff = 0;
-        while (result > 1024 && attachedsuff < suffixes.length) {
+        while (result > 1024 && attachedsuff < sizeSuffixes.length) {
             result /= 1024.;
             attachedsuff++;
         }
         result = ((int) (result * 100)) / 100.;
-        return result + " " + suffixes[attachedsuff];
+        return result + " " + sizeSuffixes[attachedsuff];
     }
 
     /**
@@ -104,6 +128,58 @@ public class DisplayUtils {
             return mimetype.split("/")[1].toUpperCase() + " file";
         return "Unknown type";
     }
+    
+    
+    /**
+     * Returns the resource identifier of an image resource to use as icon associated to a 
+     * known MIME type.
+     * 
+     * @param mimetype      MIME type string.
+     * @return              Resource identifier of an image resource.
+     */
+    public static int getResourceId(String mimetype) {
+
+        if (mimetype == null || "DIR".equals(mimetype)) {
+            return R.drawable.ic_menu_archive;
+            
+        } else {
+            String [] parts = mimetype.split("/");
+            String type = parts[0];
+            String subtype = (parts.length > 1) ? parts[1] : "";
+            
+            if(TYPE_TXT.equals(type)) {
+                return R.drawable.file_doc;
+    
+            } else if(TYPE_IMAGE.equals(type)) {
+                return R.drawable.file_image;
+                
+            } else if(TYPE_VIDEO.equals(type)) {
+                return R.drawable.file_movie;
+                
+            } else if(TYPE_AUDIO.equals(type)) {  
+                return R.drawable.file_sound;
+                
+            } else if(TYPE_APPLICATION.equals(type)) {
+                
+                if (SUBTYPE_PDF.equals(subtype)) {
+                    return R.drawable.file_pdf;
+                    
+                } else if (SUBTYPES_DOCUMENT_SET.contains(subtype)) {
+                    return R.drawable.file_doc;
+
+                } else if (SUBTYPES_COMPRESSED_SET.contains(subtype)) {
+                    return R.drawable.file_zip;
+                }
+    
+            }
+            // problems: RAR, RTF, 3GP are send as application/octet-stream from the server ; extension in the filename should be explicitly reviewed
+        }
+
+        // default icon
+        return R.drawable.file;
+    }
+
+    
 
     /**
      * Converts Unix time to human readable format
diff --git a/src/com/owncloud/android/OwnCloudSession.java b/src/com/owncloud/android/OwnCloudSession.java
index 67f9b8e1..142daffb 100644
--- a/src/com/owncloud/android/OwnCloudSession.java
+++ b/src/com/owncloud/android/OwnCloudSession.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 02579d75..aadf4d9e 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticator.java b/src/com/owncloud/android/authenticator/AccountAuthenticator.java
index 8b85392e..a42c1f20 100644
--- a/src/com/owncloud/android/authenticator/AccountAuthenticator.java
+++ b/src/com/owncloud/android/authenticator/AccountAuthenticator.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -197,7 +198,7 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
     public Bundle hasFeatures(AccountAuthenticatorResponse response,
             Account account, String[] features) throws NetworkErrorException {
         final Bundle result = new Bundle();
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false);
+        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
         return result;
     }
 
diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java b/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java
index e11b03a4..e3972b65 100644
--- a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java
+++ b/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/datamodel/DataStorageManager.java b/src/com/owncloud/android/datamodel/DataStorageManager.java
index 0ab05049..37753476 100644
--- a/src/com/owncloud/android/datamodel/DataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/DataStorageManager.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 987e291a..aa914c47 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index b1361298..668e9917 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java
index 9f9b50fc..bd0fcd17 100644
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -3,7 +3,7 @@
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index ffe930b7..279f2ba8 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java
index 60c62a1f..d57fc7f8 100644
--- a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java
+++ b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
index 5fd02d90..ccef3408 100644
--- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
+++ b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/extensions/ExtensionsListActivity.java b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
index 0fe3c6c1..5b167291 100644
--- a/src/com/owncloud/android/extensions/ExtensionsListActivity.java
+++ b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/com/owncloud/android/files/BootupBroadcastReceiver.java
index 8f716fad..e322fa5d 100644
--- a/src/com/owncloud/android/files/BootupBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/BootupBroadcastReceiver.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index d2490743..c3ca6c87 100644
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index d79a07e2..8f987fa4 100644
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java
index 851a8f88..0bbb6bb7 100644
--- a/src/com/owncloud/android/files/managers/OCNotificationManager.java
+++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index ed83d863..d813aaf3 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index 73a03ec9..d4bf24d0 100644
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 524f4c10..32aa576b 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java
index 9c61b876..0be14cc4 100644
--- a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java
+++ b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
index b1beda14..a2b131f8 100644
--- a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
+++ b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java
index 298d15b6..1b6b28a7 100644
--- a/src/com/owncloud/android/location/LocationUpdateService.java
+++ b/src/com/owncloud/android/location/LocationUpdateService.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
index 755888f7..c206ca7c 100644
--- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
+++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/network/AdvancedX509TrustManager.java
index 35fadb72..d3c79246 100644
--- a/src/com/owncloud/android/network/AdvancedX509TrustManager.java
+++ b/src/com/owncloud/android/network/AdvancedX509TrustManager.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/network/CertificateCombinedException.java b/src/com/owncloud/android/network/CertificateCombinedException.java
index 27427dd4..b924ba3c 100644
--- a/src/com/owncloud/android/network/CertificateCombinedException.java
+++ b/src/com/owncloud/android/network/CertificateCombinedException.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/network/EasySSLSocketFactory.java b/src/com/owncloud/android/network/EasySSLSocketFactory.java
deleted file mode 100644
index dca99a4f..00000000
--- a/src/com/owncloud/android/network/EasySSLSocketFactory.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * $HeadURL$
- * $Revision$
- * $Date$
- * 
- * ====================================================================
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package com.owncloud.android.network;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.UnknownHostException;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.HttpClientError;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-
-
-import android.util.Log;
-
-/**
- * <p>
- * EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s that
- * accept self-signed certificates.
- * </p>
- * <p>
- * This socket factory SHOULD NOT be used for productive systems due to security
- * reasons, unless it is a concious decision and you are perfectly aware of
- * security implications of accepting self-signed certificates
- * </p>
- * 
- * <p>
- * Example of using custom protocol socket factory for a specific host:
- * 
- * <pre>
- * Protocol easyhttps = new Protocol(&quot;https&quot;, new EasySSLProtocolSocketFactory(),
- *         443);
- * 
- * URI uri = new URI(&quot;https://localhost/&quot;, true);
- * // use relative url only
- * GetMethod httpget = new GetMethod(uri.getPathQuery());
- * HostConfiguration hc = new HostConfiguration();
- * hc.setHost(uri.getHost(), uri.getPort(), easyhttps);
- * HttpClient client = new HttpClient();
- * client.executeMethod(hc, httpget);
- * </pre>
- * 
- * </p>
- * <p>
- * Example of using custom protocol socket factory per default instead of the
- * standard one:
- * 
- * <pre>
- * Protocol easyhttps = new Protocol(&quot;https&quot;, new EasySSLProtocolSocketFactory(),
- *         443);
- * Protocol.registerProtocol(&quot;https&quot;, easyhttps);
- * 
- * HttpClient client = new HttpClient();
- * GetMethod httpget = new GetMethod(&quot;https://localhost/&quot;);
- * client.executeMethod(httpget);
- * </pre>
- * 
- * </p>
- * 
- * @author <a href="mailto:oleg -at- ural.ru">Oleg Kalnichevski</a>
- * 
- *         <p>
- *         DISCLAIMER: HttpClient developers DO NOT actively support this
- *         component. The component is provided as a reference material, which
- *         may be inappropriate for use without additional customization.
- *         </p>
- */
-
-public class EasySSLSocketFactory implements ProtocolSocketFactory {
-
-    private static final String TAG = "EasySSLSocketFactory";
-    private SSLContext sslcontext = null;
-
-    /**
-     * Constructor for EasySSLProtocolSocketFactory.
-     */
-    public EasySSLSocketFactory() {
-        super();
-    }
-
-    private static SSLContext createEasySSLContext() {
-        Log.d(TAG, "Creating Easy SSL Context");
-        try {
-            SSLContext context = SSLContext.getInstance("TLS");
-            context.init(null, new TrustManager[] { new EasyX509TrustManager(
-                    null) }, null);
-            return context;
-        } catch (Exception er) {
-            Log.e(TAG, er.getMessage() + "");
-            throw new HttpClientError(er.toString());
-        }
-    }
-
-    private SSLContext getSSLContext() {
-        Log.d(TAG, "Getting Easy SSL Context");
-        if (this.sslcontext == null) {
-            this.sslcontext = createEasySSLContext();
-        }
-        return this.sslcontext;
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int)
-     */
-    public Socket createSocket(String host, int port, InetAddress clientHost,
-            int clientPort) throws IOException, UnknownHostException {
-        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port + ", client " + clientHost + ":" + clientPort);
-
-        return getSSLContext().getSocketFactory().createSocket(host, port,
-                clientHost, clientPort);
-    }
-
-    /**
-     * Attempts to get a new socket connection to the given host within the
-     * given time limit.
-     * <p>
-     * To circumvent the limitations of older JREs that do not support connect
-     * timeout a controller thread is executed. The controller thread attempts
-     * to create a new socket within the given limit of time. If socket
-     * constructor does not return until the timeout expires, the controller
-     * terminates and throws an {@link ConnectTimeoutException}
-     * </p>
-     * 
-     * @param host the host name/IP
-     * @param port the port on the host
-     * @param clientHost the local host name/IP to bind the socket to
-     * @param clientPort the port on the local machine
-     * @param params {@link HttpConnectionParams Http connection parameters}
-     * 
-     * @return Socket a new socket
-     * 
-     * @throws IOException if an I/O error occurs while creating the socket
-     * @throws UnknownHostException if the IP address of the host cannot be
-     *             determined
-     */
-    public Socket createSocket(final String host, final int port,
-            final InetAddress localAddress, final int localPort,
-            final HttpConnectionParams params) throws IOException,
-            UnknownHostException, ConnectTimeoutException {
-        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port + ", local " + localAddress + ":" + localPort + ", params: " + params);
-        if (params == null) {
-            throw new IllegalArgumentException("Parameters may not be null");
-        }
-        int timeout = params.getConnectionTimeout();
-        SocketFactory socketfactory = getSSLContext().getSocketFactory();
-        /*if (timeout == 0) {
-            Log.d(TAG, " ... with connection timeout 0 and socket timeout " + params.getSoTimeout());
-            Socket socket = socketfactory.createSocket(host, port, localAddress,
-                    localPort);
-            socket.setSoTimeout(params.getSoTimeout());
-            return socket;
-        } else {*/
-        Log.d(TAG, " ... with connection timeout " + timeout + " and socket timeout " + params.getSoTimeout());
-        Socket socket = socketfactory.createSocket();
-        SocketAddress localaddr = new InetSocketAddress(localAddress,
-                localPort);
-        SocketAddress remoteaddr = new InetSocketAddress(host, port);
-        socket.setSoTimeout(params.getSoTimeout());
-        socket.bind(localaddr);
-        socket.connect(remoteaddr, timeout);
-        return socket;
-        //}
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int)
-     */
-    public Socket createSocket(String host, int port) throws IOException,
-            UnknownHostException {
-        Log.d(TAG, "Creating SSL Socket with remote " + host + ":" + port);
-        return getSSLContext().getSocketFactory().createSocket(host, port);
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean)
-     */
-    public Socket createSocket(Socket socket, String host, int port,
-            boolean autoClose) throws IOException, UnknownHostException {
-        Log.d(TAG, "Creating SSL Socket from other shocket " + socket + " to remote " + host + ":" + port);
-        return getSSLContext().getSocketFactory().createSocket(socket, host,
-                port, autoClose);
-    }
-
-    public boolean equals(Object obj) {
-        return ((obj != null) && obj.getClass().equals(
-                EasySSLSocketFactory.class));
-    }
-
-    public int hashCode() {
-        return EasySSLSocketFactory.class.hashCode();
-    }
-
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/network/EasyX509TrustManager.java b/src/com/owncloud/android/network/EasyX509TrustManager.java
deleted file mode 100644
index 1ac62186..00000000
--- a/src/com/owncloud/android/network/EasyX509TrustManager.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.owncloud.android.network;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * @author olamy
- * @version $Id: EasyX509TrustManager.java 765355 2009-04-15 20:59:07Z evenisse
- *          $
- * @since 1.2.3
- */
-public class EasyX509TrustManager implements X509TrustManager {
-
-    private X509TrustManager standardTrustManager = null;
-
-    /**
-     * Constructor for EasyX509TrustManager.
-     */
-    public EasyX509TrustManager(KeyStore keystore)
-            throws NoSuchAlgorithmException, KeyStoreException {
-        super();
-        TrustManagerFactory factory = TrustManagerFactory
-                .getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        factory.init(keystore);
-        TrustManager[] trustmanagers = factory.getTrustManagers();
-        if (trustmanagers.length == 0) {
-            throw new NoSuchAlgorithmException("no trust manager found");
-        }
-        this.standardTrustManager = (X509TrustManager) trustmanagers[0];
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],
-     *      String authType)
-     */
-    public void checkClientTrusted(X509Certificate[] certificates,
-            String authType) throws CertificateException {
-        standardTrustManager.checkClientTrusted(certificates, authType);
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],
-     *      String authType)
-     */
-    public void checkServerTrusted(X509Certificate[] certificates,
-            String authType) throws CertificateException {
-        if ((certificates != null) && (certificates.length == 1)) {
-            certificates[0].checkValidity();
-        } else {
-            // standardTrustManager.checkServerTrusted( certificates, authType
-            // );
-        }
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers()
-     */
-    public X509Certificate[] getAcceptedIssuers() {
-        return this.standardTrustManager.getAcceptedIssuers();
-    }
-
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java
index c4462188..a3f322b9 100644
--- a/src/com/owncloud/android/network/OwnCloudClientUtils.java
+++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -162,32 +162,6 @@ public class OwnCloudClientUtils {
     
     
     /**
-     * Allows or disallows self-signed certificates in ownCloud servers to reach
-     * 
-     * @param allow     'True' to allow, 'false' to disallow
-     */
-    public static void allowSelfsignedCertificates(boolean allow) {
-        Protocol pr = null;
-        try {
-            pr = Protocol.getProtocol("https");
-            if (pr != null && mDefaultHttpsProtocol == null) {
-            	mDefaultHttpsProtocol = pr;
-            }
-        } catch (IllegalStateException e) {
-            // nothing to do here; really
-        }
-        boolean isAllowed = (pr != null && pr.getSocketFactory() instanceof EasySSLSocketFactory);
-        if (allow && !isAllowed) {
-            Protocol.registerProtocol("https", new Protocol("https", new EasySSLSocketFactory(), 443));
-        } else if (!allow && isAllowed) {
-        	if (mDefaultHttpsProtocol != null) {
-        		Protocol.registerProtocol("https", mDefaultHttpsProtocol);
-        	}
-        }
-    }
-
-    
-    /**
      * Registers or unregisters the proper components for advanced SSL handling.
      * @throws IOException 
      */
diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
index 413a76e2..c01ee46b 100644
--- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
+++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java
index d752b3cc..75bf9234 100644
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/com/owncloud/android/operations/DownloadFileOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/OnRemoteOperationListener.java b/src/com/owncloud/android/operations/OnRemoteOperationListener.java
index e226ef20..f2119a80 100644
--- a/src/com/owncloud/android/operations/OnRemoteOperationListener.java
+++ b/src/com/owncloud/android/operations/OnRemoteOperationListener.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/OperationCancelledException.java b/src/com/owncloud/android/operations/OperationCancelledException.java
index d15af08c..975d63fb 100644
--- a/src/com/owncloud/android/operations/OperationCancelledException.java
+++ b/src/com/owncloud/android/operations/OperationCancelledException.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
index e803616c..7132c53f 100644
--- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
+++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java
index 06a70f70..19b67af0 100644
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/operations/RemoteOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java
index 1644e1a1..14cf78fc 100644
--- a/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java
index bfc063f9..80f40977 100644
--- a/src/com/owncloud/android/operations/RemoveFileOperation.java
+++ b/src/com/owncloud/android/operations/RemoveFileOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java
index cc1e324c..b9806575 100644
--- a/src/com/owncloud/android/operations/RenameFileOperation.java
+++ b/src/com/owncloud/android/operations/RenameFileOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 8bad631b..606017aa 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -116,7 +117,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
                         serverChanged = (mServerFile.getModificationTimestamp() > mLocalFile.getModificationTimestampAtLastSyncForData());
                     }
                     boolean localChanged = (mLocalChangeAlreadyKnown || mLocalFile.getLocalModificationTimestamp() > mLocalFile.getLastSyncDateForData());
-                        // TODO this will be always true after the app is upgraded to database version 3; will result in unnecessary uploads
+                        // TODO this will be always true after the app is upgraded to database version 2; will result in unnecessary uploads
               
                     /// decide action to perform depending upon changes
                     if (localChanged && serverChanged) {
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 849413fd..977460bf 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
index 7072d39f..08a9c15f 100644
--- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
+++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index fa5bf02c..2824b6da 100644
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index e87d151c..5e54341b 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 8309fab4..b22fdf78 100644
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index 8a8264f1..1f307c94 100644
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/syncadapter/ContactSyncService.java b/src/com/owncloud/android/syncadapter/ContactSyncService.java
index cf9fbeaf..7c702d93 100644
--- a/src/com/owncloud/android/syncadapter/ContactSyncService.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncService.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 4eafeac5..ed9e84ae 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java
index cb2f7200..3d819616 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/ActionItem.java b/src/com/owncloud/android/ui/ActionItem.java
index b2be7029..e97dfef0 100644
--- a/src/com/owncloud/android/ui/ActionItem.java
+++ b/src/com/owncloud/android/ui/ActionItem.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/CustomPopup.java b/src/com/owncloud/android/ui/CustomPopup.java
index b7ce4265..a9315dd7 100644
--- a/src/com/owncloud/android/ui/CustomPopup.java
+++ b/src/com/owncloud/android/ui/CustomPopup.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/ExtendedListView.java b/src/com/owncloud/android/ui/ExtendedListView.java
index ba1e3604..5b7fb98a 100644
--- a/src/com/owncloud/android/ui/ExtendedListView.java
+++ b/src/com/owncloud/android/ui/ExtendedListView.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/FragmentListView.java b/src/com/owncloud/android/ui/FragmentListView.java
index 3dbe16da..d791eed3 100644
--- a/src/com/owncloud/android/ui/FragmentListView.java
+++ b/src/com/owncloud/android/ui/FragmentListView.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/QuickAction.java b/src/com/owncloud/android/ui/QuickAction.java
index 122792d5..a6d021d7 100644
--- a/src/com/owncloud/android/ui/QuickAction.java
+++ b/src/com/owncloud/android/ui/QuickAction.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index f6b2a79d..9a04501c 100644
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index 8dce3bc2..011abfc7 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -1,10 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
- *   Copyright (C) 2012-2013  ownCloud Inc.
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index d04d6cee..21aaed8f 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index cb7e721f..0522cb85 100644
--- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -1,3 +1,21 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package com.owncloud.android.ui.activity;
 
 import java.io.File;
diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
index ee23ca3d..cd68c891 100644
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1d75e692..eb218d08 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -35,6 +36,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources.NotFoundException;
@@ -82,6 +84,7 @@ import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.syncadapter.FileSyncService;
+import com.owncloud.android.ui.dialog.ChangelogDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
@@ -124,6 +127,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;
     private static final int DIALOG_SSL_VALIDATOR = 5;
     private static final int DIALOG_CERT_NOT_SAVED = 6;
+    private static final String DIALOG_CHANGELOG_TAG = "DIALOG_CHANGELOG";
 
     
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
@@ -141,10 +145,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         mHandler = new Handler();
 
         /// Load of parameters from received intent
-        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
-        if (account != null)
-            AccountUtils.setCurrentOwnCloudAccount(this, account.name);
+        if (account != null && AccountUtils.setCurrentOwnCloudAccount(this, account.name)) {
+            mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); 
+        }
         
         /// Load of saved instance state: keep this always before initDataFromCurrentAccount()
         if(savedInstanceState != null) {
@@ -185,7 +189,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         // Drop-down navigation 
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
         OCFile currFile = mCurrentDir;
-        while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
+        while(mStorageManager != null && currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
             mDirectories.add(currFile.getFileName());
             currFile = mStorageManager.getFileById(currFile.getParentId());
         }
@@ -208,11 +212,41 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         actionBar.setListNavigationCallbacks(mDirectories, this);
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation
         
+        
+        // show changelog, if needed
+        //showChangeLog();
+        
         Log.d(getClass().toString(), "onCreate() end");
     }
 
     
     /**
+     * Shows a dialog with the change log of the current version after each app update
+     * 
+     *  TODO make it permanent; by now, only to advice the workaround app for 4.1.x
+     */
+    private void showChangeLog() {
+        if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            final String KEY_VERSION = "version";
+            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            int currentVersionNumber = 0;
+            int savedVersionNumber = sharedPref.getInt(KEY_VERSION, 0);
+            try {
+                PackageInfo pi          = getPackageManager().getPackageInfo(getPackageName(), 0);
+                currentVersionNumber    = pi.versionCode;
+            } catch (Exception e) {}
+     
+            if (currentVersionNumber > savedVersionNumber) {
+                ChangelogDialog.newInstance(true).show(getSupportFragmentManager(), DIALOG_CHANGELOG_TAG);
+                Editor editor   = sharedPref.edit();
+                editor.putInt(KEY_VERSION, currentVersionNumber);
+                editor.commit();
+            }
+        }
+    }
+    
+
+    /**
      * Launches the account creation activity. To use when no ownCloud account is available
      */
     private void createFirstAccount() {
diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index a45383f3..8a46a001 100644
--- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@ -1,3 +1,21 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package com.owncloud.android.ui.activity;
 
 import java.util.ArrayList;
diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java
index e90d36a7..e63a0fe0 100644
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/com/owncloud/android/ui/activity/LandingActivity.java
@@ -3,7 +3,7 @@
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index ea22268b..4ad0e57a 100644
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -3,7 +3,7 @@
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 9dfce138..460c5e0c 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java
index cafb86c6..211cce5f 100644
--- a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java
+++ b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java
index 332976a3..0160f7e5 100644
--- a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java
+++ b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index f2c36afb..a6d61d18 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java
index f4393b58..ac7aa90f 100644
--- a/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 503dfffe..8d879935 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -115,11 +116,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
             fileName.setText(name);
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
-            if (file.getMimetype() == null || !file.getMimetype().equals("DIR")) {
-                fileIcon.setImageResource(R.drawable.file);
-            } else {
-                fileIcon.setImageResource(R.drawable.ic_menu_archive);
-            }
+            fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype()));
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
diff --git a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
index 8bc56754..1f588c48 100644
--- a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 82031542..d55eb3f6 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
new file mode 100644
index 00000000..73dc98f9
--- /dev/null
+++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
@@ -0,0 +1,111 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.ui.dialog;
+
+import java.io.InputStream;
+import java.util.Scanner;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.webkit.WebView;
+import android.widget.TextView;
+
+import com.actionbarsherlock.app.SherlockDialogFragment;
+import com.owncloud.android.R;
+
+/**
+ * Dialog to show the contents of res/raw/CHANGELOG.txt
+ */
+public class ChangelogDialog extends SherlockDialogFragment {
+
+    private static final String ARG_CANCELABLE = ChangelogDialog.class.getCanonicalName() + ".ARG_CANCELABLE";
+
+
+    /**
+     * Public factory method to get dialog instances.
+     * 
+     * @param cancelable    If 'true', the dialog can be cancelled by the user input (BACK button, touch outside...)
+     * @return              New dialog instance, ready to show.
+     */
+    public static ChangelogDialog newInstance(boolean cancelable) {
+        ChangelogDialog fragment = new ChangelogDialog();
+        Bundle args = new Bundle();
+        args.putBoolean(ARG_CANCELABLE, cancelable);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        /// load the custom view to insert in the dialog, between title and 
+        WebView webview = new WebView(getActivity());
+        webview.loadUrl("file:///android_res/raw/" + getResources().getResourceEntryName(R.raw.changelog) + ".html");
+        
+        /// build the dialog
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        
+        Dialog dialog = builder.setView(webview)
+                                .setIcon(R.drawable.icon)
+                                //.setTitle(R.string.whats_new)
+                                .setPositiveButton(R.string.common_ok,
+                                        new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        dialog.dismiss();
+                                    }
+                                }).create();
+        
+        dialog.setCancelable(getArguments().getBoolean(ARG_CANCELABLE));
+        return dialog;
+    } 
+    
+    /**
+     * {@inheritDoc}
+     *-/
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        /// load the custom layout
+        View view = inflater.inflate(R.layout.fragment_changelog, container);
+        mEditText = (EditText) view.findViewById(R.id.txt_your_name);
+        getDialog().setTitle(R.string.whats_new);
+        
+        /// read full contents of the change log file (don't make it too big)
+        InputStream changeLogStream = getResources().openRawResource(R.raw.changelog);
+        Scanner scanner = new java.util.Scanner(changeLogStream).useDelimiter("\\A");
+        String text = scanner.hasNext() ? scanner.next() : "";
+        
+        /// make clickable the links in the change log file
+        SpannableString sText = new SpannableString(text);
+        Linkify.addLinks(sText, Linkify.ALL);
+
+        return view;
+    }
+    */
+}
+
+
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 1c89790c..6a3fa219 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
index 41d65d4d..069eedb7 100644
--- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java
+++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -16,7 +17,6 @@
  *
  */
 
-
 package com.owncloud.android.ui.dialog;
 
 import android.app.AlertDialog;
diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index 4f9305b0..c7796232 100644
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@ -1,3 +1,21 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package com.owncloud.android.ui.dialog;
 
 import android.app.Dialog;
diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
index f67968ad..2143e9a9 100644
--- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -15,6 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 package com.owncloud.android.ui.dialog;
 
 import java.io.IOException;
diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
index 2a3b331c..265bb1dd 100644
--- a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
+++ b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
index 860eb5b0..5ddee243 100644
--- a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
+++ b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
index 7cf45538..e527d31e 100644
--- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 5595583e..3668ff38 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -489,8 +490,7 @@ public class FileDetailFragment extends SherlockFragment implements
             
             // set file details
             setFilename(mFile.getFileName());
-            setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile
-                    .getMimetype()));
+            setFiletype(mFile.getMimetype());
             setFilesize(mFile.getFileLength());
             if(ocVersionSupportsTimeCreated()){
                 setTimeCreated(mFile.getCreationTimestamp());
@@ -542,8 +542,14 @@ public class FileDetailFragment extends SherlockFragment implements
      */
     private void setFiletype(String mimetype) {
         TextView tv = (TextView) getView().findViewById(R.id.fdType);
-        if (tv != null)
-            tv.setText(mimetype);
+        if (tv != null) {
+            String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype);;        
+            tv.setText(printableMimetype);
+        }
+        ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
+        if (iv != null) {
+            iv.setImageResource(DisplayUtils.getResourceId(mimetype));
+        }
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
index a021afbf..ab584638 100644
--- a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 18266ab6..51f78b70 100644
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 786d98a2..0e5e879a 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 63aee6b5..5406cb5a 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -27,6 +27,11 @@ import android.os.StatFs;
 import com.owncloud.android.datamodel.OCFile;
 
 
+/**
+ * Static methods to help in access to local file system.
+ * 
+ * @author David A. Velasco
+ */
 public class FileStorageUtils {
     
     public static final String getSavePath(String accountName) {
diff --git a/src/com/owncloud/android/utils/OwnCloudVersion.java b/src/com/owncloud/android/utils/OwnCloudVersion.java
index 43ea9838..8bba93f0 100644
--- a/src/com/owncloud/android/utils/OwnCloudVersion.java
+++ b/src/com/owncloud/android/utils/OwnCloudVersion.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -33,7 +34,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     // format is in version
     // 0xAABBCC
     // for version AA.BB.CC
-    // ie version 3.0.3 will be stored as 0x030003
+    // ie version 2.0.3 will be stored as 0x030003
     private int mVersion;
     private boolean mIsValid;
 
diff --git a/src/com/owncloud/android/utils/RecursiveFileObserver.java b/src/com/owncloud/android/utils/RecursiveFileObserver.java
index aac34eb3..3ce88534 100644
--- a/src/com/owncloud/android/utils/RecursiveFileObserver.java
+++ b/src/com/owncloud/android/utils/RecursiveFileObserver.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/com/owncloud/android/widgets/ActionEditText.java b/src/com/owncloud/android/widgets/ActionEditText.java
index a4f5527f..d77a825a 100644
--- a/src/com/owncloud/android/widgets/ActionEditText.java
+++ b/src/com/owncloud/android/widgets/ActionEditText.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
index 1316315d..d39f8ce7 100644
--- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
+++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index 292d88bf..3adaa3a8 100644
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java b/src/eu/alefzero/webdav/OnDatatransferProgressListener.java
index 5469f88c..a8c84b12 100644
--- a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java
+++ b/src/eu/alefzero/webdav/OnDatatransferProgressListener.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index a9d2e676..7577152d 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 30b5660f..f76ee697 100644
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -3,7 +3,7 @@
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/src/eu/alefzero/webdav/WebdavUtils.java b/src/eu/alefzero/webdav/WebdavUtils.java
index a42b9024..7e2d6840 100644
--- a/src/eu/alefzero/webdav/WebdavUtils.java
+++ b/src/eu/alefzero/webdav/WebdavUtils.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
index 3c04ad22..528392a4 100644
--- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java
+++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
@@ -1,3 +1,22 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package com.owncloud.android.test;
 
 import android.test.AndroidTestCase;