Merge 0c75206ee5 into 2f3464403b

ext/libclementine-tagreader/tagreader.cpp

@@ -837,21 +837,29 @@ bool TagReader::SaveFile(const QString& filename,
                                             ? QString()
                                             : QString::number(song.bpm())),
                   true);
-    tag->setItem("composer",
-                 TagLib::APE::Item(
-                     "composer", TagLib::StringList(song.composer().c_str())));
-    tag->setItem("grouping",
-                 TagLib::APE::Item(
-                     "grouping", TagLib::StringList(song.grouping().c_str())));
-    tag->setItem("performer",
-                 TagLib::APE::Item("performer", TagLib::StringList(
-                                                    song.performer().c_str())));
+    tag->setItem(
+        "composer",
+        TagLib::APE::Item(
+            "composer",
+            TagLib::StringList(StdStringToTaglibString(song.composer()))));
+    tag->setItem(
+        "grouping",
+        TagLib::APE::Item(
+            "grouping",
+            TagLib::StringList(StdStringToTaglibString(song.grouping()))));
+    tag->setItem(
+        "performer",
+        TagLib::APE::Item(
+            "performer",
+            TagLib::StringList(StdStringToTaglibString(song.performer()))));
     tag->setItem(
         "album artist",
-        TagLib::APE::Item("album artist",
-                          TagLib::StringList(song.albumartist().c_str())));
-    tag->setItem("lyrics",
-                 TagLib::APE::Item("lyrics", TagLib::String(song.lyrics())));
+        TagLib::APE::Item(
+            "album artist",
+            TagLib::StringList(StdStringToTaglibString(song.albumartist()))));
+    tag->setItem(
+        "lyrics",
+        TagLib::APE::Item("lyrics", StdStringToTaglibString(song.lyrics())));
     tag->addValue("compilation",
                   QStringToTaglibString(song.compilation() ? QString::number(1)
                                                            : QString()),
@@ -888,10 +896,14 @@ bool TagReader::SaveFile(const QString& filename,
                  TagLib::StringList(song.bpm() <= 0 - 1
                                         ? "0"
                                         : TagLib::String::number(song.bpm())));
-    tag->setItem("\251wrt", TagLib::StringList(song.composer().c_str()));
-    tag->setItem("\251grp", TagLib::StringList(song.grouping().c_str()));
-    tag->setItem("\251lyr", TagLib::StringList(song.lyrics().c_str()));
-    tag->setItem("aART", TagLib::StringList(song.albumartist().c_str()));
+    tag->setItem("\251wrt",
+                 TagLib::StringList(StdStringToTaglibString(song.composer())));
+    tag->setItem("\251grp",
+                 TagLib::StringList(StdStringToTaglibString(song.grouping())));
+    tag->setItem("\251lyr",
+                 TagLib::StringList(StdStringToTaglibString(song.lyrics())));
+    tag->setItem("aART", TagLib::StringList(
+                             StdStringToTaglibString(song.albumartist())));
     tag->setItem("cpil", TagLib::StringList(song.compilation() ? "1" : "0"));
   } else if (TagLib::APE::File* file =
                  dynamic_cast<TagLib::APE::File*>(fileref->file())) {

src/translations/eo.po

@@ -3,10 +3,10 @@
 # This file is distributed under the same license as the Clementine package.
 # 
 # Translators:
-# Adolfo Jayme-Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2018-2022
-# Adolfo Jayme-Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
+# Adolfo Jayme Barrientos, 2018-2022
+# Adolfo Jayme Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2014
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-04-09 10:24+0000\n"
 "PO-Revision-Date: 2011-10-27 18:53+0000\n"
-"Last-Translator: Adolfo Jayme-Barrientos, 2018-2022\n"
+"Last-Translator: Adolfo Jayme Barrientos, 2018-2022\n"
 "Language-Team: Esperanto (http://app.transifex.com/davidsansome/clementine/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

src/translations/es.po

@@ -4,12 +4,12 @@
 # 
 # Translators:
 # Coroccotta <adiazubierna@gmail.com>, 2012
-# Adolfo Jayme-Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2012-2013,2018,2021
-# Adolfo Jayme-Barrientos, 2016-2022
-# Adolfo Jayme-Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2013
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
+# Adolfo Jayme Barrientos, 2012-2013,2018,2021
+# Adolfo Jayme Barrientos, 2016-2022
+# Adolfo Jayme Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2014
 # Adrián Prado Castro <adrian.prado@gmail.com>, 2013
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
 # Amaury Ortega <amauryocortega@gmail.com>, 2018