masensio b694fee63d Merge commit 'refs/pr/707' into text_file_preview_pr_707_with ... Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java		2015-08-05 16:48:12 +02:00
..
anim	Update year in license	2015-03-05 13:27:45 +01:00
drawable	Updated file icons with higher resolutions	2015-06-23 14:40:49 +02:00
drawable-hdpi	Update some file icons	2015-06-23 14:50:02 +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	Updated file icons with higher resolutions	2015-06-23 14:40:49 +02: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	Update some file icons	2015-06-23 14:50:02 +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	Update some file icons	2015-06-23 14:50:02 +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
drawable-xxhdpi	Update some file icons	2015-06-23 14:50:02 +02:00
layout	Merge commit 'refs/pr/707' into text_file_preview_pr_707_with	2015-08-05 16:48:12 +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	change the name of the method from keepInSync to favorite. Other changes commented in the review	2015-07-22 18:13:45 +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	Updated conflict message (same as in web app)	2015-08-04 17:29:42 +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	2015-06-16 01:14:07 -04:00
values-ak	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-am-rET	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ar	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-az	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-be	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-bg-rBG	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-bn-rBD	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-bn-rIN	[tx-robot] updated from transifex	2015-07-08 01:14:04 -04:00
values-bs	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-ca	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-cs-rCZ	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-cy-rGB	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-da	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-de	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-de-rAT	[tx-robot] updated from transifex	2015-07-08 01:14:04 -04:00
values-de-rCH	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-de-rDE	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-el	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-en-rGB	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-en-rNZ	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-eo	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-es	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-es-rAR	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-es-rBO	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rCL	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-es-rCO	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rCR	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rEC	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rMX	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-es-rPE	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rPY	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rUS	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-es-rUY	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-et-rEE	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-eu	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-eu-rES	[tx-robot] updated from transifex	2014-10-25 01:13:41 -04:00
values-fa	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-fi	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-fi-rFI	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-fr	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-fr-rCA	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-fy-rNL	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-gl	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-gu	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-he	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-hi	[tx-robot] updated from transifex	2015-06-16 01:14:07 -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-07-25 01:13:46 -04:00
values-hu-rHU	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-hy	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ia	[tx-robot] updated from transifex	2015-07-08 01:14:04 -04:00
values-id	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-io	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-is	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-it	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ja-rJP	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-jv	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ka	[tx-robot] updated from transifex	2013-10-28 07:11:55 -04:00
values-ka-rGE	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-km	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-kn	[tx-robot] updated from transifex	2015-07-25 01:13:46 -04:00
values-ko	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ku-rIQ	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-large-land	Update year in license	2015-03-05 13:27:45 +01:00
values-lb	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-lo	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-lt-rLT	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-lv	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-mg	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-mk	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ml	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ml-rIN	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-mn	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-mr	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ms-rMY	[tx-robot] updated from transifex	2015-07-08 01:14:04 -04:00
values-mt-rMT	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-my	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-nb-rNO	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ne	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-nl	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-nn-rNO	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-oc	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-or-rIN	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-pa	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-pl	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-pt-rBR	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-pt-rPT	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ro	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ru	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ru-rRU	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-si-rLK	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-sk	[tx-robot] updated from transifex	2014-07-31 01:13:40 -04:00
values-sk-rSK	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-sl	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-sq	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-sr	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-sr-rSP	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-su	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-sv	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-sw-rKE	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ta-rIN	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-ta-rLK	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-te	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-tg-rTJ	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-th-rTH	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-tr	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-tzl	re-added values-tzl	2015-08-04 12:39:58 +02:00
values-ug	[tx-robot] updated from transifex	2015-07-24 01:14:12 -04:00
values-uk	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-ur	[tx-robot] updated from transifex	2014-09-02 01:13:29 -04:00
values-ur-rPK	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-uz	[tx-robot] updated from transifex	2015-06-16 01:14:07 -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	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-yo	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-zh-rCN	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
values-zh-rHK	[tx-robot] updated from transifex	2015-06-16 01:14:07 -04:00
values-zh-rTW	Partially revert 50819ce	2015-08-04 12:39:57 +02:00
xml	Move 'Logs' from Settings to Navigation Drawer	2015-05-26 09:11:27 +02:00