Merge conflict in Swedish translations caused duplicate strings

This commit is contained in:
Andre Bernet
2014-03-20 19:01:34 +01:00
parent 553ac3b9f5
commit 6aed5948d6
+1 -12
View File
@@ -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"