From 6aed5948d668fb14e1914abb7536adb7f7a84e04 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Thu, 20 Mar 2014 19:01:34 +0100
Subject: [PATCH] Merge conflict in Swedish translations caused duplicate
 strings

---
 radio/src/translations/se.h.txt | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 684efc34d..0b3a3fa19 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -748,20 +748,9 @@
 #define TR_RESET               "Nollställ"
 #define TR_COUNT               "Antal"
 #define TR_SMOOTH              "Mjuk"
-#define TR_COPY_TRIMS_TO_OFS   "Spara trimmar som offset"
-=======
-#define TR_ENABLE_POPUP        "Enable Popup"
-#define TR_DISABLE_POPUP       "Disable Popup"
-#define TR_CURVE_PRESET        "Preset..."
-#define TR_PRESET              "Preset"
-#define TR_MIRROR              "Mirror"
-#define TR_CLEAR               "Clear"
-#define TR_RESET               "Reset"
-#define TR_COUNT               "Count"
+#define TR_COPY_TRIMS_TO_OFS   "Spara trimmar som offset"
 #define TR_PT                  "pt"
 #define TR_PTS                 "pts"
-#define TR_SMOOTH              "Smooth"
-#define TR_COPY_TRIMS_TO_OFS   "Copy Trims To Offset"
 #define TR_PERSISTENT_MAH      INDENT "Lagra mAh"
 #define TR_PREFLIGHT           "Startkontroller"
 #define TR_CHECKLIST           INDENT "Visa checklisa"