Fix AppStream files translation and update translations (#31)

* Merge translations with AppStream templates files on build process

* Update french translations

Author: NathanBnm

data/com.github.naaando.lyrics.appdata.xml data/com.github.naaando.lyrics.appdata.xml.in

@@ -51,7 +51,7 @@
     <release version="0.7.5" date="2019-03-06">
       <description>
         <ul>
-          <li>Fix bug where the lyrics start to overlap.</li>
+          <li>Fix bug where the lyrics start to overlap</li>
           <li>Remove legacy code for old lyric displayers</li>
           <li>Fix warnings related to custom font provider</li>
           <li>Fix warnings related to ClickThroughHelper</li>

data/com.github.naaando.lyrics.desktop data/com.github.naaando.lyrics.desktop.in

@@ -16,13 +16,19 @@ install_data (
     install_dir: join_paths (get_option ('datadir'), 'glib-2.0', 'schemas')
 )
 
-install_data (
-    meson.project_name () + '.desktop',
-    install_dir: join_paths (get_option ('datadir'), 'applications')
-)
-
-install_data (
-    meson.project_name () + '.appdata.xml',
-    install_dir: join_paths (get_option ('datadir'), 'metainfo')
+i18n.merge_file(
+    input: join_paths(meson.project_name() + '.desktop.in'),
+    output: meson.project_name() + '.desktop',
+    po_dir: join_paths(meson.source_root(), 'po'),
+    type: 'desktop',
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
+i18n.merge_file(
+    input: join_paths(meson.project_name() + '.appdata.xml.in'),
+    output: meson.project_name() + '.appdata.xml',
+    po_dir: join_paths(meson.source_root(), 'po'),
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'metainfo')
+)

data/meson.build

@@ -1,5 +1,5 @@
-data/com.github.naaando.lyrics.desktop
-data/com.github.naaando.lyrics.appdata.xml
+data/com.github.naaando.lyrics.desktop.in
+data/com.github.naaando.lyrics.appdata.xml.in
 src/Core/Factory/MetasongFactory.vala
 src/Core/Lyric.vala
 src/Core/LyricsService.vala
@@ -12,7 +12,6 @@ src/Repository/Local/LocalRepository.vala
 src/Repository/LyricSources/LyricSourcesDownloader.vala
 src/Repository/LyricSources/LyricSourcesRemoteFile.vala
 src/Repository/LyricSources/LyricSourcesRepository.vala
-src/Repository/ILyricFile.vala
 src/Repository/Repository.vala
 src/Mpris/MprisClient.vala
 src/Mpris/MprisPlayer.vala
@@ -33,7 +32,6 @@ src/View/SettingsPopover.vala
 src/View/Helper/ClickThroughHelper.vala
 src/View/Helper/SaveWindowStateMixin.vala
 src/View/Widgets/Displays/IDisplay.vala
-src/View/Widgets/Displays/SimpleDisplay.vala
 src/View/Widgets/Displays/ScrolledDisplay.vala
 src/View/Widgets/DownloadView.vala
 src/View/Widgets/FileChooserButton.vala

po/POTFILES

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-23 23:47-0300\n"
+"POT-Creation-Date: 2019-03-24 00:26+0100\n"
 "PO-Revision-Date: 2019-01-26 21:12-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,159 +16,191 @@ msgstr ""
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/com.github.naaando.lyrics.desktop:3
-#: data/com.github.naaando.lyrics.appdata.xml:6 src/View/MainWindow.vala:14
+#: data/com.github.naaando.lyrics.desktop.in:3
+#: data/com.github.naaando.lyrics.appdata.xml.in:6 src/View/MainWindow.vala:14
 msgid "Lyrics"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.desktop:4
+#: data/com.github.naaando.lyrics.desktop.in:4
 msgid "Lyrics displayer"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.desktop:5
+#: data/com.github.naaando.lyrics.desktop.in:5
 msgid "The styleful way to sing your songs"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.desktop:8
+#: data/com.github.naaando.lyrics.desktop.in:8
 msgid "com.github.naaando.lyrics"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.desktop:12
+#: data/com.github.naaando.lyrics.desktop.in:12
 msgid "lyrics;music;"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:7
+#: data/com.github.naaando.lyrics.appdata.xml.in:7
 msgid "The beautiful way to sing your songs"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:9
+#: data/com.github.naaando.lyrics.appdata.xml.in:9
 msgid ""
 "Lyrics is an application that displays lyrics for songs you are listening "
 "to, it query the song through MPRIS protocol, search, downloads the lyric "
 "file and display it scrolling syncronized."
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:42
+#: data/com.github.naaando.lyrics.appdata.xml.in:39
+msgid "Ported viewlwyrics source"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:46
+msgid "Fixes file saving when the directory to save don't exists"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:47
+msgid "Fix bug where selecting a lyric from the search dialog don't display it"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:54
+msgid "Fix bug where the lyrics start to overlap"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:55
+msgid "Remove legacy code for old lyric displayers"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:56
+msgid "Fix warnings related to custom font provider"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:57
+msgid "Fix warnings related to ClickThroughHelper"
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:64
 msgid ""
-"It solves the problem of the window undoing the resize when going to "
-"backdrop if it was shortened horizontally."
+"(Contribuition by Torikul Habib) Fix a bug where the window increases the "
+"minimum width on backdrop."
+msgstr ""
+
+#: data/com.github.naaando.lyrics.appdata.xml.in:65
+msgid "Update translation files"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:49
+#: data/com.github.naaando.lyrics.appdata.xml.in:72
 msgid ""
 "Fix error where a searched lyric is not displayed if lyrics wasn't "
 "displaying already"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:56
+#: data/com.github.naaando.lyrics.appdata.xml.in:79
 msgid "Fix repositories returning null collections"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:63
+#: data/com.github.naaando.lyrics.appdata.xml.in:86
 msgid "Fix settings popover menu closing on click"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:70
+#: data/com.github.naaando.lyrics.appdata.xml.in:92
 msgid "Adds ghost mode:"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:71
+#: data/com.github.naaando.lyrics.appdata.xml.in:94
 msgid "Let clicks pass through the window when it is translucid"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:72
+#: data/com.github.naaando.lyrics.appdata.xml.in:95
 msgid "Hide headerbar widgets when the app goes backdrop"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:73
+#: data/com.github.naaando.lyrics.appdata.xml.in:96
 msgid "Makes headerbar clickable on ghost mode to drag and to grab focus"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:80
+#: data/com.github.naaando.lyrics.appdata.xml.in:103
 msgid "Add lyric search"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:81
+#: data/com.github.naaando.lyrics.appdata.xml.in:104
 msgid "Remove Cairo dependency"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:82
+#: data/com.github.naaando.lyrics.appdata.xml.in:105
 msgid "Remove Granite dependency"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:89
+#: data/com.github.naaando.lyrics.appdata.xml.in:112
 msgid "Reduce spacing spent on margins and borders"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:90
+#: data/com.github.naaando.lyrics.appdata.xml.in:113
 msgid "Saves window's width and height properties now"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:91
+#: data/com.github.naaando.lyrics.appdata.xml.in:114
 msgid "Under the hood code improvements"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:98
+#: data/com.github.naaando.lyrics.appdata.xml.in:121
 msgid "Reset font on restore settings"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:105
+#: data/com.github.naaando.lyrics.appdata.xml.in:128
 msgid "Make possible to choose custom fonts"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:106
+#: data/com.github.naaando.lyrics.appdata.xml.in:129
 msgid "Make the app translatable"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:107
+#: data/com.github.naaando.lyrics.appdata.xml.in:130
 msgid "Add brazillian portuguese translation"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:108
+#: data/com.github.naaando.lyrics.appdata.xml.in:131
 msgid "Add french translation"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:109
+#: data/com.github.naaando.lyrics.appdata.xml.in:132
 msgid "Fixes for packaging to flatpak"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:116
+#: data/com.github.naaando.lyrics.appdata.xml.in:139
 msgid "Fix when playing setting"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:117
+#: data/com.github.naaando.lyrics.appdata.xml.in:140
 msgid "Fixes lyric parsing"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:118
+#: data/com.github.naaando.lyrics.appdata.xml.in:141
 msgid "Fix play and pause icons on player control button"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:119
+#: data/com.github.naaando.lyrics.appdata.xml.in:142
 msgid "Fix error where lyrics don't stop after closing the player"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:125
+#: data/com.github.naaando.lyrics.appdata.xml.in:148
 msgid "A major rewrite of the application"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:127
+#: data/com.github.naaando.lyrics.appdata.xml.in:150
 msgid "Fix lyrics sorting problem"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:128
+#: data/com.github.naaando.lyrics.appdata.xml.in:151
 msgid "Fix crashes on compact timestamps format: [mm:ss]"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:129
+#: data/com.github.naaando.lyrics.appdata.xml.in:152
 msgid "Lyrics now scroll on the center of window"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:135
+#: data/com.github.naaando.lyrics.appdata.xml.in:158
 msgid "Initial release"
 msgstr ""
 
-#: data/com.github.naaando.lyrics.appdata.xml:168
+#: data/com.github.naaando.lyrics.appdata.xml.in:191
 msgid "Fernando da Silva Sousa"
 msgstr ""