nextcloud-android/res
masensio 75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
2015-06-15 14:51:13 +02:00
..
anim Update year in license 2015-03-05 13:27:45 +01:00
drawable Updated to work with latest update 2015-05-27 18:50:09 +02:00
drawable-hdpi Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
drawable-hdpi-v9 Remove duplicate ic_action_create_dir and ic_action_upload icons 2014-07-07 12:27:09 +02:00
drawable-hdpi-v11 Added notification icons with dark background to fix contrast in Android 2.x and 3.x 2014-03-20 14:04:09 +01:00
drawable-ldpi Update some icons 2015-01-30 11:00:14 +01:00
drawable-ldpi-v9 Remove duplicate ic_action_create_dir and ic_action_upload icons 2014-07-07 12:27:09 +02:00
drawable-mdpi Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
drawable-mdpi-v9 Remove duplicate ic_action_create_dir and ic_action_upload icons 2014-07-07 12:27:09 +02:00
drawable-mdpi-v11 Added notification icons with dark background to fix contrast in Android 2.x and 3.x 2014-03-20 14:04:09 +01:00
drawable-xhdpi Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
drawable-xhdpi-v11 Added notification icons with dark background to fix contrast in Android 2.x and 3.x 2014-03-20 14:04:09 +01:00
layout Merge branch 'develop' into navigationDrawer_basic 2015-06-15 13:43:17 +02:00
layout-land Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
layout-v11 Update year in license 2015-03-05 13:27:45 +01:00
layout-v14 Update year in license 2015-03-05 13:27:45 +01:00
menu Update main_menu.xml 2015-05-27 16:53:35 +02:00
raw Update year in license 2015-03-05 13:27:45 +01:00
raw-de Update year in license 2015-03-05 13:27:45 +01:00
raw-es Update year in license 2015-03-05 13:27:45 +01:00
values Merge branch 'develop' into forbidden_characters_from_server 2015-06-15 14:51:13 +02:00
values-af [tx-robot] updated from transifex 2013-10-28 06:26:38 -04:00
values-af-rZA [tx-robot] updated from transifex 2014-12-17 01:13:32 -05:00
values-ak [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-am-rET [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-ar [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-az [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-be [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
values-bg-rBG [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-bn-rBD [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-bn-rIN [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-bs [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-ca [tx-robot] updated from transifex 2015-05-28 01:13:53 -04:00
values-cs-rCZ [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
values-cy-rGB [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-da [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
values-de [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
values-de-rAT [tx-robot] updated from transifex 2015-05-11 01:13:48 -04:00
values-de-rCH [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-de-rDE [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
values-el [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-en-rGB [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
values-en-rNZ [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-eo [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
values-es [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-es-rAR [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-es-rBO [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rCL [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-es-rCO [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rCR [tx-robot] updated from transifex 2015-02-12 01:13:31 -05:00
values-es-rEC [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rMX [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-es-rPE [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rPY [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rUS [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-es-rUY [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-et-rEE [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-eu [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-eu-rES [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-fa [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-fi [tx-robot] updated from transifex 2014-12-17 01:13:32 -05:00
values-fi-rFI [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
values-fr [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-fr-rCA [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-fy-rNL [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-gl [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-gu [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-he [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-hi [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-hi-rIN [tx-robot] updated from transifex 2014-07-31 01:13:40 -04:00
values-hr [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-hu-rHU [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-hy [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-ia [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-id [tx-robot] updated from transifex 2015-05-18 01:13:50 -04:00
values-io [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-is [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
values-it [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
values-ja-rJP [tx-robot] updated from transifex 2015-05-09 01:13:55 -04:00
values-jv [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-ka [tx-robot] updated from transifex 2013-10-28 07:11:55 -04:00
values-ka-rGE [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-km [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-kn [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-ko [tx-robot] updated from transifex 2015-05-13 01:13:51 -04:00
values-ku-rIQ [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
values-large-land Update year in license 2015-03-05 13:27:45 +01:00
values-lb [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-lo [tx-robot] updated from transifex 2015-03-24 01:13:40 -04:00
values-lt-rLT [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-lv [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-mg [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-mk [tx-robot] updated from transifex 2015-05-14 01:13:58 -04:00
values-ml [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-ml-rIN [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-mn [tx-robot] updated from transifex 2014-12-23 01:13:30 -05:00
values-mr [tx-robot] updated from transifex 2015-02-17 01:13:43 -05:00
values-ms-rMY [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-mt-rMT [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-my [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
values-nb-rNO [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
values-ne [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-nl [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-nn-rNO [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-oc [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-or-rIN [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-pa [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-pl [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-pt-rBR [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-pt-rPT [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-ro [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-ru [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
values-ru-rRU [tx-robot] updated from transifex 2013-12-13 13:39:24 -05:00
values-si-rLK [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-sk [tx-robot] updated from transifex 2014-07-31 01:13:40 -04:00
values-sk-rSK [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
values-sl [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
values-sq [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-sr [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
values-sr-rSP [tx-robot] updated from transifex 2015-04-25 01:13:48 -04:00
values-su [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-sv [tx-robot] updated from transifex 2015-05-13 01:13:51 -04:00
values-sw-rKE [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-ta-rIN [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-ta-rLK [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-te [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-tg-rTJ [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-th-rTH [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
values-tr [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
values-tzl [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
values-ug [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-uk [tx-robot] updated from transifex 2015-05-30 01:13:45 -04:00
values-ur [tx-robot] updated from transifex 2014-09-02 01:13:29 -04:00
values-ur-rPK [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
values-uz [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
values-v9 Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +01:00
values-v11 Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +01:00
values-vi [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-yo [tx-robot] updated from transifex 2015-01-14 01:13:29 -05:00
values-zh-rCN [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
values-zh-rHK [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
values-zh-rTW [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
xml Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00