diff options
| author | Logan Rathbone <poprocks@gmail.com> | 2021-06-29 01:53:36 +0000 |
|---|---|---|
| committer | Logan Rathbone <poprocks@gmail.com> | 2021-06-29 01:53:36 +0000 |
| commit | 9c98fe67a84590bab8478266a74ba9df6dcc58b8 (patch) | |
| tree | efa8127d9af6f86db7437f2e463499474f52f2e8 | |
| parent | 6de8275c73b06e7a1a392b44c53589aebc2d639f (diff) | |
| parent | ca284f14cd2b90964f57c2e0016ef0d82be2a67a (diff) | |
| download | zenity-9c98fe67a84590bab8478266a74ba9df6dcc58b8.tar.gz | |
Merge branch 'gtk4-port' into 'gtk4-port'
# Conflicts:
# src/msg.c
# src/util.c
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | po/gl.po | 11 | ||||
| -rw-r--r-- | zenity.doap | 19 |
3 files changed, 29 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..50990ec --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +variables: + DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config automake libtool autoconf autoconf-archive git + gtk3-devel yelp-tools + +build_fedora_33: + image: fedora:33 + before_script: + - dnf install -y --nogpgcheck $DEPENDENCIES + script: + - ./autogen.sh + - make -j @@ -13,12 +13,11 @@ msgid "" msgstr "" "Project-Id-Version: zenity-master-po-gl-76235\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=zenity" -"&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-11-26 20:40+0000\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n" +"POT-Creation-Date: 2020-07-10 08:25+0000\n" "PO-Revision-Date: 2018-02-17 01:21+0200\n" "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n" -"Language-Team: Galician\n" +"Language-Team: Proxecto Trasno <proxecto@trasno.gal>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,8 +64,8 @@ msgstr "" msgid "translator-credits" msgstr "" "Fran Diéguez <frandieguez@ubuntu.com>, 2009-2018.\n" -"Mancomún - Centro de Referencia e Servizos de Software Libre " -"<g11n@mancomun.org>, 2009.\n" +"Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun." +"org>, 2009.\n" "Antón Méixome <meixome@certima.net>, 2009, 2010.\n" "Ignacio Casal Quinteiro <icq@gnome.org>, 2005, 2006, 2007, 2008." diff --git a/zenity.doap b/zenity.doap index 3b1a450..82de2c7 100644 --- a/zenity.doap +++ b/zenity.doap @@ -15,16 +15,23 @@ <maintainer> <foaf:Person> - <foaf:name>Luis Medinas</foaf:name> - <foaf:mbox rdf:resource="mailto:lmedinas@gnome.org" /> - <gnome:userid>lmedinas</gnome:userid> + <foaf:name>Arx Cruz</foaf:name> + <foaf:mbox rdf:resource="mailto:arxcruz@src.gnome.org" /> + <gnome:userid>arxcruz</gnome:userid> </foaf:Person> </maintainer> <maintainer> <foaf:Person> - <foaf:name>Arx Cruz</foaf:name> - <foaf:mbox rdf:resource="mailto:arxcruz@src.gnome.org" /> - <gnome:userid>arxcruz</gnome:userid> + <foaf:name>Logan Rathbone</foaf:name> + <foaf:mbox rdf:resource="mailto:poprocks@gmail.com" /> + <gnome:userid>larathbone</gnome:userid> + </foaf:Person> + </maintainer> + <maintainer> + <foaf:Person> + <foaf:name>Luis Medinas</foaf:name> + <foaf:mbox rdf:resource="mailto:lmedinas@gnome.org" /> + <gnome:userid>lmedinas</gnome:userid> </foaf:Person> </maintainer> </Project> |