From 20050c56f5c1608a487b2e8335402f472c5ab966 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 18 Feb 2016 15:57:31 +0100 Subject: [PATCH] Fix merge --- res/layout/dialog.xml | 2 +- res/values-fi/strings.xml | 318 --------------------------- res/values-fr/custom.xml | 28 --- res/values-fr/strings.xml | 393 +++++++++++++++++++++++++++------- res/values-pt-rBR/strings.xml | 233 -------------------- res/values-sr/strings.xml | 242 --------------------- res/values-sv/strings.xml | 191 ----------------- res/values-zh-rTW/strings.xml | 182 ---------------- 8 files changed, 312 insertions(+), 1277 deletions(-) delete mode 100644 res/values-fi/strings.xml delete mode 100644 res/values-fr/custom.xml delete mode 100644 res/values-pt-rBR/strings.xml delete mode 100644 res/values-sr/strings.xml delete mode 100644 res/values-sv/strings.xml delete mode 100644 res/values-zh-rTW/strings.xml diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml index ad5b9869a..712e0130b 100644 --- a/res/layout/dialog.xml +++ b/res/layout/dialog.xml @@ -23,7 +23,7 @@ android:orientation="vertical">