diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp
index 25588c103..e47fa0dd7 100644
--- a/src/core/commandlineoptions.cpp
+++ b/src/core/commandlineoptions.cpp
@@ -167,16 +167,13 @@ bool CommandlineOptions::Parse() {
                 .arg(tr("Skip backwards in playlist"),
                      tr("Skip forwards in playlist"),
                      tr("Set the volume to <value> percent"),
-                     tr("Increase the volume by 4%"),
-                     tr("Decrease the volume by 4%"),
+                     tr("Increase the volume by 4 precent"),
+                     tr("Decrease the volume by 4 precent"),
                      tr("Increase the volume by <value> percent"),
                      tr("Decrease the volume by <value> percent"))
-                .arg(tr("Seek the currently playing track to an absolute "
-                        "position"),
-                     tr("Seek the currently playing track by a relative "
-                        "amount"),
-                     tr("Restart the track, or play the previous track if "
-                        "within 8 seconds of start."),
+                .arg(tr("Seek the currently playing track to an absolute position"),
+                     tr("Seek the currently playing track by a relative amount"),
+                     tr("Restart the track, or play the previous track if within 8 seconds of start."),
                      tr("Playlist options"),
                      tr("Create a new playlist with files"),
                      tr("Append files/URLs to the playlist"),
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 18ae4f4ba..2924e8705 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -365,9 +365,9 @@ QString Song::TextForFiletype(FileType type) {
 
   switch (type) {
     case Song::Type_Wav:       return QObject::tr("Wav");
-    case Song::Type_Flac:      return QObject::tr("Flac");
+    case Song::Type_Flac:      return QObject::tr("FLAC");
     case Song::Type_WavPack:   return QObject::tr("WavPack");
-    case Song::Type_OggFlac:   return QObject::tr("Ogg Flac");
+    case Song::Type_OggFlac:   return QObject::tr("Ogg FLAC");
     case Song::Type_OggVorbis: return QObject::tr("Ogg Vorbis");
     case Song::Type_OggOpus:   return QObject::tr("Ogg Opus");
     case Song::Type_OggSpeex:  return QObject::tr("Ogg Speex");
diff --git a/src/device/devicekitlister.cpp b/src/device/devicekitlister.cpp
index 980d055d1..e9d797c53 100644
--- a/src/device/devicekitlister.cpp
+++ b/src/device/devicekitlister.cpp
@@ -124,7 +124,7 @@ QVariantMap DeviceKitLister::DeviceHardwareInfo(const QString &id) {
   if (!device_data_.contains(id)) return ret;
   const DeviceData &data = device_data_[id];
 
-  ret[QT_TR_NOOP("DBus path")] = data.dbus_path;
+  ret[QT_TR_NOOP("D-Bus path")] = data.dbus_path;
   ret[QT_TR_NOOP("Serial number")] = data.drive_serial;
   ret[QT_TR_NOOP("Mount points")] = data.device_mount_paths.join(", ");
   ret[QT_TR_NOOP("Device")] = data.device_file;
diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp
index 5cab88bf5..eb81e192c 100644
--- a/src/device/udisks2lister.cpp
+++ b/src/device/udisks2lister.cpp
@@ -100,7 +100,7 @@ QVariantMap Udisks2Lister::DeviceHardwareInfo(const QString &id) {
   QVariantMap result;
 
   const auto &data = device_data_[id];
-  result[QT_TR_NOOP("DBus path")] = data.dbus_path;
+  result[QT_TR_NOOP("D-Bus path")] = data.dbus_path;
   result[QT_TR_NOOP("Serial number")] = data.serial;
   result[QT_TR_NOOP("Mount points")] = data.mount_paths.join(", ");
   result[QT_TR_NOOP("Partition label")] = data.label;
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index c75ccae9c..2aa25c4c7 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -239,7 +239,7 @@ TranscoderPreset Transcoder::PresetForFileType(Song::FileType type) {
 
   switch (type) {
     case Song::Type_Flac:
-      return TranscoderPreset(type, tr("Flac"),                "flac", "audio/x-flac");
+      return TranscoderPreset(type, tr("FLAC"),                "flac", "audio/x-flac");
     case Song::Type_Mp4:
       return TranscoderPreset(type, tr("M4A AAC"),             "mp4",  "audio/mpeg, mpegversion=(int)4", "audio/mp4");
     case Song::Type_Mpeg:
@@ -247,7 +247,7 @@ TranscoderPreset Transcoder::PresetForFileType(Song::FileType type) {
     case Song::Type_OggVorbis:
       return TranscoderPreset(type, tr("Ogg Vorbis"),          "ogg",  "audio/x-vorbis", "application/ogg");
     case Song::Type_OggFlac:
-      return TranscoderPreset(type, tr("Ogg Flac"),            "ogg",  "audio/x-flac",   "application/ogg");
+      return TranscoderPreset(type, tr("Ogg FLAC"),            "ogg",  "audio/x-flac",   "application/ogg");
     case Song::Type_OggSpeex:
       return TranscoderPreset(type, tr("Ogg Speex"),           "spx",  "audio/x-speex",  "application/ogg");
     case Song::Type_OggOpus: