masensio 91e50a97a5 Merge branch 'transifex' into setup_app_name ... Conflicts: res/values-ko/strings.xml res/values-lt-rLT/strings.xml res/values-tr/strings.xml		2013-10-17 18:20:38 +02:00
..
strings.xml	Merge branch 'transifex' into setup_app_name	2013-10-17 18:20:38 +02:00