Merge branch 'validate-appdata' into 'master'

Validate appdata

Closes #197

See merge request GNOME/gitg!199

data/meson.build

@@ -5,7 +5,7 @@ desktop = 'org.gnome.gitg.desktop'
 desktop_config = configuration_data()
 desktop_config.set('icon', application_id)
 desktop_config.set('binary', gitg_name)
-i18n.merge_file(
+desktop_file = i18n.merge_file(
   type: 'desktop',
   input: configure_file(
     input: desktop + '.in.in',
@@ -18,6 +18,17 @@ i18n.merge_file(
   install_dir: join_paths(gitg_datadir, 'applications'),
 )
 
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+if desktop_file_validate.found()
+  test(
+    'validate-desktop',
+    desktop_file_validate,
+    args: [
+      desktop_file.full_path()
+    ]
+  )
+endif
+
 schema_conf = configuration_data()
 schema_conf.set('GETTEXT_PACKAGE', gitg_gettext)
 schema_conf.set('APPLICATION_ID', application_id)
@@ -40,7 +51,7 @@ appdata = 'org.gnome.gitg.appdata.xml'
 appdata_config = configuration_data()
 appdata_config.set('app-id', application_id)
 appdata_config.set('gettext', gitg_name)
-i18n.merge_file(
+appdata_file = i18n.merge_file(
   type: 'xml',
   input: configure_file(
     input: appdata + '.in.in',
@@ -52,6 +63,15 @@ i18n.merge_file(
   install: true,
   install_dir: join_paths(gitg_datadir, 'metainfo'),
 )
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test(
+    'validate-appdata', appstream_util,
+    args: [
+      'validate', '--nonet', appdata_file.full_path()
+    ]
+  )
+endif
 
 install_man(
   'gitg.1',

data/org.gnome.gitg.appdata.xml.in.in

@@ -9,7 +9,7 @@
   <summary>Graphical user interface for git</summary>
   <description>
     <p>
-      gitg is a graphical user interface for git. It aims at being a small,
+      Gitg is a graphical user interface for git. It aims at being a small,
       fast and convenient tool to visualize the history of git repositories.
       Besides visualization, gitg also provides several utilities to manage your
       repository and commit your work.

po/sl.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n"
-"POT-Creation-Date: 2024-04-01 21:44+0000\n"
-"PO-Revision-Date: 2024-04-02 10:33+0200\n"
+"POT-Creation-Date: 2024-06-19 10:42+0000\n"
+"PO-Revision-Date: 2024-06-20 00:03+0200\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -1499,7 +1499,7 @@ msgstr "Izbor predmetov"
 msgid "“%s” is not a Git repository."
 msgstr "Mesto »%s« ni skladišče Git."
 
-#: gitg/gitg-window.vala:1245
+#: gitg/gitg-window.vala:1243
 msgid ""
 "Your user name and email are not configured yet. Please go to the user "
 "configuration and provide your name and email."
@@ -1507,14 +1507,14 @@ msgstr ""
 "Uporabniško ime in elektronski naslov še nista nastavljena. Ta in druge "
 "podatke uporabnika je mogoče vpisati med nastavitvami uporabnika."
 
-#: gitg/gitg-window.vala:1249
+#: gitg/gitg-window.vala:1247
 msgid ""
 "Your user name is not configured yet. Please go to the user configuration "
 "and provide your name."
 msgstr ""
 "Vaše ime še ni nastavljeno. Odprite nastavitve uporabnika in vnesite podatek."
 
-#: gitg/gitg-window.vala:1253
+#: gitg/gitg-window.vala:1251
 msgid ""
 "Your email is not configured yet. Please go to the user configuration and "
 "provide your email."
@@ -1522,7 +1522,7 @@ msgstr ""
 "Vaš elektronski naslov še ni nastavljen. Odprite nastavitve uporabnika in "
 "vnesite podatek."
 
-#: gitg/gitg-window.vala:1256
+#: gitg/gitg-window.vala:1254
 msgid "Missing author details"
 msgstr "Manjkajo podrobnosti avtorja"
 
@@ -2160,6 +2160,14 @@ msgstr "Najdi besedo ali niz"
 msgid "General settings and options"
 msgstr "Splošne nastavitve in možnosti"
 
+#: gitg/resources/ui/gitg-window.ui:266
+msgid "Previous result"
+msgstr "Prejšnji rezultat"
+
+#: gitg/resources/ui/gitg-window.ui:282
+msgid "Next result"
+msgstr "Naslednji rezultat"
+
 #. Translators: %s will be replaced with a URL indicating the resource
 #. for which the authentication is required.
 #: libgitg/gitg-authentication-dialog.vala:69