Skip to content
Commits on Source (38)
# You can override the included template(s) by including variable overrides
# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
# Note that environment variables can be set in several places
# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
include:
- template: Security/SAST.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml
image: fedora:34
variables:
LAST_ABI_BREAK: 9d01763ba2a3f71b7c0aade04d2ffa6a883e308d
DEPENDENCIES: gtk3-devel gsettings-desktop-schemas-devel gettext
gtk-doc libxkbcommon-devel xkeyboard-config-devel itstool
gobject-introspection-devel systemd-devel iso-codes-devel
libseccomp-devel gcc gcc-c++ glibc-devel
meson redhat-rpm-config
TEST_DEPENDENCIES: gnome-desktop-testing xorg-x11-server-Xvfb glibc-langpack-en glibc-langpack-he glibc-langpack-ja abattis-cantarell-fonts libabigail git
build_stable:
before_script:
# Undo delangification present in the Fedora Docker images
- rm -f /etc/rpm/macros.image-language-conf
- echo "reinstall glib2" >> translist.txt
# Work-around https://bugzilla.redhat.com/show_bug.cgi?id=1607172#c4
- echo "update dnf gdbm" >> translist.txt
- echo "remove python3-modulemd" >> translist.txt
- dnf shell -y --nogpgcheck translist.txt
- dnf update -y --nogpgcheck
- dnf install -y --nogpgcheck $DEPENDENCIES
- dnf install -y --nogpgcheck $TEST_DEPENDENCIES
script:
- meson --prefix=/usr -Dinstalled_tests=true build
- pushd build
- ninja
- ninja install
- ninja dist
- G_MESSAGES_DEBUG=all xvfb-run -a -s "-screen 0 1024x768x24" ninja test
- G_MESSAGES_DEBUG=all xvfb-run -a -s "-screen 0 1024x768x24"
gnome-desktop-testing-runner --report-directory=test-results gnome-desktop
- popd
- .ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
artifacts:
paths:
- build/meson-logs/
- build/test-results/
when: on_failure
paths:
- build/meson-dist/
when: on_success
do_gitlab_release:
stage: deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules:
- if: $CI_COMMIT_TAG
script:
- echo 'Running release_job'
release:
tag_name: '$CI_COMMIT_TAG'
description: 'See NEWS file'
============
Version 40.4
Version 41.0
============
- No changes
- Translation updates
============
Version 40.3
============
=============
Version 41.rc
=============
- Some improves in the CI
- Translation updates
============
Version 40.2
============
===============
Version 41.beta
===============
- Fix crash loading keyboard settings panel (#190, Peter Hutterer)
- xkb: Clear cached layouts when necessary
- Translation updates
================
Version 41.alpha
================
- Stop mounting ld.so.cache on non-glibc systems
- Replace usage of non-portable `uselocale` with locale-dependent functions
- Fix starttime hour parsing in animated background
- xkbinfo: only insert new layouts, skip over duplicate ones
- Translation updates
============
......@@ -23,9 +34,9 @@ Version 40.0
- No changes
===============
=============
Version 40.rc
===============
=============
- bg-slide-show: Always parse date/time integers in base 10
- thumbnail: Fix thumbnailing of CBZ with UTF-8 filenames
......@@ -39,9 +50,9 @@ Version 40.beta
- xkbinfo: Update iso639Ids but not iso3166Ids correctly in evdev
- Translation updates
==============
================
Version 40.alpha
==============
================
- Add support for x-large and xx-large thumbnail sizes (!99, Bastien Nocera)
- Make it easier to profile thumbnailers (!94, Bastien Nocera)
......
......@@ -27,3 +27,9 @@
/* Define to include GNU extensions */
#mesondefine _GNU_SOURCE
/* define on systems that have the `uselocale` function */
#mesondefine HAVE_USELOCALE
/* define on system if OS has extended locale header */
#mesondefine HAVE_XLOCALE
......@@ -11,6 +11,7 @@ ko
oc
pt_BR
sl
sr
sv
tr
uk
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -384,7 +384,7 @@ handle_text (GMarkupParseContext *context,
self->priv->start_tm.tm_mday = parse_int (text);
}
else if (stack_is (self, "hour", "starttime", "background", NULL)) {
self->priv->start_tm.tm_hour = parse_int (text) - 1;
self->priv->start_tm.tm_hour = parse_int (text);
}
else if (stack_is (self, "minute", "starttime", "background", NULL)) {
self->priv->start_tm.tm_min = parse_int (text);
......@@ -680,6 +680,9 @@ parse_file_contents (GnomeBGSlideShow *self,
if (!failed) {
guint queue_length;
/* Per the API of mktime, use a negative value on tm_isdst, in order to
* use the system databases to get the active timezone DST status. */
self->priv->start_tm.tm_isdst = -1;
t = mktime (&self->priv->start_tm);
self->priv->start_time = (double)t;
......
......@@ -557,7 +557,7 @@ add_bwrap (GPtrArray *array,
add_args (array,
"bwrap",
"--ro-bind", "/usr", "/usr",
"--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
"--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
NULL);
/* These directories might be symlinks into /usr/... */
......
/*-
* Copyright (c) 2021 Dan Cîrnaț <dan@alt.md>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include "config.h"
#include <locale.h>
#ifdef HAVE_XLOCALE
#include <xlocale.h>
#endif
#include <glib.h>
#include <glib/gi18n-lib.h>
#ifndef HAVE_USELOCALE
/**
* FIXME: This function does nothing if there's no thread-safe
* alternative to uselocale on some systems (NetBSD). Replace it
* when an implementation becomes available.
*/
locale_t
uselocale (locale_t newloc)
{
return (locale_t) 0;
}
#endif
char *
dgettext_l (locale_t locale,
const char *domain,
const char *msgid)
{
locale_t old_locale = uselocale (locale);
char *ret = dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}
const gchar *
g_dgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgid)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}
const gchar *
g_dpgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dpgettext (domain, msgctxtid, msgidoffset);
uselocale (old_locale);
return ret;
}
/*-
* Copyright (c) 2021 Dan Cîrnaț <dan@alt.md>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include "config.h"
#include <locale.h>
#include <string.h>
#ifdef HAVE_XLOCALE
#include <xlocale.h>
#endif
const char *
dgettext_l (locale_t locale,
const char *domain,
const char *msgid);
const gchar *
g_dgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgid);
const gchar *
g_dpgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset);
#define _l(locale_t,String) ((char *) g_dgettext_l (locale_t, GETTEXT_PACKAGE, String))
......@@ -28,7 +28,6 @@
#include <string.h>
#include <errno.h>
#include <dirent.h>
#include <locale.h>
#include <langinfo.h>
#include <sys/stat.h>
......@@ -36,6 +35,8 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include "gnome-gettext-portable.h"
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "gnome-languages.h"
......@@ -303,16 +304,14 @@ language_name_get_codeset_details (const char *language_name,
gboolean *is_utf8)
{
locale_t locale;
locale_t old_locale;
const char *codeset = NULL;
locale = newlocale (LC_CTYPE_MASK, language_name, (locale_t) 0);
if (locale == (locale_t) 0)
return;
old_locale = uselocale (locale);
codeset = nl_langinfo (CODESET);
codeset = nl_langinfo_l (CODESET, locale);
if (pcodeset != NULL) {
*pcodeset = g_strdup (codeset);
......@@ -324,7 +323,6 @@ language_name_get_codeset_details (const char *language_name,
*is_utf8 = strcmp (normalized_codeset, "UTF-8") == 0;
}
uselocale (old_locale);
freelocale (locale);
}
......@@ -704,28 +702,24 @@ get_translated_language (const char *code,
if (language != NULL) {
const char *translated_name;
locale_t loc = 0;
locale_t old_locale = 0;
if (locale != NULL) {
loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
if (loc == (locale_t) 0)
return NULL;
old_locale = uselocale (loc);
if (locale == NULL) {
locale = setlocale (LC_MESSAGES, NULL);
}
loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
if (loc == (locale_t) 0)
return NULL;
if (is_fallback_language (code)) {
name = g_strdup (_("Unspecified"));
} else {
g_autofree char *tmp = NULL;
translated_name = dgettext ("iso_639", language);
translated_name = dgettext_l (loc, "iso_639", language);
tmp = get_first_item_in_semicolon_list (translated_name);
name = capitalize_utf8_string (tmp);
}
if (locale != NULL) {
uselocale (old_locale);
freelocale (loc);
}
freelocale (loc);
}
return name;
......@@ -762,24 +756,20 @@ get_translated_territory (const char *code,
if (territory != NULL) {
const char *translated_territory;
locale_t loc;
locale_t old_locale = 0;
g_autofree char *tmp = NULL;
if (locale != NULL) {
loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
if (loc == (locale_t) 0)
return NULL;
old_locale = uselocale (loc);
if (locale == NULL) {
locale = setlocale (LC_MESSAGES, NULL);
}
loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
if (loc == (locale_t) 0)
return NULL;
translated_territory = dgettext ("iso_3166", territory);
translated_territory = dgettext_l (loc, "iso_3166", territory);
tmp = get_first_item_in_semicolon_list (translated_territory);
name = capitalize_utf8_string (tmp);
if (locale != NULL) {
uselocale (old_locale);
freelocale (loc);
}
freelocale (loc);
}
return name;
......@@ -1359,16 +1349,15 @@ gnome_get_translated_modifier (const char *modifier,
char *retval;
GHashTable *modifiers_map;
locale_t loc;
locale_t old_locale;
g_return_val_if_fail (modifier != NULL, NULL);
if (translation != NULL) {
loc = newlocale (LC_MESSAGES_MASK, translation, (locale_t) 0);
if (loc == (locale_t) 0) {
return NULL;
}
old_locale = uselocale (loc);
if (translation == NULL) {
translation = setlocale (LC_MESSAGES, NULL);
}
loc = newlocale (LC_MESSAGES_MASK, translation, (locale_t) 0);
if (loc == (locale_t) 0) {
return NULL;
}
/* Modifiers as listed in glibc's SUPPORTED file:
......@@ -1379,26 +1368,26 @@ gnome_get_translated_modifier (const char *modifier,
/* TRANSLATORS: Used to distinguish the labels representing the gez_ER
and gez_ET locales from gez_ER@abegede respective gez_ET@abegede. The
difference is related to collation. */
g_hash_table_insert (modifiers_map, "abegede", _("Abegede"));
g_hash_table_insert (modifiers_map, "abegede", _l(loc, "Abegede"));
/* TRANSLATORS: Used to distinguish Cyrillic from Latin written language variants. */
g_hash_table_insert (modifiers_map, "cyrillic", _("Cyrillic"));
g_hash_table_insert (modifiers_map, "cyrillic", _l(loc, "Cyrillic"));
/* TRANSLATORS: Also known as "Nagari", a written variant for many languages
of the Indian subcontinent. See:
https://en.wikipedia.org/wiki/Devanagari */
g_hash_table_insert (modifiers_map, "devanagari", _("Devanagari"));
g_hash_table_insert (modifiers_map, "devanagari", _l(loc, "Devanagari"));
/* TRANSLATORS: Used to distinguish the label representing the tt_RU
locale from tt_RU@iqtelif. It's a special alphabet for Tatar. */
g_hash_table_insert (modifiers_map, "iqtelif", _("IQTElif"));
g_hash_table_insert (modifiers_map, "iqtelif", _l(loc, "IQTElif"));
/* TRANSLATORS: The alphabet/script, not the language. Used to distinguish
Latin from Cyrillic written language variants. */
g_hash_table_insert (modifiers_map, "latin", _("Latin"));
g_hash_table_insert (modifiers_map, "latin", _l(loc, "Latin"));
/* TRANSLATORS: "Saho" is a variant of the Afar language. Used to
distinguish the label representing the aa_ER locale from aa_ER@saaho. */
g_hash_table_insert (modifiers_map, "saaho", _("Saho"));
g_hash_table_insert (modifiers_map, "saaho", _l(loc, "Saho"));
/* TRANSLATORS: "Valencia" is a dialect of the Catalan language spoken
in Valencia. Used to distinguish the label representing the ca_ES
locale from ca_ES@valencia. */
g_hash_table_insert (modifiers_map, "valencia", _("Valencia"));
g_hash_table_insert (modifiers_map, "valencia", _l(loc, "Valencia"));
if (g_hash_table_contains (modifiers_map, modifier))
retval = g_strdup (g_hash_table_lookup (modifiers_map, modifier));
......@@ -1407,10 +1396,7 @@ gnome_get_translated_modifier (const char *modifier,
g_hash_table_destroy (modifiers_map);
if (translation != NULL) {
uselocale (old_locale);
freelocale (loc);
}
freelocale (loc);
return retval;
}
......
......@@ -24,8 +24,8 @@
#include "config.h"
#include <locale.h>
#include <glib/gi18n-lib.h>
#include "gnome-gettext-portable.h"
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "gnome-wall-clock.h"
......@@ -289,18 +289,13 @@ translate_time_format_string (const char *str)
const char *locale = g_getenv ("LC_TIME");
const char *res;
char *sep;
locale_t old_loc;
locale_t loc = (locale_t)0;
if (locale)
loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t)0);
old_loc = uselocale (loc);
sep = strchr (str, '\004');
res = g_dpgettext (GETTEXT_PACKAGE, str, sep ? sep - str + 1 : 0);
uselocale (old_loc);
res = g_dpgettext_l (loc, GETTEXT_PACKAGE, str, sep ? sep - str + 1 : 0);
if (loc != (locale_t)0)
freelocale (loc);
......
......@@ -77,6 +77,7 @@ struct _GnomeXkbInfoPrivate
GHashTable *layouts_by_country;
GHashTable *layouts_by_language;
GHashTable *layouts_table;
GSettings *settings;
#ifndef HAVE_XKBREGISTRY
/* Only used while parsing */
......@@ -90,6 +91,8 @@ struct _GnomeXkbInfoPrivate
#endif
};
static guint layouts_changed_signal;
G_DEFINE_TYPE_WITH_CODE (GnomeXkbInfo, gnome_xkb_info, G_TYPE_OBJECT,
G_ADD_PRIVATE (GnomeXkbInfo));
......@@ -740,7 +743,6 @@ static void
parse_rules (GnomeXkbInfo *self)
{
GnomeXkbInfoPrivate *priv = self->priv;
GSettings *settings;
gboolean show_all_sources;
/* Make sure the translated strings we get from XKEYBOARD_CONFIG() are
......@@ -764,9 +766,7 @@ parse_rules (GnomeXkbInfo *self)
/* Maps layout ids to Layout structs. Owns the Layout structs. */
priv->layouts_table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, free_layout);
settings = g_settings_new ("org.gnome.desktop.input-sources");
show_all_sources = g_settings_get_boolean (settings, "show-all-sources");
g_object_unref (settings);
show_all_sources = g_settings_get_boolean (priv->settings, "show-all-sources");
if (!parse_rules_file (self, XKB_RULES_FILE, show_all_sources))
{
......@@ -789,10 +789,20 @@ ensure_rules_are_parsed (GnomeXkbInfo *self)
return !!priv->layouts_table;
}
static void
show_all_sources_changed (GnomeXkbInfo *self)
{
g_clear_pointer (&self->priv->layouts_table, g_hash_table_unref);
g_signal_emit (self, layouts_changed_signal, 0);
}
static void
gnome_xkb_info_init (GnomeXkbInfo *self)
{
self->priv = gnome_xkb_info_get_instance_private (self);
self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
g_signal_connect_swapped (self->priv->settings, "changed::show-all-sources",
G_CALLBACK (show_all_sources_changed), self);
}
static void
......@@ -808,6 +818,7 @@ gnome_xkb_info_finalize (GObject *self)
g_hash_table_destroy (priv->layouts_by_language);
if (priv->layouts_table)
g_hash_table_destroy (priv->layouts_table);
g_clear_object (&priv->settings);
G_OBJECT_CLASS (gnome_xkb_info_parent_class)->finalize (self);
}
......@@ -818,6 +829,15 @@ gnome_xkb_info_class_init (GnomeXkbInfoClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gnome_xkb_info_finalize;
layouts_changed_signal =
g_signal_new ("layouts-changed",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
NULL,
G_TYPE_NONE, 0);
}
/**
......
......@@ -48,7 +48,8 @@ libgnome_desktop_sources = [
'default-input-sources.h',
'meta-xrandr-shared.h',
'gnome-desktop-thumbnail-script.c',
'gnome-desktop-thumbnail-script.h'
'gnome-desktop-thumbnail-script.h',
'gnome-gettext-portable.c'
]
libgnome_desktop_headers = [
......
......@@ -26,12 +26,16 @@ main (int argc, char **argv)
&xkb_variant) == FALSE) {
g_warning ("Failed to get info for layout '%s'", id);
} else {
char *name = g_uri_escape_string (display_name,
" (),<>+;:",
TRUE);
g_print (" %s:\n", id);
g_print (" display name: \"%s\"\n",
g_uri_escape_string (display_name, " (),<>+;:", TRUE));
g_print (" display name: \"%s\"\n", name);
g_print (" short name: %s\n", short_name);
g_print (" xkb layout: %s\n", xkb_layout);
g_print (" xkb variant: %s\n", xkb_variant);
g_free (name);
}
}
g_list_free (layouts);
......@@ -49,10 +53,14 @@ main (int argc, char **argv)
const char *description = gnome_xkb_info_description_for_option (info,
group_id,
id);
char *desc = g_uri_escape_string (description,
" (),<>+;:",
TRUE);
g_print (" %s:\n", id);
g_print (" description: \"%s\"\n",
g_uri_escape_string (description, " (),<>+;:", TRUE));
g_print (" description: \"%s\"\n", desc);
g_free (desc);
}
g_list_free (options);
}
......
project('gnome-desktop', 'c',
meson_version: '>= 0.49.0',
version: '40.4',
version: '41.0',
license: ['GPL2+', 'LGPL2+']
)
......@@ -14,7 +14,7 @@ project('gnome-desktop', 'c',
# to 0. When bumping the second version, set the third one to zero.
#
# A lot easier than libtool, right?
libversion = '19.1.5'
libversion = '19.1.6'
soversion = libversion.split('.')[0]
gdk_pixbuf_req = '>= 2.36.5'
......@@ -94,6 +94,8 @@ conf.set('HAVE_XKBREGISTRY', xkbregistry_dep.found())
conf.set('HAVE_TIMERFD', cc.has_function('timerfd_create'))
conf.set('HAVE_OPENAT', cc.has_function('openat'))
conf.set('HAVE_USELOCALE', cc.has_function('uselocale'))
conf.set('HAVE_XLOCALE', cc.has_header('xlocale.h'))
config_h = declare_dependency(
sources: configure_file(
......
# Bulgarian translation of gnome-desktop po-file
# Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
# Copyright (C) 2021 Alexander Shopov <ash@kambanaria.org>.
# Pavel Cholakov <pavel@linux.zonebg.com>, 2001.
# Yanko Kaneti <yaneti@declera.com>, 2002.
# Peter "Peshka" Slavov <pslavov@i-space.org>, 2004.
# Vladimir "Kaladan" Petkov <kaladan@gmail.com>, 2004, 2007.
# Alexander Shopov <ash@kambanaria.org>, 2006, 2007, 2008, 2009, 2010, 2012, 2013.
# Alexander Shopov <ash@kambanaria.org>, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2021.
# Yavor Doganov <yavor@gnu.org>, 2008.
# Krasimir Chonov <mk2616@abv.bg>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-desktop master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-04 07:51+0300\n"
"PO-Revision-Date: 2014-10-04 07:50+0300\n"
"Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/issues\n"
"POT-Creation-Date: 2021-07-03 05:35+0000\n"
"PO-Revision-Date: 2021-07-22 08:49+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
......@@ -24,26 +25,26 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
#: ../libgnome-desktop/gnome-languages.c:717
#: libgnome-desktop/gnome-languages.c:714
msgid "Unspecified"
msgstr "Неопределено"
#: ../libgnome-desktop/gnome-rr-config.c:743
#: libgnome-desktop/gnome-rr-config.c:754
#, c-format
msgid "CRTC %d cannot drive output %s"
msgstr "Видеокарта %d не може да управлява изхода %s"
#: ../libgnome-desktop/gnome-rr-config.c:750
#: libgnome-desktop/gnome-rr-config.c:761
#, c-format
msgid "output %s does not support mode %dx%d@%dHz"
msgstr "екранът %s не поддържа режима %dx%d@%dHz"
#: ../libgnome-desktop/gnome-rr-config.c:761
#: libgnome-desktop/gnome-rr-config.c:772
#, c-format
msgid "CRTC %d does not support rotation=%d"
msgstr "Видеокарта %d не поддържа завъртане=%d"
#: ../libgnome-desktop/gnome-rr-config.c:774
#: libgnome-desktop/gnome-rr-config.c:785
#, c-format
msgid ""
"output %s does not have the same parameters as another cloned output:\n"
......@@ -57,23 +58,23 @@ msgstr ""
"текущи координати = (%d, %d), нови координати = (%d, %d)\n"
"текущо завъртане = %d, ново завъртане = %d"
#: ../libgnome-desktop/gnome-rr-config.c:789
#: libgnome-desktop/gnome-rr-config.c:800
#, c-format
msgid "cannot clone to output %s"
msgstr "повтаряне на изображението към изхода %s"
#: ../libgnome-desktop/gnome-rr-config.c:915
#: libgnome-desktop/gnome-rr-config.c:926
#, c-format
msgid "Trying modes for CRTC %d\n"
msgstr "Изпробване на режимите за видеокарта %d\n"
#: ../libgnome-desktop/gnome-rr-config.c:939
#: libgnome-desktop/gnome-rr-config.c:950
#, c-format
msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
msgstr ""
"Видеокарта %d: проба на режим %dx%d@%dHz с изход %dx%d@%dHz (%d-и пас)\n"
#: ../libgnome-desktop/gnome-rr-config.c:986
#: libgnome-desktop/gnome-rr-config.c:997
#, c-format
msgid ""
"could not assign CRTCs to outputs:\n"
......@@ -82,7 +83,7 @@ msgstr ""
"на следните изходи не може да се зададе видеокарта:\n"
"%s"
#: ../libgnome-desktop/gnome-rr-config.c:990
#: libgnome-desktop/gnome-rr-config.c:1001
#, c-format
msgid ""
"none of the selected modes were compatible with the possible modes:\n"
......@@ -94,7 +95,7 @@ msgstr ""
#. Translators: the "requested", "minimum", and
#. * "maximum" words here are not keywords; please
#. * translate them as usual.
#: ../libgnome-desktop/gnome-rr-config.c:1071
#: libgnome-desktop/gnome-rr-config.c:1082
#, c-format
msgid ""
"required virtual size does not fit available size: requested=(%d, %d), "
......@@ -103,62 +104,91 @@ msgstr ""
"изисканият виртуален размер не пасва на действащия: изискан=(%d, %d), "
"минимален=(%d, %d), максимален=(%d, %d)"
#. Translators: This is the time format with full date used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:299
msgid "%a %b %e, %R:%S"
msgstr "%a, %e %b, %R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:300
msgid "%a %b %e, %R"
msgstr "%a, %e %b, %R"
#: libgnome-desktop/gnome-wall-clock.c:258
msgctxt "time separator"
msgid "∶"
msgstr "∶"
#. Translators: This is the time format with full date
#. plus day used in 24-hour mode. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:335
msgid "%a %b %-e_%R:%S"
msgstr "%a, %-e %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:336
msgid "%a %b %-e_%R"
msgstr "%a, %-e %b_%R"
#. Translators: This is the time format with full date
#. used in 24-hour mode. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:341
msgid "%b %-e_%R:%S"
msgstr "%a, %-e %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:342
msgid "%b %-e_%R"
msgstr "%-e %b_%R"
#. Translators: This is the time format with day used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:304
#: libgnome-desktop/gnome-wall-clock.c:346
msgid "%a %R:%S"
msgstr "%a, %R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:305
#: libgnome-desktop/gnome-wall-clock.c:347
msgid "%a %R"
msgstr "%a, %R"
#. Translators: This is the time format without date used
#. in 24-hour mode.
#: ../libgnome-desktop/gnome-wall-clock.c:309
#: libgnome-desktop/gnome-wall-clock.c:351
msgid "%R:%S"
msgstr "%R:%S"
#: ../libgnome-desktop/gnome-wall-clock.c:309
#: libgnome-desktop/gnome-wall-clock.c:352
msgid "%R"
msgstr "%R"
#. Translators: This is a time format with full date used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:315
msgid "%a %b %e, %l:%M:%S %p"
msgstr "%a, %e %b, %l:%M:%S %p"
#. Translators: This is a time format with full date
#. plus day used for AM/PM. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:360
msgid "%a %b %-e_%l:%M:%S %p"
msgstr "%a, %-e %b_%l:%M:%S %p"
#: libgnome-desktop/gnome-wall-clock.c:361
msgid "%a %b %-e_%l:%M %p"
msgstr "%a, %-e %b_%l:%M %p"
#. Translators: This is a time format with full date
#. used for AM/PM. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:366
msgid "%b %-e_%l:%M:%S %p"
msgstr "%-e %b_%l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:316
msgid "%a %b %e, %l:%M %p"
msgstr "%a, %e %b, %l:%M %p"
#: libgnome-desktop/gnome-wall-clock.c:367
msgid "%b %-e_%l:%M %p"
msgstr "%-e %b_%l:%M %p"
#. Translators: This is a time format with day used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:320
#: libgnome-desktop/gnome-wall-clock.c:371
msgid "%a %l:%M:%S %p"
msgstr "%a %l:%M:%S %p"
msgstr "%a, %l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:321
#: libgnome-desktop/gnome-wall-clock.c:372
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
msgstr "%a, %l:%M %p"
#. Translators: This is a time format without date used
#. for AM/PM.
#: ../libgnome-desktop/gnome-wall-clock.c:325
#: libgnome-desktop/gnome-wall-clock.c:376
msgid "%l:%M:%S %p"
msgstr "%l:%M:%S %p"
#: ../libgnome-desktop/gnome-wall-clock.c:326
#: libgnome-desktop/gnome-wall-clock.c:377
msgid "%l:%M %p"
msgstr "%l:%M %p"
......@@ -5,65 +5,21 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-desktop 0\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/issues\n"
"POT-Creation-Date: 2020-05-31 13:21+0000\n"
"PO-Revision-Date: 2020-08-19 21:21+0200\n"
"Last-Translator: gogo <linux.hr@protonmail.com>\n"
"POT-Creation-Date: 2021-05-10 19:31+0000\n"
"PO-Revision-Date: 2021-09-11 14:29+0200\n"
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2016-09-22 19:56+0000\n"
"X-Generator: Poedit 2.4.1\n"
"X-Generator: Poedit 2.3\n"
#: libgnome-desktop/gnome-languages.c:717
#: libgnome-desktop/gnome-languages.c:714
msgid "Unspecified"
msgstr "Neodređen"
#. TRANSLATORS: Used to distinguish the labels representing the gez_ER
#. and gez_ET locales from gez_ER@abegede respective gez_ET@abegede. The
#. difference is related to collation.
#: libgnome-desktop/gnome-languages.c:1382
msgid "Abegede"
msgstr "Abegede"
#. TRANSLATORS: Used to distinguish Cyrillic from Latin written language variants.
#: libgnome-desktop/gnome-languages.c:1384
msgid "Cyrillic"
msgstr "Ćirilica"
#. TRANSLATORS: Also known as "Nagari", a written variant for many languages
#. of the Indian subcontinent. See:
#. https://en.wikipedia.org/wiki/Devanagari
#: libgnome-desktop/gnome-languages.c:1388
msgid "Devanagari"
msgstr "Devanagarski"
#. TRANSLATORS: Used to distinguish the label representing the tt_RU
#. locale from tt_RU@iqtelif. It's a special alphabet for Tatar.
#: libgnome-desktop/gnome-languages.c:1391
msgid "IQTElif"
msgstr "IQTElif"
#. TRANSLATORS: The alphabet/script, not the language. Used to distinguish
#. Latin from Cyrillic written language variants.
#: libgnome-desktop/gnome-languages.c:1394
msgid "Latin"
msgstr "Latinično"
#. TRANSLATORS: "Saho" is a variant of the Afar language. Used to
#. distinguish the label representing the aa_ER locale from aa_ER@saaho.
#: libgnome-desktop/gnome-languages.c:1397
msgid "Saho"
msgstr "Saho"
#. TRANSLATORS: "Valencia" is a dialect of the Catalan language spoken
#. in Valencia. Used to distinguish the label representing the ca_ES
#. locale from ca_ES@valencia.
#: libgnome-desktop/gnome-languages.c:1401
msgid "Valencia"
msgstr "Valencia"
#: libgnome-desktop/gnome-rr-config.c:754
#, c-format
msgid "CRTC %d cannot drive output %s"
......@@ -148,83 +104,104 @@ msgstr "∶"
#. Translators: This is the time format with full date
#. plus day used in 24-hour mode. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:340
#: libgnome-desktop/gnome-wall-clock.c:335
msgid "%a %b %-e_%R:%S"
msgstr "%a %-e. %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:341
#: libgnome-desktop/gnome-wall-clock.c:336
msgid "%a %b %-e_%R"
msgstr "%a %-e. %b_%R"
#. Translators: This is the time format with full date
#. used in 24-hour mode. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:346
#: libgnome-desktop/gnome-wall-clock.c:341
msgid "%b %-e_%R:%S"
msgstr "%-e. %b_%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:347
#: libgnome-desktop/gnome-wall-clock.c:342
msgid "%b %-e_%R"
msgstr "%-e. %b_%R"
#. Translators: This is the time format with day used
#. in 24-hour mode.
#: libgnome-desktop/gnome-wall-clock.c:351
#: libgnome-desktop/gnome-wall-clock.c:346
msgid "%a %R:%S"
msgstr "%a %R:%S"
#: libgnome-desktop/gnome-wall-clock.c:352
#: libgnome-desktop/gnome-wall-clock.c:347
msgid "%a %R"
msgstr "%a %R"
#. Translators: This is the time format without date used
#. in 24-hour mode.
#: libgnome-desktop/gnome-wall-clock.c:356
#: libgnome-desktop/gnome-wall-clock.c:351
msgid "%R:%S"
msgstr "%R:%S"
#: libgnome-desktop/gnome-wall-clock.c:357
#: libgnome-desktop/gnome-wall-clock.c:352
msgid "%R"
msgstr "%R"
#. Translators: This is a time format with full date
#. plus day used for AM/PM. Please keep the under-
#. score to separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:365
#: libgnome-desktop/gnome-wall-clock.c:360
msgid "%a %b %-e_%l:%M:%S %p"
msgstr "%a %-e. %b , %k:%M:%S"
msgstr "%a %-e. %b_%k:%M:%S"
#: libgnome-desktop/gnome-wall-clock.c:366
#: libgnome-desktop/gnome-wall-clock.c:361
msgid "%a %b %-e_%l:%M %p"
msgstr "%a %-e. %b , %k:%M"
msgstr "%a %-e. %b_%k:%M"
#. Translators: This is a time format with full date
#. used for AM/PM. Please keep the underscore to
#. separate the date from the time.
#: libgnome-desktop/gnome-wall-clock.c:371
#: libgnome-desktop/gnome-wall-clock.c:366
msgid "%b %-e_%l:%M:%S %p"
msgstr "%-e. %b_%k:%M:%S"
#: libgnome-desktop/gnome-wall-clock.c:372
#: libgnome-desktop/gnome-wall-clock.c:367
msgid "%b %-e_%l:%M %p"
msgstr "%-e. %b_%k:%M"
#. Translators: This is a time format with day used
#. for AM/PM.
#: libgnome-desktop/gnome-wall-clock.c:376
#: libgnome-desktop/gnome-wall-clock.c:371
msgid "%a %l:%M:%S %p"
msgstr "%a %l:%M:%S %p"
#: libgnome-desktop/gnome-wall-clock.c:377
#: libgnome-desktop/gnome-wall-clock.c:372
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
#. Translators: This is a time format without date used
#. for AM/PM.
#: libgnome-desktop/gnome-wall-clock.c:381
#: libgnome-desktop/gnome-wall-clock.c:376
msgid "%l:%M:%S %p"
msgstr "%l:%M:%S %p"
#: libgnome-desktop/gnome-wall-clock.c:382
#: libgnome-desktop/gnome-wall-clock.c:377
msgid "%l:%M %p"
msgstr "%l:%M %p"
#~ msgid "Abegede"
#~ msgstr "Abegede"
#~ msgid "Cyrillic"
#~ msgstr "Ćirilica"
#~ msgid "Devanagari"
#~ msgstr "Devanagarski"
#~ msgid "IQTElif"
#~ msgstr "IQTElif"
#~ msgid "Latin"
#~ msgstr "Latinično"
#~ msgid "Saho"
#~ msgstr "Saho"
#~ msgid "Valencia"
#~ msgstr "Valencia"