Peter Serwylo 280a5e7279 Merge branch 'master' into 'master' ...

translation fixes for swap

I just had a Spanish-speaker test out the swap, and these are the fixes related to their bug reports.

See merge request !68

2015-04-15 21:32:54 +00:00

..

assets

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

libs

Update support-v4-preferencefragment aar

2015-04-01 11:32:39 +02:00

res

Merge branch 'master' into 'master'

2015-04-15 21:32:54 +00:00

src

Merge branch 'defaultValues' into 'master'

2015-04-15 21:29:29 +00:00

test

Simplify some catch logic

2015-04-15 17:56:40 +02:00

tools

Add remove-empty-trans script and run it

2015-03-26 19:05:36 +01:00

.classpath

simplify Eclipse setup by making direct imports of submodules work

2014-12-11 13:52:40 +01:00

.project

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

AndroidManifest.xml

Bump to 0.85-test

2015-04-12 23:57:54 +02:00

ant-prepare.sh

Forgot to update the support-v4-preferencefragment paths in ant

2015-04-01 20:35:26 +02:00

build.gradle

Adapt our gradle setup to the new v4-preferencefragment location

2015-04-01 11:28:36 +02:00

lint.xml

use official Android methods to mark strings as "do not translate"

2015-04-14 18:08:03 -04:00

project.properties

Forgot to update the support-v4-preferencefragment paths in ant

2015-04-01 20:35:26 +02:00