nextcloud-android/res
David A. Velasco b36914df88 Merge branch 'develop' into file_browsing_refactoring
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2013-05-06 10:48:43 +02:00
..
anim Copyright note fixes 2013-04-17 12:26:13 +02:00
drawable Copyright note fixes 2013-04-17 12:26:13 +02:00
drawable-hdpi Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
drawable-hdpi-v9 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
drawable-ldpi Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
drawable-ldpi-v9 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
drawable-mdpi Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
drawable-mdpi-v9 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
layout Merge branch 'develop' into file_browsing_refactoring 2013-05-06 10:48:43 +02:00
layout-land Merge branch 'develop' into oauth_login 2013-05-03 10:24:20 +02:00
layout-large-land Copyright note fixes 2013-04-17 12:26:13 +02:00
layout-v14 Copyright note fixes 2013-04-17 12:26:13 +02:00
menu Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
raw Copyright note fixes 2013-04-17 12:26:13 +02:00
raw-de Copyright note fixes 2013-04-17 12:26:13 +02:00
raw-es Copyright note fixes 2013-04-17 12:26:13 +02:00
values Generic values for Oauth 2 configuration 2013-05-03 13:30:35 +02: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 Merge branch 'bug_hunting' into feature_previews 2013-04-04 16:49:04 +02:00
values-de-rDE Merge branch 'bug_hunting' into feature_previews 2013-04-04 16:49:04 +02: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 Copyright note fixes 2013-04-17 12:26:13 +02:00