Merge branch 'transifex' into setup_app_name
authormasensio <masensio@solidgear.es>
Thu, 17 Oct 2013 16:20:38 +0000 (18:20 +0200)
committermasensio <masensio@solidgear.es>
Thu, 17 Oct 2013 16:20:38 +0000 (18:20 +0200)
commit91e50a97a527a27d134836f89c01d52ffaf1c20d
treebcbb42ee38e00741c080ad8c9e12394d1ffe1c4f
parent7488345470b405b06a648748b3e4039e9ae964f0
parentdc70f9e8905fc97adb5a22acb1dad5ec16cd1490
Merge branch 'transifex' into setup_app_name

Conflicts:
res/values-ko/strings.xml
res/values-lt-rLT/strings.xml
res/values-tr/strings.xml
13 files changed:
res/values-ar/strings.xml
res/values-en-rGB/strings.xml
res/values-eo/strings.xml
res/values-es/strings.xml
res/values-eu/strings.xml
res/values-fi-rFI/strings.xml
res/values-fr/strings.xml
res/values-ko/strings.xml
res/values-lt-rLT/strings.xml
res/values-sk-rSK/strings.xml
res/values-sr/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml