nextcloud-android/res
David A. Velasco 5665d9c306 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
2013-03-18 14:28:49 +01:00
..
anim Added copyright and license notice in animation files 2013-02-08 10:01:11 +01:00
drawable Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS) 2013-02-08 11:37:02 +01:00
drawable-hdpi Temporal file icons from iOS app 2013-01-30 16:16:08 +01:00
drawable-hdpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
drawable-ldpi Temporal file icons from iOS app 2013-01-30 16:16:08 +01:00
drawable-ldpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
drawable-mdpi Temporal file icons from iOS app 2013-01-30 16:16:08 +01:00
drawable-mdpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
layout Merge tag 'oc-android-1-3-22' into oauth_login 2013-03-18 14:28:49 +01:00
layout-land Merge tag 'oc-android-1-3-22' into oauth_login 2013-03-18 14:28:49 +01:00
layout-large-land Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
layout-v14 Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
menu Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
raw Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
raw-de Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
raw-es Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
values Merge tag 'oc-android-1-3-22' into oauth_login 2013-03-18 14:28:49 +01:00
values-af adding translations and transifex third party tool 2012-07-21 22:10:36 +02:00
values-af-rZA Updated translation files 2013-03-11 13:54:23 +01:00
values-ar Translations update 2013-01-10 18:38:41 +01:00
values-ar-rSA correct languages mapping 2012-10-06 11:28:51 +02:00
values-be Updated translation files 2013-03-11 13:54:23 +01:00
values-bg-rBG Updated translation files 2013-03-11 13:54:23 +01:00
values-bn-rBD Translations updated 2013-01-30 14:31:38 +01:00
values-ca Translations update 2013-01-10 18:38:41 +01:00
values-cs-rCZ Translations update 2013-01-10 18:38:41 +01:00
values-da Translations update 2013-01-10 18:38:41 +01:00
values-de Updated translation files 2013-03-11 13:54:23 +01:00
values-de-rDE Updated translation files 2013-03-11 13:54:23 +01:00
values-el Translations update 2013-01-10 18:38:41 +01:00
values-eo Translations update 2013-01-10 18:38:41 +01:00
values-es Translations updated 2013-01-30 14:31:38 +01:00
values-es-rAR Translations update 2013-01-10 18:38:41 +01:00
values-et-rEE Translations update 2013-01-10 18:38:41 +01:00
values-eu Updated translation files 2013-03-11 13:54:23 +01:00
values-eu-rES correct languages mapping 2012-10-06 11:28:51 +02:00
values-fa Updated translation files 2013-03-11 13:54:23 +01:00
values-fi Translations update 2013-01-10 18:38:41 +01:00
values-fi-rFI Updated translation files 2013-03-11 13:54:23 +01:00
values-fr Translations update 2013-01-10 18:38:41 +01:00
values-gl Updated translation files 2013-03-11 13:54:23 +01:00
values-he Translations update 2013-01-10 18:38:41 +01:00
values-hi Updated translation files 2013-03-11 13:54:23 +01:00
values-hr Translations update 2013-01-10 18:38:41 +01:00
values-hu Translations update 2013-01-10 18:38:41 +01:00
values-hu-rHU Updated translation files 2013-03-11 13:54:23 +01:00
values-hy Translations update 2013-01-10 18:38:41 +01:00
values-ia Translations update 2013-01-10 18:38:41 +01:00
values-id Translations updated 2013-01-30 14:31:38 +01:00
values-id-rID correct languages mapping 2012-10-06 11:28:51 +02:00
values-is Translations update 2013-01-10 18:38:41 +01:00
values-it Italian strings for narrow screens; fixed version string. 2013-01-12 18:37:10 +01:00
values-ja-rJP Translations update 2013-01-10 18:38:41 +01:00
values-ka Updated translation files 2013-03-11 13:54:23 +01:00
values-ka-rGE Translations update 2013-01-10 18:38:41 +01:00
values-ko Translations update 2013-01-10 18:38:41 +01:00
values-ku-rIQ Translations updated 2013-01-30 14:31:38 +01:00
values-large Merge master into oauth_login 2012-12-18 11:20:03 +01:00
values-lb Translations updated 2013-01-30 14:31:38 +01:00
values-lt-rLT Translations update 2013-01-10 18:38:41 +01:00
values-lv Updated translation files 2013-03-11 13:54:23 +01:00
values-mk Translations update 2013-01-10 18:38:41 +01:00
values-ms-rMY Translations update 2013-01-10 18:38:41 +01:00
values-my Updated translation files 2013-03-11 13:54:23 +01:00
values-nb-rNO Updated translation files 2013-03-11 13:54:23 +01:00
values-nl Translations update 2013-01-10 18:38:41 +01:00
values-nn-rNO Translations update 2013-01-10 18:38:41 +01:00
values-oc Translations update 2013-01-10 18:38:41 +01:00
values-pl Updated translation files 2013-03-11 13:54:23 +01:00
values-pl-rPL Translations update 2013-01-10 18:38:41 +01:00
values-pt-rBR Updated translation files 2013-03-11 13:54:23 +01:00
values-pt-rPT Updated translation files 2013-03-11 13:54:23 +01:00
values-ro Translations update 2013-01-10 18:38:41 +01:00
values-ru Translations update 2013-01-10 18:38:41 +01:00
values-ru-rRU Translations update 2013-01-10 18:38:41 +01:00
values-si-rLK Translations update 2013-01-10 18:38:41 +01:00
values-sk Updated translation files 2013-03-11 13:54:23 +01:00
values-sk-rSK Updated translation files 2013-03-11 13:54:23 +01:00
values-sl Translations update 2013-01-10 18:38:41 +01:00
values-so adding translations and transifex third party tool 2012-07-21 22:10:36 +02:00
values-sq Translations update 2013-01-10 18:38:41 +01:00
values-sr Updated translation files 2013-03-11 13:54:23 +01:00
values-sr-rSP Translations update 2013-01-10 18:38:41 +01:00
values-sv Translations updated 2013-01-30 14:31:38 +01:00
values-sw-rKE Updated translation files 2013-03-11 13:54:23 +01:00
values-ta-rLK Translations update 2013-01-10 18:38:41 +01:00
values-th-rTH Translations updated 2013-01-30 14:31:38 +01:00
values-tr Updated translation files 2013-03-11 13:54:23 +01:00
values-uk Fixed some more CRASHES due to format fails in Ukranian translation (fixed in Transifex too) 2013-03-07 13:45:55 +01:00
values-ur-rPK Updated translation files 2013-03-11 13:54:23 +01:00
values-vi Updated translation files 2013-03-11 13:54:23 +01:00
values-zh-rBG Updated translation files 2013-03-11 13:54:23 +01:00
values-zh-rCN Updated translation files 2013-03-11 13:54:23 +01:00
values-zh-rHK Translations update 2013-01-10 18:38:41 +01:00
values-zh-rTW Updated translation files 2013-03-11 13:54:23 +01:00
values-zu-rZA Translations update 2013-01-10 18:38:41 +01:00
xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00