Hello community,
here is the log from the commit of package gnome-logs for openSUSE:Factory
checked in at 2018-06-22 13:27:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-logs (Old)
and /work/SRC/openSUSE:Factory/.gnome-logs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-logs"
Fri Jun 22 13:27:03 2018 rev:29 rq:617317 version:3.28.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-logs/gnome-logs.changes 2018-05-10
15:45:48.305168961 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-logs.new/gnome-logs.changes
2018-06-22 13:27:05.309046020 +0200
@@ -1,0 +2,7 @@
+Fri Jun 15 08:46:20 UTC 2018 - bjorn....@gmail.com
+
+- Update to version 3.28.3:
+ + Distribute meson files in tarball.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-logs-3.28.2.tar.xz
New:
----
gnome-logs-3.28.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-logs.spec ++++++
--- /var/tmp/diff_new_pack.1GBSWw/_old 2018-06-22 13:27:06.341007882 +0200
+++ /var/tmp/diff_new_pack.1GBSWw/_new 2018-06-22 13:27:06.341007882 +0200
@@ -18,7 +18,7 @@
Name: gnome-logs
-Version: 3.28.2
+Version: 3.28.3
Release: 0
Summary: GNOME System Log Viewer
License: GPL-3.0-or-later
++++++ gnome-logs-3.28.2.tar.xz -> gnome-logs-3.28.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/ChangeLog
new/gnome-logs-3.28.3/ChangeLog
--- old/gnome-logs-3.28.2/ChangeLog 2018-05-07 10:37:44.000000000 +0200
+++ new/gnome-logs-3.28.3/ChangeLog 2018-06-14 09:55:46.000000000 +0200
@@ -1,6 +1,34 @@
+commit c4bc6b81591fa4e21ac6c83a60494d97dacd42c2
+Author: Jonathan Kang <jonathank...@gnome.org>
+Date: Thu Jun 14 15:46:42 2018 +0800
+
+ update NEWS for 3.28.3 release
+
+M NEWS
+M configure.ac
+M meson.build
+
+commit a80ddd44ae0b99b1a6d8d0f93c1a3f961271e4c9
+Author: Jonathan Kang <jonathank...@gnome.org>
+Date: Thu Jun 14 15:20:54 2018 +0800
+
+ Distribute meson files in tarball
+
+ (cherry picked from commit 439d89072b1e884d343ae4348fbe5db0ad850a08)
+
+M Makefile.am
+
+commit 68c9c16fff4b95f3e5439c2dc880531bd9c44aa6
+Author: Dz Chen <wsxy...@gmail.com>
+Date: Mon May 21 16:11:26 2018 +0000
+
+ Update Chinese (China) translation
+
+M po/zh_CN.po
+
commit 72b6206dec3a68514edc02167d8b1110c35551ee
Author: Jonathan Kang <jonathank...@gnome.org>
-Date: Mon May 7 14:59:58 2018 +0800
+Date: Mon May 7 14:59:58 2018 +0800
update NEWS for 3.28.2 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/Makefile.am
new/gnome-logs-3.28.3/Makefile.am
--- old/gnome-logs-3.28.2/Makefile.am 2018-05-07 09:49:21.000000000 +0200
+++ new/gnome-logs-3.28.3/Makefile.am 2018-06-14 09:39:53.000000000 +0200
@@ -1,5 +1,16 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+EXTRA_DIST = \
+ meson.build \
+ meson_options.txt \
+ meson_post_install.py \
+ data/meson.build \
+ data/icons/meson.build \
+ help/meson.build \
+ po/meson.build \
+ src/meson.build \
+ tests/meson.build
+
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-appstream-util \
--enable-tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/Makefile.in
new/gnome-logs-3.28.3/Makefile.in
--- old/gnome-logs-3.28.2/Makefile.in 2018-05-07 10:37:39.000000000 +0200
+++ new/gnome-logs-3.28.3/Makefile.in 2018-06-14 09:54:41.000000000 +0200
@@ -649,6 +649,17 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+EXTRA_DIST = \
+ meson.build \
+ meson_options.txt \
+ meson_post_install.py \
+ data/meson.build \
+ data/icons/meson.build \
+ help/meson.build \
+ po/meson.build \
+ src/meson.build \
+ tests/meson.build
+
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-appstream-util \
--enable-tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/NEWS new/gnome-logs-3.28.3/NEWS
--- old/gnome-logs-3.28.2/NEWS 2018-05-07 09:49:21.000000000 +0200
+++ new/gnome-logs-3.28.3/NEWS 2018-06-14 09:54:05.000000000 +0200
@@ -1,3 +1,9 @@
+GNOME Logs 3.28.3
+=================
+
+* distribute meson files in tarball
+* update to Chinese (China) translation
+
GNOME Logs 3.28.2
=================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/configure
new/gnome-logs-3.28.3/configure
--- old/gnome-logs-3.28.2/configure 2018-05-07 10:37:38.000000000 +0200
+++ new/gnome-logs-3.28.3/configure 2018-06-14 09:54:40.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Logs 3.28.2.
+# Generated by GNU Autoconf 2.69 for Logs 3.28.3.
#
# Report bugs to <dav...@gnome.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='Logs'
PACKAGE_TARNAME='gnome-logs'
-PACKAGE_VERSION='3.28.2'
-PACKAGE_STRING='Logs 3.28.2'
+PACKAGE_VERSION='3.28.3'
+PACKAGE_STRING='Logs 3.28.3'
PACKAGE_BUGREPORT='dav...@gnome.org'
PACKAGE_URL='https://wiki.gnome.org/Apps/Logs'
@@ -1322,7 +1322,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Logs 3.28.2 to adapt to many kinds of systems.
+\`configure' configures Logs 3.28.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Logs 3.28.2:";;
+ short | recursive ) echo "Configuration of Logs 3.28.3:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Logs configure 3.28.2
+Logs configure 3.28.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1701,7 +1701,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Logs $as_me 3.28.2, which was
+It was created by Logs $as_me 3.28.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2570,7 +2570,7 @@
# Define the identity of the package.
PACKAGE='gnome-logs'
- VERSION='3.28.2'
+ VERSION='3.28.3'
# Some tools Automake needs.
@@ -8346,7 +8346,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Logs $as_me 3.28.2, which was
+This file was extended by Logs $as_me 3.28.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8413,7 +8413,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Logs config.status 3.28.2
+Logs config.status 3.28.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/configure.ac
new/gnome-logs-3.28.3/configure.ac
--- old/gnome-logs-3.28.2/configure.ac 2018-05-07 09:49:21.000000000 +0200
+++ new/gnome-logs-3.28.3/configure.ac 2018-06-14 09:54:05.000000000 +0200
@@ -1,5 +1,5 @@
AC_INIT([Logs],
- [3.28.2],
+ [3.28.3],
[dav...@gnome.org],
[gnome-logs],
[https://wiki.gnome.org/Apps/Logs])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/data/icons/meson.build
new/gnome-logs-3.28.3/data/icons/meson.build
--- old/gnome-logs-3.28.2/data/icons/meson.build 1970-01-01
01:00:00.000000000 +0100
+++ new/gnome-logs-3.28.3/data/icons/meson.build 2018-06-05
12:57:52.000000000 +0200
@@ -0,0 +1,17 @@
+apps_icons = [
+ ['16x16', 'gnome-logs.png'],
+ ['22x22', 'gnome-logs.png'],
+ ['24x24', 'gnome-logs.png'],
+ ['32x32', 'gnome-logs.png'],
+ ['48x48', 'gnome-logs.png'],
+ ['256x256', 'gnome-logs.png'],
+ ['512x512', 'gnome-logs.png'],
+ ['symbolic', 'gnome-logs-symbolic.svg']
+]
+
+foreach icon: apps_icons
+ install_data(
+ join_paths(icon[0], icon[1]),
+ install_dir: join_paths(gl_datadir, 'icons', 'hicolor', icon[0], 'apps')
+ )
+endforeach
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/data/meson.build
new/gnome-logs-3.28.3/data/meson.build
--- old/gnome-logs-3.28.2/data/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/data/meson.build 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,103 @@
+subdir('icons')
+
+add_global_arguments('-DGL_BINDIR="@0@"'.format(gl_bindir), language : 'c')
+
+gettext_package = gl_name
+
+i18n.merge_file(
+ input : 'org.gnome.Logs.desktop.in',
+ output : 'org.gnome.Logs.desktop',
+ type : 'desktop',
+ po_dir : 'po',
+ install : true,
+ install_dir : join_paths(gl_datadir, 'applications')
+)
+
+i18n.merge_file(
+ input : 'org.gnome.Logs.appdata.xml.in',
+ output : 'org.gnome.Logs.appdata.xml',
+ po_dir : 'po',
+ install : true,
+ install_dir : join_paths(gl_datadir, 'appdata')
+)
+
+service_conf = configuration_data()
+service_conf.set('bindir', gl_bindir)
+
+service = 'org.gnome.Logs.service'
+
+configure_file(
+ input: service + '.in',
+ output: service,
+ install: true,
+ install_dir: join_paths(gl_datadir, 'dbus-1', 'services'),
+ configuration: service_conf
+)
+
+resource_data = files(
+ 'gl-categorylist.ui',
+ 'gl-eventviewlist.ui',
+ 'gl-eventtoolbar.ui',
+ 'gl-eventviewdetail.ui',
+ 'gl-searchpopover.ui',
+ 'gl-window.ui',
+ 'help-overlay.ui',
+ 'menus.ui'
+)
+
+gresource = files('org.gnome.Logs.gresource.xml')
+
+web_files = files(
+ 'gl-style.css'
+)
+
+install_data(
+ web_files,
+ install_dir: gl_pkgdatadir
+)
+
+# GSettings schemas
+# https://github.com/mesonbuild/meson/issues/1687
+custom_target('gsettings-enums',
+ input: '../src/gl-application.h',
+ output: 'org.gnome.Logs.enums.xml',
+ install: true,
+ install_dir: join_paths(gl_datadir, 'glib-2.0', 'schemas'),
+ capture: true,
+ command: ['glib-mkenums',
+ '--comments', '<!-- @comment@ -->',
+ '--fhead', '<schemalist>',
+ '--vhead', ' <@type@ id="org.gnome.Logs.@EnumName@">',
+ '--vprod', ' <value nick="@valuenick@" value="@valuenum@"/>',
+ '--vtail', ' </@type@>',
+ '--ftail', '</schemalist>',
+ '@INPUT@'
+ ]
+)
+install_data(
+ 'org.gnome.Logs.gschema.xml',
+ install_dir : join_paths(gl_datadir, 'glib-2.0', 'schemas')
+)
+
+configure_file(
+ input : 'version.xml.in',
+ output : 'version.xml',
+ command : ['cp', '@INPUT@', '@OUTPUT@']
+)
+
+if logs_enable_man
+ custom_target('gl-manfile',
+ input : 'gnome-logs.xml',
+ output : 'gnoem-logs.1',
+ install : true,
+ install_dir : gl_mandir,
+ command : [
+ xsltproc,
+ '--nonet',
+ '--path', join_paths(meson.source_root(), 'data') + ':' + 'data',
+ '--output', 'data/',
+
'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
+ '@INPUT@'
+ ]
+ )
+endif
Binary files old/gnome-logs-3.28.2/help/de/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/de/media/gnome-logs-3-12.png differ
Binary files old/gnome-logs-3.28.2/help/el/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/el/media/gnome-logs-3-12.png differ
Binary files old/gnome-logs-3.28.2/help/fr/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/fr/media/gnome-logs-3-12.png differ
Binary files old/gnome-logs-3.28.2/help/hu/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/hu/media/gnome-logs-3-12.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/help/meson.build
new/gnome-logs-3.28.3/help/meson.build
--- old/gnome-logs-3.28.2/help/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/help/meson.build 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,18 @@
+sources = [
+ 'index.page',
+ 'introduction.page',
+ 'legal.xml',
+ 'permissions.page'
+]
+
+media = [
+ 'media/gnome-logs.png',
+ 'media/gnome-logs-3-12.png'
+]
+
+gnome.yelp(
+ gl_name,
+ sources: sources,
+ media: media,
+ symlink_media: true
+)
Binary files old/gnome-logs-3.28.2/help/pl/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/pl/media/gnome-logs-3-12.png differ
Binary files old/gnome-logs-3.28.2/help/sv/media/gnome-logs-3-12.png and
new/gnome-logs-3.28.3/help/sv/media/gnome-logs-3-12.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/meson.build
new/gnome-logs-3.28.3/meson.build
--- old/gnome-logs-3.28.2/meson.build 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-logs-3.28.3/meson.build 2018-06-14 09:54:05.000000000 +0200
@@ -0,0 +1,161 @@
+project('gnome-logs', 'c', version : '3.28.3')
+
+gl_name = meson.project_name()
+gl_version = meson.project_version()
+
+gl_prefix = get_option('prefix')
+gl_bindir = join_paths(gl_prefix, get_option('bindir'))
+gl_libexecdir = join_paths(gl_prefix, get_option('libexecdir'))
+gl_localedir = join_paths(gl_prefix, get_option('localedir'))
+gl_datadir = join_paths(gl_prefix, get_option('datadir'))
+gl_mandir = join_paths(gl_prefix, get_option('mandir'), 'man1')
+gl_pkgdatadir = join_paths(gl_datadir, gl_name)
+
+# warning cflags
+warning_cflags = [
+ '-Wall',
+ '-Wstrict-prototypes',
+ '-Wnested-externs',
+ '-Werror=missing-prototypes',
+ '-Werror=implicit-function-declaration',
+ '-Werror=pointer-arith',
+ '-Werror=init-self',
+ '-Werror=format-security',
+ '-Werror=format=2',
+ '-Werror=missing-include-dirs',
+ '-Werror=return-type'
+]
+c_compiler = meson.get_compiler('c')
+supported_warning_cflags = c_compiler.get_supported_arguments(warning_cflags)
+add_global_arguments(supported_warning_cflags, language : 'c')
+
+config_h = configuration_data()
+
+# defines
+set_defines = [
+ # package
+ ['PACKAGE', gl_name],
+ ['PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=' +
gl_name],
+ ['PACKAGE_NAME', gl_name],
+ ['PACKAGE_STRING', '@0@ @1@'.format(gl_name, gl_version)],
+ ['PACKAGE_TARNAME', gl_name],
+ ['PACKAGE_URL', 'https://wiki.gnome.org/Apps/Logs'],
+ ['PACKAGE_VERSION', gl_version],
+ ['VERSION', gl_version],
+ # i18n
+ ['GETTEXT_PACKAGE', gl_name],
+]
+
+foreach define: set_defines
+ config_h.set_quoted(define[0], define[1])
+endforeach
+configure_file(output : 'config.h',
+ configuration : config_h)
+
+# Dependencies
+dependency('pkg-config', version : '>= 0.24')
+
+message('checking for glib-mkenums script...')
+glib_mkenums = run_command('pkg-config', ['--variable=glib_mkenums',
'glib-2.0'])
+if not glib_mkenums.stdout().contains('glib-mkenums')
+ error('glib-mkenums not listed in glib-2.0 pkg-config file')
+else
+ message(glib_mkenums.stdout().strip())
+endif
+
+gsettings_desktop_schemas = dependency('gsettings-desktop-schemas', required :
false)
+if not gsettings_desktop_schemas.found()
+ message('gsettings-desktop-schemas is required at runtime')
+endif
+
+gl_deps = [
+ dependency('gio-unix-2.0', version : '>=2.43.90'),
+ dependency('gtk+-3.0', version : '>=3.22.0'),
+ dependency('libsystemd')
+]
+
+# Testing utilities
+have_desktop_file_validate = false
+if get_option('tests')
+ desktop_file_validate = find_program('desktop-file-validate', required :
false)
+ if desktop_file_validate.found()
+ have_desktop_file_validate = true
+ else
+ have_desktop_file_validate = false
+ endif
+
+ py_module = 'dogtail'
+ message('checking for python module ' + py_module + '...')
+ result = run_command('echo', ['"import ' + py_module + '"| python -
&>/dev/null'])
+ if result.returncode() != 0
+ message('not found')
+ have_dogtail = false
+ else
+ message('found')
+ have_dogtail = true
+ endif
+else
+ have_desktop_file_validate = false
+ have_dogtail = false
+endif
+
+if have_desktop_file_validate == true and have_dogtail == true
+ testing_utilities = true
+else
+ testing_utilities = false
+ if get_option('tests')
+ error('tests were requested but the required utilities were not found')
+ endif
+endif
+
+if testing_utilities
+ logs_enable_tests = true
+else
+ logs_enable_tests = false
+endif
+
+# Manpage
+have_manutils = false
+if get_option('man')
+ # TODO: check xsl stylesheets as well#
+
+ xsltproc = find_program('xsltproc', required : false)
+ if xsltproc.found()
+ have_xsltproc = true
+ else
+ have_xsltproc = false
+ endif
+
+ if have_xsltproc
+ have_manutils = true
+ else
+ if not get_option('disable-man')
+ error('manpage generation requested but required utilities were
not found')
+ have_manutils = false
+ endif
+ endif
+endif
+
+if have_manutils
+ logs_enable_man = true
+else
+ logs_enable_man = false
+endif
+
+# i18n
+gnome = import('gnome')
+i18n = import('i18n')
+
+data_dir = join_paths(meson.source_root(), 'data')
+po_dir = join_paths(meson.source_root(), 'po')
+
+top_inc = include_directories('.')
+src_inc = include_directories('src')
+
+subdir('data')
+subdir('src')
+subdir('po')
+subdir('help')
+subdir('tests')
+
+meson.add_install_script('meson_post_install.py')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/meson_options.txt
new/gnome-logs-3.28.3/meson_options.txt
--- old/gnome-logs-3.28.2/meson_options.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/meson_options.txt 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,2 @@
+option('tests', type : 'boolean', value : false, description : 'Enable support
for tests run during make check')
+option('man', type : 'boolean', value : false, description : 'Enable building
the man page')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/meson_post_install.py
new/gnome-logs-3.28.3/meson_post_install.py
--- old/gnome-logs-3.28.2/meson_post_install.py 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/meson_post_install.py 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share',
'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+ print('Compiling gsettings schemas...')
+ subprocess.call(['glib-compile-schemas', join_paths(gl_datadir,
'glib-2.0', 'schemas')])
+ print('Updating icon cache...')
+ subprocess.call(['gtk-update-icon-cache --ignore-theme-index --force',
join_paths(gl_datadir, 'icons', 'hicolor')])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/po/gnome-logs.pot
new/gnome-logs-3.28.3/po/gnome-logs.pot
--- old/gnome-logs-3.28.2/po/gnome-logs.pot 2018-05-07 10:37:41.000000000
+0200
+++ new/gnome-logs-3.28.3/po/gnome-logs.pot 2018-06-14 09:55:36.000000000
+0200
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gnome-logs 3.28.2\n"
+"Project-Id-Version: gnome-logs 3.28.3\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"logs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-05-07 16:37+0800\n"
+"POT-Creation-Date: 2018-06-14 15:55+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/po/meson.build
new/gnome-logs-3.28.3/po/meson.build
--- old/gnome-logs-3.28.2/po/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/po/meson.build 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1 @@
+i18n.gettext(gettext_package, preset: 'glib')
Binary files old/gnome-logs-3.28.2/po/zh_CN.gmo and
new/gnome-logs-3.28.3/po/zh_CN.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/po/zh_CN.po
new/gnome-logs-3.28.3/po/zh_CN.po
--- old/gnome-logs-3.28.2/po/zh_CN.po 2018-03-28 09:36:02.000000000 +0200
+++ new/gnome-logs-3.28.3/po/zh_CN.po 2018-06-08 04:54:18.000000000 +0200
@@ -1,343 +1,361 @@
# Chinese (China) translation for gnome-logs.
-# Copyright (C) 2013 gnome-logs's COPYRIGHT HOLDER
+# Copyright (C) 2013--2018 gnome-logs's COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-logs package.
# eternalhui <www.eternal...@gmail.com>, 2013.
# Jeff Bai <jeff...@aosc.xyz>, 2015, 2016.
-# Dingzhong Chen <wsxy...@gmail.com>, 2016.
+# Dingzhong Chen <wsxy162@@gmail.com>, 2016, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-logs master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"logs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-01-05 14:00+0000\n"
-"PO-Revision-Date: 2017-01-21 22:54+0800\n"
-"Last-Translator: Jeff Bai <jeff...@aosc.xyz>\n"
+"POT-Creation-Date: 2018-04-21 02:20+0000\n"
+"PO-Revision-Date: 2018-03-03 23:13+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162@@gmail.com>\n"
"Language-Team: Chinese (China) <i18n...@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../data/gl-categorylist.ui.h:1
+#: data/gl-categorylist.ui:15
msgid "Important"
msgstr "重要"
-#: ../data/gl-categorylist.ui.h:2
+#: data/gl-categorylist.ui:30
msgid "Alerts"
msgstr "警告"
-#: ../data/gl-categorylist.ui.h:3
+#: data/gl-categorylist.ui:45
msgid "Starred"
msgstr "已加星标"
-#: ../data/gl-categorylist.ui.h:4
+#: data/gl-categorylist.ui:60
msgid "All"
msgstr "全部"
-#: ../data/gl-categorylist.ui.h:5 ../src/gl-eventviewrow.c:202
+#: data/gl-categorylist.ui:75 src/gl-eventviewrow.c:207
msgid "Applications"
msgstr "应用程序"
-#: ../data/gl-categorylist.ui.h:6 ../src/gl-eventviewrow.c:211
+#: data/gl-categorylist.ui:90 src/gl-eventviewrow.c:216
msgid "System"
msgstr "系统"
-#: ../data/gl-categorylist.ui.h:7 ../src/gl-eventviewrow.c:215
+#: data/gl-categorylist.ui:105 src/gl-eventviewrow.c:220
msgid "Security"
msgstr "安全"
-#: ../data/gl-categorylist.ui.h:8 ../src/gl-eventviewrow.c:207
+#: data/gl-categorylist.ui:120 src/gl-eventviewrow.c:212
msgid "Hardware"
msgstr "硬件"
-#: ../data/gl-categorylist.ui.h:9
+#: data/gl-categorylist.ui:135
msgid "Updates"
msgstr "更新"
-#: ../data/gl-categorylist.ui.h:10
+#: data/gl-categorylist.ui:150
msgid "Usage"
msgstr "使用"
-#: ../data/gl-eventtoolbar.ui.h:1
-msgid "Go back to the event view"
-msgstr "返回事件视图"
-
-#: ../data/gl-eventtoolbar.ui.h:2
+#: data/gl-eventtoolbar.ui:9
msgid "Export logs to a file"
msgstr "将日志导出到文件"
-#: ../data/gl-eventtoolbar.ui.h:3
+#: data/gl-eventtoolbar.ui:30
msgid "Choose the boot from which to view logs"
msgstr "选择某次引导以查看其日志"
-#: ../data/gl-eventtoolbar.ui.h:4
+#: data/gl-eventtoolbar.ui:42
msgid "Search all the logs of the current category"
msgstr "在当前类别中的所有日志中搜索"
-#: ../data/gl-eventviewdetail.ui.h:1 ../data/gl-searchpopover.ui.h:32
+#: data/gl-eventviewdetail.ui:26
+msgid "Sender"
+msgstr "发送方"
+
+#: data/gl-eventviewdetail.ui:58
+msgid "Time"
+msgstr "时间"
+
+#: data/gl-eventviewdetail.ui:92 data/gl-searchpopover.ui:1052
msgid "Message"
msgstr "消息"
-#: ../data/gl-eventviewdetail.ui.h:2 ../data/gl-searchpopover.ui.h:36
+#: data/gl-eventviewdetail.ui:128 data/gl-searchpopover.ui:1072
msgid "Audit Session"
msgstr "审查会话"
-#: ../data/gl-eventviewdetail.ui.h:3 ../data/gl-searchpopover.ui.h:35
+#: data/gl-eventviewdetail.ui:161 data/gl-searchpopover.ui:1067
msgid "Kernel Device"
msgstr "内核设备"
-#: ../data/gl-eventviewdetail.ui.h:4
+#: data/gl-eventviewdetail.ui:194
msgid "Priority"
msgstr "优先级"
-#: ../data/gl-eventviewdetail.ui.h:5
+#: data/gl-eventviewdetail.ui:228
msgid "Subject"
msgstr "主题"
-#: ../data/gl-eventviewdetail.ui.h:6
+#: data/gl-eventviewdetail.ui:264
msgid "Defined By"
msgstr "定义由"
-#: ../data/gl-eventviewdetail.ui.h:7
+#: data/gl-eventviewdetail.ui:298
msgid "Support"
msgstr "支持"
-#: ../data/gl-eventviewdetail.ui.h:8
+#: data/gl-eventviewdetail.ui:334
msgid "Documentation"
msgstr "文档"
-#: ../data/gl-eventviewlist.ui.h:1
+#: data/gl-eventviewlist.ui:43
msgid "Select journal field and timestamp range filtering options"
msgstr "选择日志区域及时间戳范围作为筛选选项"
-#: ../data/gl-searchpopover.ui.h:1
+#: data/gl-searchpopover.ui:26
msgid "Select a Journal Field to filter the Logs according to it"
msgstr "选择日志区域以据此筛选日志"
-#: ../data/gl-searchpopover.ui.h:2
+#: data/gl-searchpopover.ui:35 data/gl-searchpopover.ui:1028
msgid "All Available Fields"
msgstr "全部可用区域"
-#: ../data/gl-searchpopover.ui.h:3
+#: data/gl-searchpopover.ui:78 data/gl-searchpopover.ui:251
+msgid "Parameters"
+msgstr "参数"
+
+#. Translators: What [journal fields to search in]
+#: data/gl-searchpopover.ui:115
msgid "What"
msgstr "类型"
-#: ../data/gl-searchpopover.ui.h:4
+#: data/gl-searchpopover.ui:130
msgid "Select Journal Field…"
-msgstr "选择日志区域"
+msgstr "选择日志区域…"
-#: ../data/gl-searchpopover.ui.h:5
+#. When [log entries to be shown for a given timestamp range]
+#: data/gl-searchpopover.ui:155
msgid "When"
msgstr "时间"
-#: ../data/gl-searchpopover.ui.h:6
+#: data/gl-searchpopover.ui:170
msgid "Show Logs from…"
msgstr "显示自此时间的日志…"
-#: ../data/gl-searchpopover.ui.h:7
+#: data/gl-searchpopover.ui:199
msgid "Select Timestamp Range of the Log Entries to be shown"
msgstr "选择要显示的日志条目的时间戳范围"
-#: ../data/gl-searchpopover.ui.h:8 ../src/gl-searchpopover.c:1303
+#: data/gl-searchpopover.ui:208 data/gl-searchpopover.ui:1091
+#: src/gl-searchpopover.c:1309
msgid "Current Boot"
msgstr "本次引导"
-#: ../data/gl-searchpopover.ui.h:9
+#: data/gl-searchpopover.ui:293
msgid "Search Type"
msgstr "搜索类型"
-#: ../data/gl-searchpopover.ui.h:10
+#: data/gl-searchpopover.ui:310
msgid "Substring"
msgstr "子字符串"
-#: ../data/gl-searchpopover.ui.h:11
+#: data/gl-searchpopover.ui:314
msgid "Match in any part of the string"
msgstr "匹配字串的任何部分"
-#: ../data/gl-searchpopover.ui.h:12
+#: data/gl-searchpopover.ui:328
msgid "Exact"
msgstr "精确"
-#: ../data/gl-searchpopover.ui.h:13
+#: data/gl-searchpopover.ui:332
msgid "Match complete string only"
msgstr "仅全字串匹配"
-#: ../data/gl-searchpopover.ui.h:14
+#: data/gl-searchpopover.ui:379
msgid "Back"
msgstr "返回"
-#: ../data/gl-searchpopover.ui.h:15
+#: data/gl-searchpopover.ui:397
msgid "Show Logs Starting From…"
msgstr "显示自此时间的日志…"
-#: ../data/gl-searchpopover.ui.h:16
+#: data/gl-searchpopover.ui:419
msgid "Select a start date"
msgstr "选择起始日期"
-#: ../data/gl-searchpopover.ui.h:17 ../src/gl-searchpopover.c:503
+#: data/gl-searchpopover.ui:428 src/gl-searchpopover.c:503
msgid "Select Start Date…"
msgstr "选择起始日期…"
-#: ../data/gl-searchpopover.ui.h:18
+#: data/gl-searchpopover.ui:459 data/gl-searchpopover.ui:763
+msgid "22 January 2016 or 1/22/2016"
+msgstr "2016年1月22日 或 2016-01-22"
+
+#: data/gl-searchpopover.ui:504
msgid "Select start time"
msgstr "选择起始时间"
-#: ../data/gl-searchpopover.ui.h:19 ../src/gl-searchpopover.c:504
+#: data/gl-searchpopover.ui:513 src/gl-searchpopover.c:504
msgid "Select Start Time…"
msgstr "选择起始时间…"
-#: ../data/gl-searchpopover.ui.h:20
+#: data/gl-searchpopover.ui:550 data/gl-searchpopover.ui:857
msgid "Hr"
msgstr "时"
-#: ../data/gl-searchpopover.ui.h:21
+#: data/gl-searchpopover.ui:585 data/gl-searchpopover.ui:892
msgid "Min"
msgstr "分"
-#: ../data/gl-searchpopover.ui.h:22
+#: data/gl-searchpopover.ui:620 data/gl-searchpopover.ui:927
msgid "Sec"
msgstr "秒"
-#: ../data/gl-searchpopover.ui.h:23
+#: data/gl-searchpopover.ui:655 data/gl-searchpopover.ui:962
msgid "AM/PM"
msgstr "上午/下午"
-#: ../data/gl-searchpopover.ui.h:24
+#: data/gl-searchpopover.ui:701
msgid "Until…"
msgstr "到…"
-#: ../data/gl-searchpopover.ui.h:25
+#: data/gl-searchpopover.ui:723
msgid "Select an end date"
msgstr "设置结束日期"
-#: ../data/gl-searchpopover.ui.h:26 ../src/gl-searchpopover.c:521
+#: data/gl-searchpopover.ui:732 src/gl-searchpopover.c:521
msgid "Select End Date…"
msgstr "设置结束日期…"
-#: ../data/gl-searchpopover.ui.h:27
+#: data/gl-searchpopover.ui:811
msgid "Select end time"
msgstr "设置结束时间"
-#: ../data/gl-searchpopover.ui.h:28 ../src/gl-searchpopover.c:522
+#: data/gl-searchpopover.ui:820 src/gl-searchpopover.c:522
msgid "Select End Time…"
msgstr "设置结束时间…"
-#: ../data/gl-searchpopover.ui.h:29
+#: data/gl-searchpopover.ui:1037
msgid "PID"
msgstr "PID"
-#: ../data/gl-searchpopover.ui.h:30
+#: data/gl-searchpopover.ui:1042
msgid "UID"
msgstr "UID"
-#: ../data/gl-searchpopover.ui.h:31
+#: data/gl-searchpopover.ui:1047
msgid "GID"
msgstr "GID"
-#: ../data/gl-searchpopover.ui.h:33
+#: data/gl-searchpopover.ui:1057
msgid "Process Name"
msgstr "进程名"
-#: ../data/gl-searchpopover.ui.h:34
+#: data/gl-searchpopover.ui:1062
msgid "Systemd Unit"
msgstr "Systemd 单元"
-#: ../data/gl-searchpopover.ui.h:37
+#: data/gl-searchpopover.ui:1077
msgid "Executable Path"
msgstr "可执行路径"
-#: ../data/gl-searchpopover.ui.h:38
+#: data/gl-searchpopover.ui:1096
msgid "Previous Boot"
msgstr "上次引导"
-#: ../data/gl-searchpopover.ui.h:39
+#: data/gl-searchpopover.ui:1105
msgid "Today"
msgstr "今天"
-#: ../data/gl-searchpopover.ui.h:40
+#: data/gl-searchpopover.ui:1110
msgid "Yesterday"
msgstr "昨天"
-#: ../data/gl-searchpopover.ui.h:41
+#: data/gl-searchpopover.ui:1115
msgid "Last 3 days"
msgstr "近三天"
-#: ../data/gl-searchpopover.ui.h:42
+#: data/gl-searchpopover.ui:1124
msgid "Entire Journal"
msgstr "整个日志"
-#: ../data/gl-searchpopover.ui.h:43
+#: data/gl-searchpopover.ui:1133
msgid "Set Custom Range…"
msgstr "设置自定义范围…"
-#: ../data/gl-window.ui.h:1
+#: data/gl-window.ui:31
msgid "Help"
msgstr "帮助"
-#: ../data/help-overlay.ui.h:1
+#: data/gl-window.ui:39
+msgid "Ignore"
+msgstr "忽略"
+
+#: data/help-overlay.ui:8
msgctxt "shortcut window"
msgid "General"
msgstr "通用"
-#: ../data/help-overlay.ui.h:2
+#: data/help-overlay.ui:13
msgctxt "shortcut window"
msgid "Open a new window"
msgstr "打开新窗口"
-#: ../data/help-overlay.ui.h:3
+#: data/help-overlay.ui:20
msgctxt "shortcut window"
msgid "Close a window"
msgstr "关闭此窗口"
-#: ../data/help-overlay.ui.h:4
+#: data/help-overlay.ui:28
msgctxt "shortcut window"
msgid "Search"
msgstr "搜索"
-#: ../data/help-overlay.ui.h:5
+#: data/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Find"
msgstr "查找"
-#: ../data/menus.ui.h:1
+#: data/menus.ui:6
msgid "_New Window"
msgstr "新窗口(_N)"
-#: ../data/menus.ui.h:2
+#: data/menus.ui:13
msgid "_Help"
msgstr "帮助(_H)"
-#: ../data/menus.ui.h:3
+#: data/menus.ui:17
msgid "Keyboard Shortcuts"
msgstr "键盘快捷键"
-#: ../data/menus.ui.h:4
+#: data/menus.ui:21
msgid "_About"
msgstr "关于(_A)"
-#: ../data/menus.ui.h:5
+#: data/menus.ui:26
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../data/org.gnome.Logs.appdata.xml.in.h:1
+#: data/org.gnome.Logs.appdata.xml.in:7
msgid "GNOME Logs"
msgstr "GNOME 日志"
-#: ../data/org.gnome.Logs.appdata.xml.in.h:2
-#: ../data/org.gnome.Logs.desktop.in.h:3
+#: data/org.gnome.Logs.appdata.xml.in:8 data/org.gnome.Logs.desktop.in:5
msgid "View detailed event logs for the system"
msgstr "查看系统详细的事件日志"
-#: ../data/org.gnome.Logs.appdata.xml.in.h:3
+#: data/org.gnome.Logs.appdata.xml.in:10
msgid ""
"Logs shows events from the systemd journal, and sorts them into categories, "
"such as hardware and applications."
msgstr "日志查看器 显示来自 systemd 的日志并按“硬件”、“应用程序”等进行分类。"
-#: ../data/org.gnome.Logs.appdata.xml.in.h:4
+#: data/org.gnome.Logs.appdata.xml.in:12
msgid ""
"Using Logs you can search your logs by typing a search term, and view "
"detailed information about each event by clicking on it."
@@ -345,54 +363,69 @@
"使用 日志查看器 时您可以输入条件在日志中搜索，点击某个事件可以查看它的详细信"
"息。"
-#: ../data/org.gnome.Logs.desktop.in.h:1 ../src/gl-eventtoolbar.c:124
+#: data/org.gnome.Logs.desktop.in:3 src/gl-eventtoolbar.c:139
msgid "Logs"
msgstr "日志"
-#: ../data/org.gnome.Logs.desktop.in.h:2
+#: data/org.gnome.Logs.desktop.in:4
msgid "Log Viewer"
msgstr "日志查看器"
#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
-#: ../data/org.gnome.Logs.desktop.in.h:5
+#: data/org.gnome.Logs.desktop.in:7
msgid "log;journal;debug;error;"
msgstr "log;journal;debug;error;日志;记录;调试;错误;"
-#: ../data/org.gnome.Logs.gschema.xml.h:1
+#. Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+#: data/org.gnome.Logs.desktop.in:12
+msgid "gnome-logs"
+msgstr "gnome-logs"
+
+#: data/org.gnome.Logs.gschema.xml:5
+msgid "Ignore warning"
+msgstr "忽略警告"
+
+#: data/org.gnome.Logs.gschema.xml:6
+msgid ""
+"Whether to ignore the warning that says you don’t have sufficient permission "
+"to view logs. If ignored, the warning won’t show up again."
+msgstr "是否忽略提示您没有足够权限查看日志的警告。如果忽略，警告不会再显示。"
+
+#: data/org.gnome.Logs.gschema.xml:10
msgid "How to sort list rows in the event view list"
msgstr "如何在事件查看列别中对行列表排序"
-#: ../data/org.gnome.Logs.gschema.xml.h:2
+#: data/org.gnome.Logs.gschema.xml:11
msgid "Sort list rows in ascending or descending order for the selected type"
msgstr "根据选择的类型以升序或降序排列列表行"
-#: ../src/gl-application.c:110
+#: src/gl-application.c:109
msgid "translator-credits"
msgstr ""
"eternalhui <www.eternal...@gmail.com>, 2013\n"
-"Dingzhong Chen <wsxy...@gmail.com>, 2016\n"
-"Jeff Bai <jeff...@aosc.xyz>, 2015, 2016, 2017"
+"Jeff Bai <jeff...@aosc.xyz>, 2015, 2016, 2017\n"
+"Dingzhong Chen <wsxy...@gmail.com>, 2016, 2018"
-#: ../src/gl-application.c:111
+#: src/gl-application.c:110
msgid "View and search logs"
msgstr "查看和搜索日志"
-#: ../src/gl-application.c:245
+#: src/gl-application.c:243
msgid "Print version information and exit"
msgstr "打印版本信息并退出"
#. Translators: Boot refers to a single run (or bootup) of the system
-#: ../src/gl-eventtoolbar.c:115
+#: src/gl-eventtoolbar.c:130
msgid "Boot"
msgstr "单次引导"
#. Translators: Shown when there are no (zero) results in the current
#. * view.
-#: ../src/gl-eventviewlist.c:296
+#: src/gl-eventviewlist.c:488
msgid "No results"
msgstr "无结果"
-#: ../src/gl-eventviewrow.c:219
+#: src/gl-eventviewrow.c:224
msgid "Other"
msgstr "其他"
@@ -400,7 +433,7 @@
#. * the timestamp range button label in popover to show that
#. * logs are shown in the window starting from this timestamp
#. * until the ending timestamp of journal.
-#: ../src/gl-searchpopover.c:687
+#: src/gl-searchpopover.c:687
#, c-format
msgid "From %s"
msgstr "从 %s"
@@ -409,7 +442,7 @@
#. * the timestamp range button label in popover to show that
#. * logs are shown in the window upto this timestamp
#. * with the starting timestamp being the current time.
-#: ../src/gl-searchpopover.c:700
+#: src/gl-searchpopover.c:700
#, c-format
msgid "Until %s"
msgstr "至 %s"
@@ -422,17 +455,15 @@
#. * and end date button label in the custom range submenu,
#. * showing the day of month in decimal number, full month
#. * name as string, the year as a decimal number including the century.
-#: ../src/gl-searchpopover.c:737 ../src/gl-searchpopover.c:1104
+#: src/gl-searchpopover.c:737 src/gl-searchpopover.c:1107
msgid "%e %B %Y"
msgstr "%Y年%-m月%-e日"
-#: ../src/gl-searchpopover.c:875
-#, c-format
+#: src/gl-searchpopover.c:875
msgid "AM"
msgstr "上午"
-#: ../src/gl-searchpopover.c:879
-#, c-format
+#: src/gl-searchpopover.c:879
msgid "PM"
msgstr "下午"
@@ -442,9 +473,9 @@
#. Translators: timestamp format for the custom end time button
#. * label in the custom range submenu, showing the time with seconds
#. * in 12-hour format.
-#: ../src/gl-searchpopover.c:987 ../src/gl-searchpopover.c:1226
+#: src/gl-searchpopover.c:987 src/gl-searchpopover.c:1229
msgid "%I:%M:%S %p"
-msgstr "%p%l:%M:%S"
+msgstr "%p %I:%M:%S"
#. Translators: timestamp format for the custom start time button
#. * label in the custom range submenu, showing the time with seconds
@@ -452,21 +483,21 @@
#. Translators: timestamp format for the custom end time button
#. * label in the custom range submenu, showing the time with seconds
#. * in 24-hour format.
-#: ../src/gl-searchpopover.c:994 ../src/gl-searchpopover.c:1233
+#: src/gl-searchpopover.c:994 src/gl-searchpopover.c:1236
msgid "%T"
msgstr "%T"
#. Translators: timestamp format for events on the
#. * current day, showing the time with seconds in
#. * 12-hour format.
-#: ../src/gl-util.c:148
+#: src/gl-util.c:148
msgid "%l:%M:%S %p"
msgstr "%p %l:%M:%S"
#. Translators: timestamp format for events on the
#. * current day, showing the time without seconds in
#. * 12-hour format.
-#: ../src/gl-util.c:155
+#: src/gl-util.c:155
msgid "%l:%M %p"
msgstr "%p %l:%M"
@@ -474,7 +505,7 @@
#. * the current year, showing the abbreviated
#. * month name, day of the month and the time
#. * with seconds in 12-hour format.
-#: ../src/gl-util.c:166
+#: src/gl-util.c:166
msgid "%b %e %l:%M:%S %p"
msgstr "%-m月%-e日 %p %l:%M:%S"
@@ -482,7 +513,7 @@
#. * current year, showing the abbreviated month name,
#. * day of the month and the time without seconds in
#. * 12-hour format.
-#: ../src/gl-util.c:174
+#: src/gl-util.c:174
msgid "%b %e %l:%M %p"
msgstr "%-m月%-e日 %p %l:%M"
@@ -490,7 +521,7 @@
#. * a different year, showing the abbreviated
#. * month name, day of the month, year and the
#. * time with seconds in 12-hour format.
-#: ../src/gl-util.c:185
+#: src/gl-util.c:185
msgid "%b %e %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-e日 %p %l:%M:%S"
@@ -498,21 +529,21 @@
#. * a different year, showing the abbreviated
#. * month name day of the month, year and the
#. * time without seconds in 12-hour format.
-#: ../src/gl-util.c:194
+#: src/gl-util.c:194
msgid "%b %e %Y %l:%M %p"
msgstr "%Y年%-m月%-e日 %p %l:%M"
#. Translators: timestamp format for events on the
#. * current day, showing the time with seconds in
#. * 24-hour format.
-#: ../src/gl-util.c:211
+#: src/gl-util.c:211
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. Translators: timestamp format for events on the
#. * current day, showing the time without seconds in
#. * 24-hour format.
-#: ../src/gl-util.c:218
+#: src/gl-util.c:218
msgid "%H:%M"
msgstr "%H:%M"
@@ -520,15 +551,15 @@
#. * current year, showing the abbreviated month name,
#. * day of the month and the time with seconds in
#. * 24-hour format.
-#: ../src/gl-util.c:228
+#: src/gl-util.c:228
msgid "%b %e %H:%M:%S"
-msgstr "%-m月%-e日 %H:%M:%"
+msgstr "%-m月%-e日 %H:%M:%S"
#. Translators: timestamp format for events in the
#. * current year, showing the abbreviated month name,
#. * day of the month and the time without seconds in
#. * 24-hour format.
-#: ../src/gl-util.c:236
+#: src/gl-util.c:236
msgid "%b %e %H:%M"
msgstr "%-m月%-e日 %H:%M"
@@ -536,7 +567,7 @@
#. * a different year, showing the abbreviated
#. * month name, day of the month, year and the
#. * time with seconds in 24-hour format.
-#: ../src/gl-util.c:247
+#: src/gl-util.c:247
msgid "%b %e %Y %H:%M:%S"
msgstr "%Y年%-m月%-e日 %H:%M:%S"
@@ -544,50 +575,53 @@
#. * different year, showing the abbreviated month name,
#. * day of the month, year and the time without seconds
#. * in 24-hour format.
-#: ../src/gl-util.c:255
+#: src/gl-util.c:255
msgid "%b %e %Y %H:%M"
msgstr "%Y年%-m月%-e日 %H:%M"
#. Transltors: the first string is the earliest timestamp of the boot,
#. * and the second string is the newest timestamp. An example string might
#. * be '08:10 - 08:30'
-#: ../src/gl-util.c:319
+#: src/gl-util.c:319
#, c-format
msgid "%s – %s"
msgstr "%s 至 %s"
-#: ../src/gl-window.c:181
+#: src/gl-window.c:113
msgid "Save logs"
msgstr "保存日志"
-#: ../src/gl-window.c:184
+#: src/gl-window.c:116
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../src/gl-window.c:185
+#: src/gl-window.c:117
msgid "_Save"
msgstr "保存(_S)"
-#: ../src/gl-window.c:190
+#: src/gl-window.c:122
msgid "log messages"
msgstr "日志消息"
-#: ../src/gl-window.c:243
+#: src/gl-window.c:181
msgid "Unable to export log messages to a file"
msgstr "无法将日志消息导出到文件"
-#: ../src/gl-window.c:474 ../src/gl-window.c:505
+#: src/gl-window.c:474 src/gl-window.c:505
msgid "Unable to read system logs"
msgstr "无法读取系统日志"
-#: ../src/gl-window.c:488
+#: src/gl-window.c:488
msgid "Unable to read user logs"
msgstr "无法读取用户日志"
-#: ../src/gl-window.c:520
+#: src/gl-window.c:520
msgid "No logs available"
msgstr "无可用的日志"
+#~ msgid "Go back to the event view"
+#~ msgstr "返回事件视图"
+
#~ msgid "Search the displayed logs"
#~ msgstr "搜索显示的日志"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/src/meson.build
new/gnome-logs-3.28.3/src/meson.build
--- old/gnome-logs-3.28.2/src/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/src/meson.build 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,49 @@
+add_global_arguments('-DLOCALEDIR="@0@"'.format(gl_localedir), language : 'c')
+
+sources = files(
+ 'gl-application.c',
+ 'gl-categorylist.c',
+ 'gl-eventtoolbar.c',
+ 'gl-eventviewdetail.c',
+ 'gl-eventviewlist.c',
+ 'gl-searchpopover.c',
+ 'gl-eventviewrow.c',
+ 'gl-journal.c',
+ 'gl-journal-model.c',
+ 'gl-main.c',
+ 'gl-util.c',
+ 'gl-window.c'
+)
+
+enum_headers = files(
+ 'gl-categorylist.h',
+ 'gl-eventtoolbar.h',
+ 'gl-eventviewrow.h',
+ 'gl-journal-model.h',
+ 'gl-searchpopover.h',
+ 'gl-util.h'
+)
+
+sources += gnome.compile_resources(
+ 'gl-resources',
+ gresource,
+ c_name: 'gl',
+ source_dir: data_dir,
+ dependencies: resource_data,
+ export: true
+)
+
+enum = 'gl-enums'
+sources += gnome.mkenums_simple(
+ enum,
+ sources : enum_headers
+)
+
+executable(
+ gl_name,
+ sources,
+ include_directories : [top_inc, src_inc],
+ dependencies : gl_deps,
+ install : true,
+ install_dir : gl_bindir
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-logs-3.28.2/tests/meson.build
new/gnome-logs-3.28.3/tests/meson.build
--- old/gnome-logs-3.28.2/tests/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-logs-3.28.3/tests/meson.build 2018-06-05 12:57:52.000000000
+0200
@@ -0,0 +1,32 @@
+# Tests
+tests_env = [
+ 'LANG=C',
+ 'TZ=UTC',
+ 'MALLOC_CHECK_=2',
+ 'MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))',
+ 'G_SLICE=debug-blocks'
+]
+test_gl_util_sources = files(
+ 'test-gl-util.c',
+ '../src/gl-util.c'
+)
+
+if logs_enable_tests
+ selftest = executable(
+ 'test-gl-util',
+ sources : test_gl_util_sources,
+ include_directories : [top_inc, src_inc],
+ dependencies : gl_deps
+ )
+ test('test-gl-util', selftest, env : tests_env)
+
+ #TODO: run test_SCRIPT too
+
+ # basictest target
+ run_target('basictest',
+ command : [
+ 'env', tests_env,
+ join_paths(meson.source_root(), 'tests/basic.py')
+ ]
+ )
+endif
