d/patches: Update to upstream gtk-3-24 branch commit 3.24.34-204-g2fcc114870
Windows- and macOS-specific changes excluded.
This commit is contained in:
Simon McVittie
8325
debian/patches/Add-Abkhazian-translation.patch
vendored
Normal file
8325
debian/patches/Add-Abkhazian-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
27
debian/patches/Adwaita-Hide-SSD-box-shadow-border-on-maximized-windows.patch
vendored
Normal file
27
debian/patches/Adwaita-Hide-SSD-box-shadow-border-on-maximized-windows.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
From: Sebastian Keller <skeller@gnome.org>
|
||||
Date: Sun, 19 Jun 2022 16:24:59 +0200
|
||||
Subject: Adwaita: Hide SSD box-shadow border on maximized windows
|
||||
|
||||
The 1px shadow was showing up on adjacent monitors when a SSD window was
|
||||
maximized. Additionally this was causing mutter to skip direct scanout
|
||||
of these windows, because they extend beyond the screen.
|
||||
|
||||
Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/2304
|
||||
Origin: upstream, 3.24.35, commit:4873f63c07e62bd727746aa2d52cf1c13af6c9fd
|
||||
---
|
||||
gtk/theme/Adwaita/_common.scss | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
|
||||
index 198690e..dc02b49 100644
|
||||
--- a/gtk/theme/Adwaita/_common.scss
|
||||
+++ b/gtk/theme/Adwaita/_common.scss
|
||||
@@ -4601,6 +4601,8 @@ decoration {
|
||||
// just doing borders, wm draws actual shadows
|
||||
.ssd & { box-shadow: 0 0 0 1px $_wm_border; }
|
||||
.ssd &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; }
|
||||
+ .ssd.maximized &,
|
||||
+ .ssd.maximized &:backdrop { box-shadow: none; }
|
||||
|
||||
.csd.popup & {
|
||||
border-radius: $menu_radius;
|
||||
@ -11,6 +11,7 @@ to avoid the need for a subprocess.
|
||||
Co-authored-by: Matthias Clasen <mclasen@redhat.com>
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5119
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4968
|
||||
Applied-upstream: 3.24.35, commit:a4f45483b1203af66eb5b2de52118ecb754c0948
|
||||
---
|
||||
testsuite/gtk/icontheme.c | 30 ++++++++++++------------------
|
||||
testsuite/gtk/treestore.c | 30 +++++++++++++-----------------
|
||||
|
||||
66
debian/patches/Differentiate-keypad-keysyms-in-accelerators.patch
vendored
Normal file
66
debian/patches/Differentiate-keypad-keysyms-in-accelerators.patch
vendored
Normal file
@ -0,0 +1,66 @@
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Thu, 27 Oct 2022 11:49:03 -0400
|
||||
Subject: Differentiate keypad keysyms in accelerators
|
||||
|
||||
When displaying accelerators, differentiate keypad
|
||||
symbols with a 'KP' prefix. Fixing a 17 year old bug.
|
||||
|
||||
Backport of c58d9446f40b36136f25baf.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:6cc0552ab8efe0b11f3db21224520dc97db17d9f
|
||||
---
|
||||
gtk/gtkaccellabel.c | 11 +++++++++++
|
||||
testsuite/gtk/accel.c | 6 ++++--
|
||||
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
|
||||
index 0e2c50b..75b27a8 100644
|
||||
--- a/gtk/gtkaccellabel.c
|
||||
+++ b/gtk/gtkaccellabel.c
|
||||
@@ -883,6 +883,17 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
|
||||
if (seen_mod)
|
||||
g_string_append (gstring, klass->mod_separator);
|
||||
|
||||
+ if (accelerator_key >= GDK_KEY_KP_Space &&
|
||||
+ accelerator_key <= GDK_KEY_KP_Equal)
|
||||
+ {
|
||||
+ /* Translators: "KP" means "numeric key pad". This string will
|
||||
+ * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+ * and therefore the translation needs to be very short.
|
||||
+ */
|
||||
+ g_string_append (gstring, C_("keyboard label", "KP"));
|
||||
+ g_string_append (gstring, " ");
|
||||
+ }
|
||||
+
|
||||
switch (ch)
|
||||
{
|
||||
case ' ':
|
||||
diff --git a/testsuite/gtk/accel.c b/testsuite/gtk/accel.c
|
||||
index da031da..d6ea0bc 100644
|
||||
--- a/testsuite/gtk/accel.c
|
||||
+++ b/testsuite/gtk/accel.c
|
||||
@@ -55,6 +55,8 @@ test_one_accel (const char *accel,
|
||||
*keycodes,
|
||||
mods);
|
||||
|
||||
+ g_print ("accel %s, label %s\n", accel, label);
|
||||
+
|
||||
g_assert_cmpstr (label, ==, exp_label);
|
||||
|
||||
name = gtk_accelerator_name_with_keycode (NULL,
|
||||
@@ -83,13 +85,13 @@ accel2 (void)
|
||||
static void
|
||||
accel3 (void)
|
||||
{
|
||||
- test_one_accel ("KP_7", "7", TRUE);
|
||||
+ test_one_accel ("KP_7", "KP 7", TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
accel4 (void)
|
||||
{
|
||||
- test_one_accel ("<Primary>KP_7", "Ctrl+7", TRUE);
|
||||
+ test_one_accel ("<Primary>KP_7", "Ctrl+KP 7", TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
65
debian/patches/Fix-a-critical-in-GtkFontChooserWidget.patch
vendored
Normal file
65
debian/patches/Fix-a-critical-in-GtkFontChooserWidget.patch
vendored
Normal file
@ -0,0 +1,65 @@
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Tue, 13 Sep 2022 08:54:09 -0400
|
||||
Subject: Fix a critical in GtkFontChooserWidget
|
||||
|
||||
When the level doesn't include the style, we need
|
||||
to work a bit harder to really get a face object
|
||||
here.
|
||||
|
||||
Bug: #5173
|
||||
Origin: upstream, 3.24.35, commit:ea9aa8ed8259a1e0693c671b01661e423d2bea47
|
||||
---
|
||||
gtk/gtkfontchooserwidget.c | 36 +++++++++++++++++++-----------------
|
||||
1 file changed, 19 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
|
||||
index bcccacb..50f3b2f 100644
|
||||
--- a/gtk/gtkfontchooserwidget.c
|
||||
+++ b/gtk/gtkfontchooserwidget.c
|
||||
@@ -963,27 +963,29 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
|
||||
if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
|
||||
{
|
||||
GtkDelayedFontDescription *desc;
|
||||
- PangoFontFace *face;
|
||||
+ PangoFontFace *face = NULL;
|
||||
|
||||
#if PANGO_VERSION_CHECK(1,46,0)
|
||||
face = pango_font_family_get_face (families[i], NULL);
|
||||
-#else
|
||||
- {
|
||||
- PangoFontFace **faces;
|
||||
- int j, n_faces;
|
||||
- pango_font_family_list_faces (families[i], &faces, &n_faces);
|
||||
- face = faces[0];
|
||||
- for (j = 0; j < n_faces; j++)
|
||||
- {
|
||||
- if (strcmp (pango_font_face_get_face_name (faces[j]), "Regular") == 0)
|
||||
- {
|
||||
- face = faces[j];
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- g_free (faces);
|
||||
- }
|
||||
#endif
|
||||
+ if (!face)
|
||||
+ {
|
||||
+ PangoFontFace **faces;
|
||||
+ int j, n_faces;
|
||||
+ pango_font_family_list_faces (families[i], &faces, &n_faces);
|
||||
+ face = faces[0];
|
||||
+ for (j = 0; j < n_faces; j++)
|
||||
+ {
|
||||
+ if (strcmp (pango_font_face_get_face_name (faces[j]), "Regular") == 0)
|
||||
+ {
|
||||
+ face = faces[j];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ g_free (faces);
|
||||
+ }
|
||||
+
|
||||
desc = gtk_delayed_font_description_new (face);
|
||||
|
||||
gtk_list_store_insert_with_values (list_store, &iter, -1,
|
||||
40
debian/patches/Fix-annotation-of-serialize-and-deserialize-function.patch
vendored
Normal file
40
debian/patches/Fix-annotation-of-serialize-and-deserialize-function.patch
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
From: =?utf-8?q?C=C3=A9dric_Krier?= <cedric.krier@b2ck.com>
|
||||
Date: Tue, 19 Jul 2022 21:50:27 +0000
|
||||
Subject: Fix annotation of serialize and deserialize function
|
||||
|
||||
Origin: upstream, 3.24.35, commit:3d406fc446f17bb22686e13b4449987cfd1c9d12
|
||||
---
|
||||
gtk/gtktextbufferrichtext.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
|
||||
index ecc1100..bb56b2e 100644
|
||||
--- a/gtk/gtktextbufferrichtext.h
|
||||
+++ b/gtk/gtktextbufferrichtext.h
|
||||
@@ -34,14 +34,14 @@ G_BEGIN_DECLS
|
||||
* @content_buffer: the #GtkTextBuffer to serialize
|
||||
* @start: start of the block of text to serialize
|
||||
* @end: end of the block of text to serialize
|
||||
- * @length: Return location for the length of the serialized data
|
||||
+ * @length: (out): return location for the length of the serialized data
|
||||
* @user_data: user data that was specified when registering the format
|
||||
*
|
||||
* A function that is called to serialize the content of a text buffer.
|
||||
* It must return the serialized form of the content.
|
||||
*
|
||||
- * Returns: (nullable): a newly-allocated array of guint8 which contains
|
||||
- * the serialized data, or %NULL if an error occurred
|
||||
+ * Returns: (array length=length) (nullable): a newly-allocated array of guint8
|
||||
+ * which contains the serialized data, or %NULL if an error occurred
|
||||
*/
|
||||
typedef guint8 * (* GtkTextBufferSerializeFunc) (GtkTextBuffer *register_buffer,
|
||||
GtkTextBuffer *content_buffer,
|
||||
@@ -59,7 +59,7 @@ typedef guint8 * (* GtkTextBufferSerializeFunc) (GtkTextBuffer *register_b
|
||||
* @length: length of @data
|
||||
* @create_tags: %TRUE if deserializing may create tags
|
||||
* @user_data: user data that was specified when registering the format
|
||||
- * @error: return location for a #GError
|
||||
+ * @error: (allow-none): return location for a #GError
|
||||
*
|
||||
* A function that is called to deserialize rich text that has been
|
||||
* serialized with gtk_text_buffer_serialize(), and insert it at @iter.
|
||||
40
debian/patches/Fix-coordinate-space-of-rect-in-gdk_x11_window_get_frame_.patch
vendored
Normal file
40
debian/patches/Fix-coordinate-space-of-rect-in-gdk_x11_window_get_frame_.patch
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
From: =?utf-8?q?Emilio_Cobos_=C3=81lvarez?= <emilio@crisal.io>
|
||||
Date: Mon, 20 Jun 2022 10:43:06 +0200
|
||||
Subject: Fix coordinate space of rect in gdk_x11_window_get_frame_extents
|
||||
when called on popups.
|
||||
|
||||
This is the same fix as !4820, but applied to the gtk 3 branch.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:c43e3c43396abcdbd6b0f6e2565f8563b52c5027
|
||||
---
|
||||
gdk/x11/gdkwindow-x11.c | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
|
||||
index 721d9bb..eb822e0 100644
|
||||
--- a/gdk/x11/gdkwindow-x11.c
|
||||
+++ b/gdk/x11/gdkwindow-x11.c
|
||||
@@ -3240,14 +3240,19 @@ gdk_x11_window_get_frame_extents (GdkWindow *window,
|
||||
impl = GDK_WINDOW_IMPL_X11 (window->impl);
|
||||
|
||||
/* Refine our fallback answer a bit using local information */
|
||||
- rect->x = window->x * impl->window_scale;
|
||||
- rect->y = window->y * impl->window_scale;
|
||||
- rect->width = window->width * impl->window_scale;
|
||||
- rect->height = window->height * impl->window_scale;
|
||||
+ rect->x = window->x;
|
||||
+ rect->y = window->y;
|
||||
+ rect->width = window->width;
|
||||
+ rect->height = window->height;
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window) || impl->override_redirect)
|
||||
return;
|
||||
|
||||
+ rect->x *= impl->window_scale;
|
||||
+ rect->y *= impl->window_scale;
|
||||
+ rect->width *= impl->window_scale;
|
||||
+ rect->height *= impl->window_scale;
|
||||
+
|
||||
nvroots = 0;
|
||||
vroots = NULL;
|
||||
|
||||
24
debian/patches/Fix-hotspot-positioning-with-scaled-surface.patch
vendored
Normal file
24
debian/patches/Fix-hotspot-positioning-with-scaled-surface.patch
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
From: =?utf-8?q?Emilio_Cobos_=C3=81lvarez?= <emilio@crisal.io>
|
||||
Date: Fri, 21 Oct 2022 14:22:51 +0200
|
||||
Subject: Fix hotspot positioning with scaled surface.
|
||||
|
||||
Fixes !5278 to behave the same way as X11.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:686864a118e857a2a532cce8b33e78ca76857b98
|
||||
---
|
||||
gdk/wayland/gdkcursor-wayland.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
|
||||
index f5aa468..c3e9728 100644
|
||||
--- a/gdk/wayland/gdkcursor-wayland.c
|
||||
+++ b/gdk/wayland/gdkcursor-wayland.c
|
||||
@@ -476,6 +476,8 @@ _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
|
||||
cursor->surface.scale = (int)sx;
|
||||
cursor->surface.width = cairo_image_surface_get_width (surface);
|
||||
cursor->surface.height = cairo_image_surface_get_height (surface);
|
||||
+ cursor->surface.hotspot_x *= sx;
|
||||
+ cursor->surface.hotspot_y *= sx;
|
||||
}
|
||||
else
|
||||
{
|
||||
36
debian/patches/Fixes-to-Catalan-translation.patch
vendored
Normal file
36
debian/patches/Fixes-to-Catalan-translation.patch
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
From: Jordi Mas <jmas@softcatala.org>
|
||||
Date: Fri, 26 Aug 2022 20:49:42 +0200
|
||||
Subject: Fixes to Catalan translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:a02858a5e8546db71394d7ecad60404c7d62109c
|
||||
---
|
||||
po-properties/ca.po | 2 +-
|
||||
po/ca.po | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/po-properties/ca.po b/po-properties/ca.po
|
||||
index 7d677d4..2e58b73 100644
|
||||
--- a/po-properties/ca.po
|
||||
+++ b/po-properties/ca.po
|
||||
@@ -9302,7 +9302,7 @@ msgstr "Memòria intermèdia doble"
|
||||
|
||||
#: gtk/gtkwidget.c:1364
|
||||
msgid "Whether the widget is double buffered"
|
||||
-msgstr "Si el giny utilitza una doble memòria intermèdia"
|
||||
+msgstr "Si el giny utilitza una memòria intermèdia doble"
|
||||
|
||||
#: gtk/gtkwidget.c:1378
|
||||
msgid "How to position in extra horizontal space"
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index d64472e..20736d8 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -7386,7 +7386,7 @@ msgstr "Connecta al _servidor"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:340
|
||||
msgid "Enter server address…"
|
||||
-msgstr "Introduïu l'adreça del servidor..."
|
||||
+msgstr "Introduïu l'adreça del servidor…"
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:112
|
||||
msgid "Printer"
|
||||
60
debian/patches/Further-simplification.patch
vendored
Normal file
60
debian/patches/Further-simplification.patch
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
From: Sergio Costas <rastersoft@gmail.com>
|
||||
Date: Tue, 16 Aug 2022 23:14:44 +0200
|
||||
Subject: Further simplification
|
||||
|
||||
Origin: upstream, 3.24.35, commit:4892c8901b16b533d4c583eabc805e1f2a84f33d
|
||||
---
|
||||
gtk/gtkpopover.c | 19 ++++---------------
|
||||
1 file changed, 4 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
|
||||
index 4182c5f..45680d0 100644
|
||||
--- a/gtk/gtkpopover.c
|
||||
+++ b/gtk/gtkpopover.c
|
||||
@@ -456,7 +456,7 @@ window_focus_in (GtkWidget *widget,
|
||||
if (focus == NULL || !gtk_widget_is_ancestor (focus, GTK_WIDGET (popover)))
|
||||
gtk_widget_grab_focus (GTK_WIDGET (popover));
|
||||
|
||||
- if (priv->grab_notify_blocked)
|
||||
+ if (priv->grab_notify_blocked && priv->widget)
|
||||
g_signal_handler_unblock (priv->widget, priv->grab_notify_id);
|
||||
|
||||
priv->grab_notify_blocked = FALSE;
|
||||
@@ -2097,7 +2097,6 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
{
|
||||
GtkPopoverPrivate *priv = popover->priv;
|
||||
GtkStateFlags old_state = 0;
|
||||
- gboolean had_grab_notify_blocked = FALSE;
|
||||
|
||||
if (priv->widget == relative_to)
|
||||
return;
|
||||
@@ -2124,14 +2123,7 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
if (g_signal_handler_is_connected (priv->widget, priv->state_changed_id))
|
||||
g_signal_handler_disconnect (priv->widget, priv->state_changed_id);
|
||||
if (g_signal_handler_is_connected (priv->widget, priv->grab_notify_id))
|
||||
- {
|
||||
- if (priv->grab_notify_blocked)
|
||||
- {
|
||||
- priv->grab_notify_blocked = FALSE;
|
||||
- had_grab_notify_blocked = TRUE;
|
||||
- }
|
||||
- g_signal_handler_disconnect (priv->widget, priv->grab_notify_id);
|
||||
- }
|
||||
+ g_signal_handler_disconnect (priv->widget, priv->grab_notify_id);
|
||||
|
||||
widget_unmanage_popover (priv->widget, popover);
|
||||
}
|
||||
@@ -2167,11 +2159,8 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
g_signal_connect (priv->widget, "grab-notify",
|
||||
G_CALLBACK (_gtk_popover_parent_grab_notify),
|
||||
popover);
|
||||
- if (had_grab_notify_blocked)
|
||||
- {
|
||||
- g_signal_handler_block (priv->widget, priv->grab_notify_id);
|
||||
- priv->grab_notify_blocked = TRUE;
|
||||
- }
|
||||
+ if (priv->grab_notify_blocked)
|
||||
+ g_signal_handler_block (priv->widget, priv->grab_notify_id);
|
||||
|
||||
/* Give ownership of the popover to widget */
|
||||
widget_manage_popover (priv->widget, popover);
|
||||
52
debian/patches/GtkTooltip-Scale-the-cursor-size-on-X11.patch
vendored
Normal file
52
debian/patches/GtkTooltip-Scale-the-cursor-size-on-X11.patch
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
From: Luca Bacci <luca.bacci982@gmail.com>
|
||||
Date: Wed, 26 Oct 2022 15:16:41 +0200
|
||||
Subject: GtkTooltip: Scale the cursor size on X11
|
||||
|
||||
GtkSettings/X11 takes the values as provided by
|
||||
XSettings. Unlike other backends, the values of
|
||||
XSettings are in physical size (that's because
|
||||
X11 doesn't support mixed-DPI setups anyway).
|
||||
|
||||
Take that in account when retrieving the cursor
|
||||
size in gtk_tooltip_position ().
|
||||
|
||||
Note that this discrepancy between the X11 and
|
||||
other backends has been fixed in GTK4.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5223
|
||||
Origin: upstream, 3.24.35, commit:bbce00f3a38caa2c1399e3e80fba1ee3861dbc8e
|
||||
---
|
||||
gtk/gtktooltip.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
|
||||
index 9917d93..ca149fc 100644
|
||||
--- a/gtk/gtktooltip.c
|
||||
+++ b/gtk/gtktooltip.c
|
||||
@@ -42,6 +42,9 @@
|
||||
#ifdef GDK_WINDOWING_WAYLAND
|
||||
#include "wayland/gdkwayland.h"
|
||||
#endif
|
||||
+#ifdef GDK_WINDOWING_X11
|
||||
+#include "x11/gdkx.h"
|
||||
+#endif
|
||||
|
||||
|
||||
/**
|
||||
@@ -898,6 +901,16 @@ gtk_tooltip_position (GtkTooltip *tooltip,
|
||||
if (cursor_size == 0)
|
||||
cursor_size = gdk_display_get_default_cursor_size (display);
|
||||
|
||||
+#ifdef GDK_WINDOWING_X11
|
||||
+ if (GDK_IS_X11_SCREEN (screen))
|
||||
+ {
|
||||
+ /* Cursor size on X11 comes directly from XSettings which
|
||||
+ * report physical sizes, unlike on other backends. So in
|
||||
+ * that case we have to scale the retrieved cursor_size */
|
||||
+ cursor_size /= gtk_widget_get_scale_factor (new_tooltip_widget);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (device)
|
||||
anchor_rect_padding = MAX (4, cursor_size - 32);
|
||||
else
|
||||
29
debian/patches/Recognize-stylus-devices-as-GDK_SOURCE_PEN.patch
vendored
Normal file
29
debian/patches/Recognize-stylus-devices-as-GDK_SOURCE_PEN.patch
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
From: Nate Eldredge <nate@thatsmathematics.com>
|
||||
Date: Sat, 17 Sep 2022 15:06:27 +0200
|
||||
Subject: Recognize "stylus" devices as GDK_SOURCE_PEN
|
||||
|
||||
Add "stylus" to the list of substrings in a device name that cause it to be recognized
|
||||
as a GDK_SOURCE_PEN device (previously "wacom", "pen" and "eraser"). Some devices
|
||||
just use "stylus" in their name, and are otherwise recognized as
|
||||
GDK_SOURCE_TOUCHSCREEN instead.
|
||||
|
||||
Bug: #4394
|
||||
Origin: upstream, 3.24.35, commit:8984b13d84249c17d37750d14c9e9832cf0b3b8c
|
||||
---
|
||||
gdk/x11/gdkdevicemanager-xi2.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
index 193dd47..a65116a3 100644
|
||||
--- a/gdk/x11/gdkdevicemanager-xi2.c
|
||||
+++ b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
@@ -453,7 +453,8 @@ create_device (GdkDeviceManager *device_manager,
|
||||
else if (strstr (tmp_name, " pad"))
|
||||
input_source = GDK_SOURCE_TABLET_PAD;
|
||||
else if (strstr (tmp_name, "wacom") ||
|
||||
- strstr (tmp_name, "pen"))
|
||||
+ strstr (tmp_name, "pen") ||
|
||||
+ strstr (tmp_name, "stylus"))
|
||||
input_source = GDK_SOURCE_PEN;
|
||||
else if (!strstr (tmp_name, "mouse") &&
|
||||
!strstr (tmp_name, "pointer") &&
|
||||
22
debian/patches/Remove-annotation-for-GError.patch
vendored
Normal file
22
debian/patches/Remove-annotation-for-GError.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
From: =?utf-8?q?C=C3=A9dric_Krier?= <ced@b2ck.com>
|
||||
Date: Wed, 20 Jul 2022 09:52:40 +0200
|
||||
Subject: Remove annotation for GError
|
||||
|
||||
Origin: upstream, 3.24.35, commit:31490df2b142938eef4df8bb783a8cbec2861779
|
||||
---
|
||||
gtk/gtktextbufferrichtext.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
|
||||
index bb56b2e..aecdbde 100644
|
||||
--- a/gtk/gtktextbufferrichtext.h
|
||||
+++ b/gtk/gtktextbufferrichtext.h
|
||||
@@ -59,7 +59,7 @@ typedef guint8 * (* GtkTextBufferSerializeFunc) (GtkTextBuffer *register_b
|
||||
* @length: length of @data
|
||||
* @create_tags: %TRUE if deserializing may create tags
|
||||
* @user_data: user data that was specified when registering the format
|
||||
- * @error: (allow-none): return location for a #GError
|
||||
+ * @error: return location for a #GError
|
||||
*
|
||||
* A function that is called to deserialize rich text that has been
|
||||
* serialized with gtk_text_buffer_serialize(), and insert it at @iter.
|
||||
25
debian/patches/Remove-unneeded-unblock.patch
vendored
Normal file
25
debian/patches/Remove-unneeded-unblock.patch
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
From: Sergio Costas <rastersoft@gmail.com>
|
||||
Date: Mon, 15 Aug 2022 15:35:06 +0200
|
||||
Subject: Remove unneeded unblock
|
||||
|
||||
When a signal handler is disconnected, it doesn't matter if it
|
||||
was blocked or not, so there's no need to unlock it before
|
||||
disconnection.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:02ea88bba2169e4a6d3bcc2dda25133a0ec5f45b
|
||||
---
|
||||
gtk/gtkpopover.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
|
||||
index 312d933..4182c5f 100644
|
||||
--- a/gtk/gtkpopover.c
|
||||
+++ b/gtk/gtkpopover.c
|
||||
@@ -2127,7 +2127,6 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
{
|
||||
if (priv->grab_notify_blocked)
|
||||
{
|
||||
- g_signal_handler_unblock (priv->widget, priv->grab_notify_id);
|
||||
priv->grab_notify_blocked = FALSE;
|
||||
had_grab_notify_blocked = TRUE;
|
||||
}
|
||||
74
debian/patches/Unblock-signal-on-update_relative_to-in-Gtk.Popover.patch
vendored
Normal file
74
debian/patches/Unblock-signal-on-update_relative_to-in-Gtk.Popover.patch
vendored
Normal file
@ -0,0 +1,74 @@
|
||||
From: Sergio Costas <rastersoft@gmail.com>
|
||||
Date: Mon, 21 Mar 2022 16:46:51 +0100
|
||||
Subject: Unblock signal on update_relative_to in Gtk.Popover
|
||||
|
||||
When a Gtk.Popover loses the focus, it blocks the grab_notify
|
||||
signal from the associated widget, and it unblocks it when it
|
||||
regains the focus. To know whether the signal is or not blocked,
|
||||
it uses the priv->grab_notify_blocked flag.
|
||||
|
||||
On the other hand, when the method update_relative_to() is
|
||||
called, all the signals connected to the old associated widget
|
||||
are disconnected, and connected to the new widget.
|
||||
|
||||
Unfortunately, the priv->grab_notify_blocked flag isn't updated,
|
||||
which means that if update_relative_to() is called while the
|
||||
Gtk.Popover doesn't have the focus (for example, because the
|
||||
user switched into another application), when the focus is
|
||||
regained, the code in window_focus_in() will see that
|
||||
priv->grab_notify_blocked is TRUE and will unblock the handler;
|
||||
but that handler wasn't blocked because the one that was blocked
|
||||
was disconnected when update_relative_to() was called. This
|
||||
shows a WARNING in the console:
|
||||
|
||||
GLib-GObject-WARNING **: ../../../gobject/gsignal.c:2692: handler '5146' of instance '0x556912f84f40' is not blocked
|
||||
|
||||
This patch fixes this.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4777
|
||||
Origin: upstream, 3.24.35, commit:c9a3b4273470308197a4a96c622d86dc42851597
|
||||
---
|
||||
gtk/gtkpopover.c | 16 +++++++++++++++-
|
||||
1 file changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
|
||||
index 19ba0fa..312d933 100644
|
||||
--- a/gtk/gtkpopover.c
|
||||
+++ b/gtk/gtkpopover.c
|
||||
@@ -2097,6 +2097,7 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
{
|
||||
GtkPopoverPrivate *priv = popover->priv;
|
||||
GtkStateFlags old_state = 0;
|
||||
+ gboolean had_grab_notify_blocked = FALSE;
|
||||
|
||||
if (priv->widget == relative_to)
|
||||
return;
|
||||
@@ -2123,7 +2124,15 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
if (g_signal_handler_is_connected (priv->widget, priv->state_changed_id))
|
||||
g_signal_handler_disconnect (priv->widget, priv->state_changed_id);
|
||||
if (g_signal_handler_is_connected (priv->widget, priv->grab_notify_id))
|
||||
- g_signal_handler_disconnect (priv->widget, priv->grab_notify_id);
|
||||
+ {
|
||||
+ if (priv->grab_notify_blocked)
|
||||
+ {
|
||||
+ g_signal_handler_unblock (priv->widget, priv->grab_notify_id);
|
||||
+ priv->grab_notify_blocked = FALSE;
|
||||
+ had_grab_notify_blocked = TRUE;
|
||||
+ }
|
||||
+ g_signal_handler_disconnect (priv->widget, priv->grab_notify_id);
|
||||
+ }
|
||||
|
||||
widget_unmanage_popover (priv->widget, popover);
|
||||
}
|
||||
@@ -2159,6 +2168,11 @@ gtk_popover_update_relative_to (GtkPopover *popover,
|
||||
g_signal_connect (priv->widget, "grab-notify",
|
||||
G_CALLBACK (_gtk_popover_parent_grab_notify),
|
||||
popover);
|
||||
+ if (had_grab_notify_blocked)
|
||||
+ {
|
||||
+ g_signal_handler_block (priv->widget, priv->grab_notify_id);
|
||||
+ priv->grab_notify_blocked = TRUE;
|
||||
+ }
|
||||
|
||||
/* Give ownership of the popover to widget */
|
||||
widget_manage_popover (priv->widget, popover);
|
||||
363
debian/patches/Update-Abkhazian-translation-1.patch
vendored
Normal file
363
debian/patches/Update-Abkhazian-translation-1.patch
vendored
Normal file
@ -0,0 +1,363 @@
|
||||
From: Nart Tlisha <daniel.abzakh@gmail.com>
|
||||
Date: Thu, 25 Aug 2022 10:27:20 +0000
|
||||
Subject: Update Abkhazian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:12325f2e0a7ee87d55e61d0efed1dd064ff6d0ac
|
||||
---
|
||||
po/ab.po | 88 ++++++++++++++++++++++++++++++++--------------------------------
|
||||
1 file changed, 44 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/po/ab.po b/po/ab.po
|
||||
index c7725f0..3fbed8f 100644
|
||||
--- a/po/ab.po
|
||||
+++ b/po/ab.po
|
||||
@@ -3,7 +3,7 @@ msgstr ""
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-07-13 15:48+0000\n"
|
||||
"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
|
||||
-"Language-Team: Abkhazian <ab@li.org>\n"
|
||||
+"Language-Team: Abkhazian <daniel.abzakh@gmail.com>\n"
|
||||
"Language: ab\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -1411,19 +1411,19 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:116
|
||||
msgid "GNU General Public License, version 2 or later"
|
||||
-msgstr ""
|
||||
+msgstr "GNU General Public License, аверсиа 2 мамзар еиҳа ихьшәоу"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:117
|
||||
msgid "GNU General Public License, version 3 or later"
|
||||
-msgstr ""
|
||||
+msgstr "GNU General Public License, аверсиа 3 мамзар еиҳа ихьшәоу"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:118
|
||||
msgid "GNU Lesser General Public License, version 2.1 or later"
|
||||
-msgstr ""
|
||||
+msgstr "GNU Lesser General Public License, аверсиа 2.1 мамзар еиҳа ихьшәоу"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:119
|
||||
msgid "GNU Lesser General Public License, version 3 or later"
|
||||
-msgstr ""
|
||||
+msgstr "GNU Lesser General Public License, аверсиа 3 мамзар еиҳа ихьшәоу"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:120
|
||||
msgid "BSD 2-Clause License"
|
||||
@@ -1455,7 +1455,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:127
|
||||
msgid "GNU Affero General Public License, version 3 or later"
|
||||
-msgstr ""
|
||||
+msgstr "GNU Affero General Public License, аверсиа 3 мамзар еиҳа ихьшәоу"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:128
|
||||
msgid "GNU Affero General Public License, version 3 only"
|
||||
@@ -1467,7 +1467,7 @@ msgstr "BSD 3-Clause License"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:130
|
||||
msgid "Apache License, Version 2.0"
|
||||
-msgstr ""
|
||||
+msgstr "Apache License, Аверсиа 2.1"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:131
|
||||
msgid "Mozilla Public License 2.0"
|
||||
@@ -1492,7 +1492,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:1043
|
||||
msgid "Website"
|
||||
-msgstr ""
|
||||
+msgstr "Веб-асаит"
|
||||
|
||||
#. used for the application menu on MacOS. %s is replaced with the application name.
|
||||
#: gtk/gtkaboutdialog.c:1093 gtk/ui/gtkapplication-quartz.ui:7
|
||||
@@ -1759,7 +1759,7 @@ msgstr "calendar:MY"
|
||||
#.
|
||||
#: gtk/gtkcalendar.c:853
|
||||
msgid "calendar:week_start:0"
|
||||
-msgstr ""
|
||||
+msgstr "calendar:week_start:1"
|
||||
|
||||
#. Translators: This is a text measurement template.
|
||||
#. * Translate it to the widest year text
|
||||
@@ -2166,7 +2166,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkcustompaperunixdialog.c:1131
|
||||
msgid "_Height:"
|
||||
-msgstr ""
|
||||
+msgstr "_Аҳаракыра:"
|
||||
|
||||
#: gtk/gtkcustompaperunixdialog.c:1142
|
||||
msgid "Paper Size"
|
||||
@@ -2174,7 +2174,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkcustompaperunixdialog.c:1151
|
||||
msgid "_Top:"
|
||||
-msgstr ""
|
||||
+msgstr "_Хыхьтәи:"
|
||||
|
||||
#: gtk/gtkcustompaperunixdialog.c:1162
|
||||
msgid "_Bottom:"
|
||||
@@ -2235,7 +2235,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkentry.c:10880
|
||||
msgid "Caps Lock is on"
|
||||
-msgstr ""
|
||||
+msgstr "Caps Lock аҿакуп"
|
||||
|
||||
#: gtk/gtkentry.c:11158
|
||||
msgid "Insert Emoji"
|
||||
@@ -2514,15 +2514,15 @@ msgstr "%l:%M %p"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4899
|
||||
msgid "Yesterday"
|
||||
-msgstr ""
|
||||
+msgstr "Иацы"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4907
|
||||
msgid "%-e %b"
|
||||
-msgstr "%-e %b"
|
||||
+msgstr "%-e %B"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4911
|
||||
msgid "%-e %b %Y"
|
||||
-msgstr ""
|
||||
+msgstr "%-e %b. %Y"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5010 gtk/gtkfilechooserwidget.c:5018
|
||||
msgid "Program"
|
||||
@@ -2530,7 +2530,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5011
|
||||
msgid "Audio"
|
||||
-msgstr ""
|
||||
+msgstr "Аудио"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5012 gtk/inspector/visual.ui:230
|
||||
#: gtk/ui/gtkfontbutton.ui:13
|
||||
@@ -2543,7 +2543,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5014
|
||||
msgid "Archive"
|
||||
-msgstr "Архивтәра"
|
||||
+msgstr "Архив"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5015
|
||||
msgid "Markup"
|
||||
@@ -2555,7 +2555,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5019
|
||||
msgid "Video"
|
||||
-msgstr ""
|
||||
+msgstr "Авидео"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5020
|
||||
msgid "Contacts"
|
||||
@@ -2649,7 +2649,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:1603
|
||||
msgid "Weight"
|
||||
-msgstr ""
|
||||
+msgstr "Акапан"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Italic"
|
||||
@@ -2689,7 +2689,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Character Variants"
|
||||
-msgstr ""
|
||||
+msgstr "Асимволқәа рвариантқәа"
|
||||
|
||||
#: gtk/gtkglarea.c:314
|
||||
msgid "OpenGL context creation failed"
|
||||
@@ -3138,7 +3138,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2346
|
||||
msgid "_Safely Remove Drive"
|
||||
-msgstr ""
|
||||
+msgstr "_Ишәарҭамкәа аусруга аныхра"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2350
|
||||
msgid "_Connect Drive"
|
||||
@@ -3338,7 +3338,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkplacesview.c:2096 gtk/gtkplacesview.c:2105
|
||||
msgid "Networks"
|
||||
-msgstr ""
|
||||
+msgstr "Аҳа аҿы"
|
||||
|
||||
#: gtk/gtkplacesview.c:2096 gtk/gtkplacesview.c:2105
|
||||
msgid "On This Computer"
|
||||
@@ -3366,7 +3366,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkprintbackend.c:778
|
||||
msgid "Authentication"
|
||||
-msgstr ""
|
||||
+msgstr "Ахаҭареилкаара"
|
||||
|
||||
#: gtk/gtkprintbackend.c:849
|
||||
msgid "_Remember password"
|
||||
@@ -3471,7 +3471,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkprintoperation-win32.c:656
|
||||
msgid "Out of paper"
|
||||
-msgstr ""
|
||||
+msgstr "Ақьаад нҵәеит"
|
||||
|
||||
#. Translators: this is a printer status.
|
||||
#: gtk/gtkprintoperation-win32.c:658
|
||||
@@ -3798,7 +3798,7 @@ msgstr ""
|
||||
#: gtk/gtktextbufferserialize.c:802 gtk/gtktextbufferserialize.c:828
|
||||
#, c-format
|
||||
msgid "The attribute \"%s\" was found twice on the <%s> element"
|
||||
-msgstr ""
|
||||
+msgstr "Аҟазшьарбага \"%s\" ҩынтәны иԥшаан ахәҭа <%s> аҟны"
|
||||
|
||||
#: gtk/gtktextbufferserialize.c:844
|
||||
#, c-format
|
||||
@@ -3813,12 +3813,12 @@ msgstr ""
|
||||
#: gtk/gtktextbufferserialize.c:942
|
||||
#, c-format
|
||||
msgid "Attribute \"%s\" repeated twice on the same <%s> element"
|
||||
-msgstr ""
|
||||
+msgstr "Аҟазшьарбага \"%s\" ҩынтәны еиҭаҟалеит ахәҭа <%s> аҟны"
|
||||
|
||||
#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
|
||||
#, c-format
|
||||
msgid "Attribute \"%s\" is invalid on <%s> element in this context"
|
||||
-msgstr ""
|
||||
+msgstr "Аҟазшьарбага \"%s\" гхоуп <%s> аелемент аҟны ари аконтекст ала"
|
||||
|
||||
#: gtk/gtktextbufferserialize.c:1024
|
||||
#, c-format
|
||||
@@ -4002,7 +4002,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/actions.ui:56
|
||||
msgid "Enabled"
|
||||
-msgstr ""
|
||||
+msgstr "Иаҿакуп"
|
||||
|
||||
#: gtk/inspector/actions.ui:69
|
||||
msgid "Parameter Type"
|
||||
@@ -4084,7 +4084,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/general.ui:454
|
||||
msgid "Display"
|
||||
-msgstr ""
|
||||
+msgstr "Аԥшра"
|
||||
|
||||
#: gtk/inspector/general.ui:489
|
||||
msgid "RGBA visual"
|
||||
@@ -4096,7 +4096,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/general.ui:570
|
||||
msgid "GL Version"
|
||||
-msgstr ""
|
||||
+msgstr "Аверсиа GL"
|
||||
|
||||
#: gtk/inspector/general.ui:605
|
||||
msgid "GL Vendor"
|
||||
@@ -4183,7 +4183,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/misc-info.ui:362
|
||||
msgid "Baseline"
|
||||
-msgstr ""
|
||||
+msgstr "Абазатә цәаҳәа"
|
||||
|
||||
#: gtk/inspector/misc-info.ui:396
|
||||
msgid "Clip area"
|
||||
@@ -4515,7 +4515,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/visual.ui:487
|
||||
msgid "Similar"
|
||||
-msgstr ""
|
||||
+msgstr "Аиԥш"
|
||||
|
||||
#: gtk/inspector/visual.ui:489
|
||||
msgid "Recording"
|
||||
@@ -4555,7 +4555,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/visual.ui:741
|
||||
msgid "Always"
|
||||
-msgstr ""
|
||||
+msgstr "Еснагь"
|
||||
|
||||
#: gtk/inspector/visual.ui:742
|
||||
msgid "Disabled"
|
||||
@@ -7354,7 +7354,7 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:649
|
||||
msgid "Paper"
|
||||
-msgstr ""
|
||||
+msgstr "Ақьаад"
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:672
|
||||
msgid "Paper _type:"
|
||||
@@ -7768,56 +7768,56 @@ msgstr ""
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2609
|
||||
#, c-format
|
||||
msgid "Printer “%s” is low on toner."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны атонер анҵәара иаҿуп"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2613
|
||||
#, c-format
|
||||
msgid "Printer “%s” has no toner left."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны атонер нҵәеит"
|
||||
|
||||
#. Translators: "Developer" like on photo development context
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2618
|
||||
#, c-format
|
||||
msgid "Printer “%s” is low on developer."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны аарԥшыга анҵәара иаҿуп"
|
||||
|
||||
#. Translators: "Developer" like on photo development context
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2623
|
||||
#, c-format
|
||||
msgid "Printer “%s” is out of developer."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны аарԥшыга нҵәеит"
|
||||
|
||||
#. Translators: "marker" is one color bin of the printer
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2628
|
||||
#, c-format
|
||||
msgid "Printer “%s” is low on at least one marker supply."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны атонерқәа руак анҵәара иаҿуп"
|
||||
|
||||
#. Translators: "marker" is one color bin of the printer
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2633
|
||||
#, c-format
|
||||
msgid "Printer “%s” is out of at least one marker supply."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны атонерқәа руак нҵәеит"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2637
|
||||
#, c-format
|
||||
msgid "The cover is open on printer “%s”."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны ахҩа аартуп"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2641
|
||||
#, c-format
|
||||
msgid "The door is open on printer “%s”."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны ашә аартуп"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2645
|
||||
#, c-format
|
||||
msgid "Printer “%s” is low on paper."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны ақьаад анҵәара иаҿуп"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2649
|
||||
#, c-format
|
||||
msgid "Printer “%s” is out of paper."
|
||||
-msgstr ""
|
||||
+msgstr "Апринтер «%s» аҟны ақьаад нҵәеит"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2653
|
||||
#, c-format
|
||||
4711
debian/patches/Update-Abkhazian-translation-2.patch
vendored
Normal file
4711
debian/patches/Update-Abkhazian-translation-2.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
3500
debian/patches/Update-Abkhazian-translation-3.patch
vendored
Normal file
3500
debian/patches/Update-Abkhazian-translation-3.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
447
debian/patches/Update-Abkhazian-translation.patch
vendored
Normal file
447
debian/patches/Update-Abkhazian-translation.patch
vendored
Normal file
@ -0,0 +1,447 @@
|
||||
From: Nart Tlisha <daniel.abzakh@gmail.com>
|
||||
Date: Thu, 28 Jul 2022 19:16:33 +0000
|
||||
Subject: Update Abkhazian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:56314b46eaa718ee770602b84788cbff037cb09d
|
||||
---
|
||||
po/ab.po | 109 ++++++++++++++++++++++++++++++---------------------------------
|
||||
1 file changed, 52 insertions(+), 57 deletions(-)
|
||||
|
||||
diff --git a/po/ab.po b/po/ab.po
|
||||
index ac0023c..c7725f0 100644
|
||||
--- a/po/ab.po
|
||||
+++ b/po/ab.po
|
||||
@@ -1,16 +1,9 @@
|
||||
-# Copyright (C) 2022 The Abkhazian language development fund named after Bagrat Shinkuba
|
||||
-# This file is distributed under the same license as the gtk • UI translations package.
|
||||
-# Нанба Наала <naala-nanba@rambler.ru>, 2022.
|
||||
-#
|
||||
-
|
||||
msgid ""
|
||||
msgstr ""
|
||||
-"Project-Id-Version: gtk • UI translations\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-07-13 15:48+0000\n"
|
||||
-"PO-Revision-Date: 2022-07-22 16:00+0000\n"
|
||||
"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
|
||||
-"Language-Team: Abkhazian <LL@li.org>\n"
|
||||
+"Language-Team: Abkhazian <ab@li.org>\n"
|
||||
"Language: ab\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -1219,7 +1212,7 @@ msgstr ""
|
||||
#. can set it. Remember that some fonts only have capital letters.
|
||||
#: gtk/deprecated/gtkfontsel.c:121
|
||||
msgid "abcdefghijk ABCDEFGHIJK"
|
||||
-msgstr ""
|
||||
+msgstr "абвггьгә АБВГГЬГӘ бвгде АБВГДЕ abcde ABCDE"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:386
|
||||
msgid "_Family:"
|
||||
@@ -1246,7 +1239,7 @@ msgstr ""
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
msgid "_OK"
|
||||
-msgstr ""
|
||||
+msgstr "_OK"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1709
|
||||
msgid "Font Selection"
|
||||
@@ -1434,15 +1427,15 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:120
|
||||
msgid "BSD 2-Clause License"
|
||||
-msgstr ""
|
||||
+msgstr "BSD 2-Clause License"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:121
|
||||
msgid "The MIT License (MIT)"
|
||||
-msgstr ""
|
||||
+msgstr "The MIT License (MIT)"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:122
|
||||
msgid "Artistic License 2.0"
|
||||
-msgstr ""
|
||||
+msgstr "Artistic License 2.0"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:123
|
||||
msgid "GNU General Public License, version 2 only"
|
||||
@@ -1470,7 +1463,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:129
|
||||
msgid "BSD 3-Clause License"
|
||||
-msgstr ""
|
||||
+msgstr "BSD 3-Clause License"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:130
|
||||
msgid "Apache License, Version 2.0"
|
||||
@@ -1478,11 +1471,11 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:131
|
||||
msgid "Mozilla Public License 2.0"
|
||||
-msgstr ""
|
||||
+msgstr "Mozilla Public License 2.0"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:703
|
||||
msgid "C_redits"
|
||||
-msgstr ""
|
||||
+msgstr " _Аҭабурақәа"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:711
|
||||
msgid "_License"
|
||||
@@ -1509,7 +1502,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2320
|
||||
msgid "Created by"
|
||||
-msgstr ""
|
||||
+msgstr "Аԥҵаҩы"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2323
|
||||
msgid "Documented by"
|
||||
@@ -1758,7 +1751,7 @@ msgstr ""
|
||||
#.
|
||||
#: gtk/gtkcalendar.c:815
|
||||
msgid "calendar:MY"
|
||||
-msgstr ""
|
||||
+msgstr "calendar:MY"
|
||||
|
||||
#. Translate to calendar:week_start:0 if you want Sunday to be the
|
||||
#. * first day of the week to calendar:week_start:1 if you want Monday
|
||||
@@ -2143,7 +2136,7 @@ msgstr ""
|
||||
#.
|
||||
#: gtk/gtkcustompaperunixdialog.c:117
|
||||
msgid "default:mm"
|
||||
-msgstr ""
|
||||
+msgstr "default:mm"
|
||||
|
||||
#. And show the custom paper dialog
|
||||
#: gtk/gtkcustompaperunixdialog.c:405 gtk/gtkprintunixdialog.c:3337
|
||||
@@ -2290,7 +2283,7 @@ msgstr ""
|
||||
#: gtk/gtkfilechooserutils.c:505
|
||||
#, c-format
|
||||
msgid "%1$s on %2$s"
|
||||
-msgstr ""
|
||||
+msgstr "%1$s аҟны %2$s"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:386
|
||||
msgid "Type name of new folder"
|
||||
@@ -2473,7 +2466,7 @@ msgstr ""
|
||||
#: gtk/gtkfilechooserwidget.c:2626 gtk/inspector/css-node-tree.ui:141
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:238 gtk/ui/gtkprintunixdialog.ui:123
|
||||
msgid "Location"
|
||||
-msgstr ""
|
||||
+msgstr "Аҭыӡҭыԥ"
|
||||
|
||||
#. Label
|
||||
#: gtk/gtkfilechooserwidget.c:2719
|
||||
@@ -2513,11 +2506,11 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4893 gtk/gtkfilechooserwidget.c:4941
|
||||
msgid "%H:%M"
|
||||
-msgstr ""
|
||||
+msgstr "%H:%M"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4895 gtk/gtkfilechooserwidget.c:4943
|
||||
msgid "%l:%M %p"
|
||||
-msgstr ""
|
||||
+msgstr "%l:%M %p"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4899
|
||||
msgid "Yesterday"
|
||||
@@ -2525,7 +2518,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4907
|
||||
msgid "%-e %b"
|
||||
-msgstr ""
|
||||
+msgstr "%-e %b"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4911
|
||||
msgid "%-e %b %Y"
|
||||
@@ -2550,7 +2543,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5014
|
||||
msgid "Archive"
|
||||
-msgstr ""
|
||||
+msgstr "Архивтәра"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5015
|
||||
msgid "Markup"
|
||||
@@ -2591,7 +2584,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5283 gtk/gtkplacessidebar.c:1097
|
||||
msgid "Home"
|
||||
-msgstr ""
|
||||
+msgstr "Home"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5780
|
||||
msgid "Cannot change to folder because it is not local"
|
||||
@@ -2639,7 +2632,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfontbutton.c:379 gtk/gtkfontbutton.c:509
|
||||
msgid "Sans 12"
|
||||
-msgstr ""
|
||||
+msgstr "Sans 12"
|
||||
|
||||
#: gtk/gtkfontbutton.c:492 gtk/gtkfontbutton.c:626
|
||||
msgid "Pick a Font"
|
||||
@@ -2897,7 +2890,7 @@ msgstr ""
|
||||
#.
|
||||
#: gtk/gtkmain.c:1276
|
||||
msgid "default:LTR"
|
||||
-msgstr ""
|
||||
+msgstr "default:LTR"
|
||||
|
||||
#: gtk/gtkmessagedialog.c:956
|
||||
msgid "_No"
|
||||
@@ -2905,7 +2898,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkmessagedialog.c:957
|
||||
msgid "_Yes"
|
||||
-msgstr ""
|
||||
+msgstr "_Ааи"
|
||||
|
||||
#: gtk/gtkmountoperation.c:595
|
||||
msgid "Co_nnect"
|
||||
@@ -2945,7 +2938,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkmountoperation.c:727
|
||||
msgid "_PIM"
|
||||
-msgstr ""
|
||||
+msgstr "_PIM"
|
||||
|
||||
#: gtk/gtkmountoperation.c:733
|
||||
msgid "_Password"
|
||||
@@ -2993,15 +2986,15 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkmountoperation-x11.c:956
|
||||
msgid "Bourne Again Shell"
|
||||
-msgstr ""
|
||||
+msgstr "Bourne Again Shell"
|
||||
|
||||
#: gtk/gtkmountoperation-x11.c:957
|
||||
msgid "Bourne Shell"
|
||||
-msgstr ""
|
||||
+msgstr "Bourne Shell"
|
||||
|
||||
#: gtk/gtkmountoperation-x11.c:958
|
||||
msgid "Z Shell"
|
||||
-msgstr ""
|
||||
+msgstr "Z Shell"
|
||||
|
||||
#: gtk/gtkmountoperation-x11.c:1055
|
||||
#, c-format
|
||||
@@ -3294,7 +3287,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkplacesview.c:1657
|
||||
msgid "AppleTalk"
|
||||
-msgstr ""
|
||||
+msgstr "AppleTalk"
|
||||
|
||||
#. Translators: do not translate ftp:// and ftps://
|
||||
#: gtk/gtkplacesview.c:1661
|
||||
@@ -3311,7 +3304,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkplacesview.c:1667
|
||||
msgid "Samba"
|
||||
-msgstr ""
|
||||
+msgstr "Samba"
|
||||
|
||||
#. Translators: do not translate sftp:// and ssh://
|
||||
#: gtk/gtkplacesview.c:1671
|
||||
@@ -3325,7 +3318,7 @@ msgstr ""
|
||||
#. Translators: do not translate dav:// and davs://
|
||||
#: gtk/gtkplacesview.c:1675
|
||||
msgid "WebDAV"
|
||||
-msgstr ""
|
||||
+msgstr "WebDAV"
|
||||
|
||||
#: gtk/gtkplacesview.c:1675
|
||||
msgid "dav:// or davs://"
|
||||
@@ -3470,7 +3463,7 @@ msgstr ""
|
||||
#: gtk/gtkprintoperation-portal.c:231 gtk/gtkprintoperation-portal.c:549
|
||||
#: gtk/gtkprintoperation-portal.c:618 gtk/gtkprintunixdialog.c:3415
|
||||
msgid "Print"
|
||||
-msgstr ""
|
||||
+msgstr "Print"
|
||||
|
||||
#: gtk/gtkprintoperation-win32.c:654
|
||||
msgid "Printer offline"
|
||||
@@ -3995,7 +3988,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/action-editor.c:281
|
||||
msgid "Activate"
|
||||
-msgstr ""
|
||||
+msgstr "Активациа азура"
|
||||
|
||||
#: gtk/inspector/action-editor.c:302 gtk/inspector/actions.ui:82
|
||||
#: gtk/inspector/css-node-tree.ui:78 gtk/inspector/misc-info.ui:102
|
||||
@@ -4044,7 +4037,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/css-node-tree.ui:52
|
||||
msgid "ID"
|
||||
-msgstr ""
|
||||
+msgstr "ID"
|
||||
|
||||
#: gtk/inspector/css-node-tree.ui:65 gtk/inspector/object-tree.ui:142
|
||||
msgid "Style Classes"
|
||||
@@ -4131,7 +4124,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/menu.c:92
|
||||
msgid "Unnamed section"
|
||||
-msgstr ""
|
||||
+msgstr "Ихьӡыдоу аҟәша"
|
||||
|
||||
#: gtk/inspector/menu.ui:26 gtk/inspector/object-tree.ui:125
|
||||
msgid "Label"
|
||||
@@ -4151,7 +4144,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/misc-info.ui:34
|
||||
msgid "Address"
|
||||
-msgstr ""
|
||||
+msgstr "Аҭыӡҭыԥ"
|
||||
|
||||
#: gtk/inspector/misc-info.ui:68
|
||||
msgid "Reference count"
|
||||
@@ -4275,7 +4268,7 @@ msgstr ""
|
||||
#: gtk/inspector/prop-editor.c:1265
|
||||
#, c-format
|
||||
msgid "%p (%s)"
|
||||
-msgstr ""
|
||||
+msgstr "%p (%s)"
|
||||
|
||||
#: gtk/inspector/prop-editor.c:1275
|
||||
msgid "Column:"
|
||||
@@ -4325,7 +4318,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/prop-editor.c:1682
|
||||
msgid "XSettings"
|
||||
-msgstr ""
|
||||
+msgstr "XSettings"
|
||||
|
||||
#: gtk/inspector/prop-list.ui:34
|
||||
msgid "Property"
|
||||
@@ -4338,7 +4331,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/prop-list.ui:86
|
||||
msgid "Attribute"
|
||||
-msgstr ""
|
||||
+msgstr "Аҟазшьарбага"
|
||||
|
||||
#: gtk/inspector/prop-list.ui:102 gtk/inspector/signals-list.ui:73
|
||||
msgid "Defined At"
|
||||
@@ -4375,7 +4368,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/signals-list.c:117
|
||||
msgid "Yes"
|
||||
-msgstr ""
|
||||
+msgstr "Ааи"
|
||||
|
||||
#: gtk/inspector/signals-list.ui:36
|
||||
msgid "Signal"
|
||||
@@ -4510,7 +4503,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/visual.ui:382
|
||||
msgid "Animations"
|
||||
-msgstr ""
|
||||
+msgstr "Анимациа"
|
||||
|
||||
#: gtk/inspector/visual.ui:415
|
||||
msgid "Slowdown"
|
||||
@@ -4666,7 +4659,7 @@ msgstr ""
|
||||
|
||||
#: gtk/inspector/window.ui:519
|
||||
msgid "CSS"
|
||||
-msgstr ""
|
||||
+msgstr "CSS"
|
||||
|
||||
#: gtk/inspector/window.ui:528
|
||||
msgid "Visual"
|
||||
@@ -6992,7 +6985,7 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkaboutdialog.ui:177
|
||||
msgid "Credits"
|
||||
-msgstr ""
|
||||
+msgstr " Аҭабурақәа"
|
||||
|
||||
#: gtk/ui/gtkappchooserdialog.ui:78
|
||||
msgid "_View All Applications"
|
||||
@@ -7069,7 +7062,7 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkcoloreditor.ui:196
|
||||
msgid "Alpha"
|
||||
-msgstr ""
|
||||
+msgstr "Альфа"
|
||||
|
||||
#: gtk/ui/gtkcoloreditor.ui:227
|
||||
msgctxt "Color channel"
|
||||
@@ -7078,7 +7071,7 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkcoloreditor.ui:243
|
||||
msgid "Hue"
|
||||
-msgstr ""
|
||||
+msgstr "Hue"
|
||||
|
||||
#: gtk/ui/gtkcoloreditor.ui:275
|
||||
msgctxt "Color Channel"
|
||||
@@ -7233,12 +7226,14 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:30
|
||||
msgid "Server Addresses"
|
||||
-msgstr ""
|
||||
+msgstr "Асерверқәа рҭыӡҭыԥқәа"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:43
|
||||
msgid ""
|
||||
"Server addresses are made up of a protocol prefix and an address. Examples:"
|
||||
msgstr ""
|
||||
+"Асерверқәа рҭыӡҭыԥқәа шьыкәгылоуп апртотокол апрефиксла, насгьы аҭыӡҭыԥла."
|
||||
+"Аҿырԥштәқәа:"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:78
|
||||
msgid "Available Protocols"
|
||||
@@ -7401,7 +7396,7 @@ msgstr ""
|
||||
#. this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1003
|
||||
msgid "A_t:"
|
||||
-msgstr ""
|
||||
+msgstr "_Аҟны:"
|
||||
|
||||
#. Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1007 gtk/ui/gtkprintunixdialog.ui:1009
|
||||
@@ -7563,7 +7558,7 @@ msgstr ""
|
||||
|
||||
#: gtk/updateiconcache.c:1665
|
||||
msgid "Include image data in the cache"
|
||||
-msgstr ""
|
||||
+msgstr "Асахьақәа кеш аҟны рҿакра"
|
||||
|
||||
#: gtk/updateiconcache.c:1666
|
||||
msgid "Output a C header file"
|
||||
@@ -7847,7 +7842,7 @@ msgstr ""
|
||||
#. Translators: this string connects multiple printer states together.
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2724
|
||||
msgid "; "
|
||||
-msgstr ""
|
||||
+msgstr "; "
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4655
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4722
|
||||
@@ -8225,15 +8220,15 @@ msgstr ""
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:663
|
||||
msgid "PDF"
|
||||
-msgstr ""
|
||||
+msgstr "PDF"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:663
|
||||
msgid "Postscript"
|
||||
-msgstr ""
|
||||
+msgstr "Postscript"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:663
|
||||
msgid "SVG"
|
||||
-msgstr ""
|
||||
+msgstr "SVG"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:676
|
||||
#: modules/printbackends/test/gtkprintbackendtest.c:501
|
||||
6805
debian/patches/Update-Bulgarian-translation.patch
vendored
Normal file
6805
debian/patches/Update-Bulgarian-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
43
debian/patches/Update-Catalan-translation-1.patch
vendored
Normal file
43
debian/patches/Update-Catalan-translation-1.patch
vendored
Normal file
@ -0,0 +1,43 @@
|
||||
From: Jordi Mas <jmas@softcatala.org>
|
||||
Date: Mon, 1 Aug 2022 20:46:05 +0200
|
||||
Subject: Update Catalan translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:2cb920a51bf3cc2ed5d52462556d037a609365b6
|
||||
---
|
||||
po/ca.po | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index 1e8aaac..5a92fde 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -35,8 +35,8 @@ msgstr ""
|
||||
"Project-Id-Version: gtk+ 2.8.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-02-18 00:07+0000\n"
|
||||
-"PO-Revision-Date: 2019-08-31 22:51+0200\n"
|
||||
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
|
||||
+"PO-Revision-Date: 2022-08-01 20:44+0200\n"
|
||||
+"Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
|
||||
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
|
||||
"Language: ca\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -2764,15 +2764,15 @@ msgstr "Lligadures"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2354
|
||||
msgid "Letter Case"
|
||||
-msgstr "Ignora les diferències entre majúscules i minúscules"
|
||||
+msgstr "Majúscules i minúscules"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Number Case"
|
||||
-msgstr "Número de cas"
|
||||
+msgstr "Mida del número"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Number Spacing"
|
||||
-msgstr "Espaiat dels nombres"
|
||||
+msgstr "Espaiat entre números"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Formatting"
|
||||
31
debian/patches/Update-Catalan-translation-2.patch
vendored
Normal file
31
debian/patches/Update-Catalan-translation-2.patch
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
From: Jordi Mas <jmas@softcatala.org>
|
||||
Date: Tue, 16 Aug 2022 00:05:48 +0200
|
||||
Subject: Update Catalan translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po/ca.po | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index 5a92fde..d64472e 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -35,7 +35,7 @@ msgstr ""
|
||||
"Project-Id-Version: gtk+ 2.8.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-02-18 00:07+0000\n"
|
||||
-"PO-Revision-Date: 2022-08-01 20:44+0200\n"
|
||||
+"PO-Revision-Date: 2022-08-16 20:44+0200\n"
|
||||
"Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
|
||||
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
|
||||
"Language: ca\n"
|
||||
@@ -5604,7 +5604,7 @@ msgstr "A4 extra"
|
||||
#: gtk/paper_names_offsets.c:25
|
||||
msgctxt "paper size"
|
||||
msgid "A4 Tab"
|
||||
-msgstr "A4 tabloide"
|
||||
+msgstr "A4 tabulat"
|
||||
|
||||
#: gtk/paper_names_offsets.c:26
|
||||
msgctxt "paper size"
|
||||
35
debian/patches/Update-Catalan-translation-3.patch
vendored
Normal file
35
debian/patches/Update-Catalan-translation-3.patch
vendored
Normal file
@ -0,0 +1,35 @@
|
||||
From: Jordi Mas <jmas@softcatala.org>
|
||||
Date: Sun, 11 Sep 2022 14:30:21 +0200
|
||||
Subject: Update Catalan translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:4a93875bbbc931cc4f19718940546200c12293d4
|
||||
---
|
||||
po/ca.po | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index 20736d8..53971b6 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -32,10 +32,10 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
-"Project-Id-Version: gtk+ 2.8.2\n"
|
||||
+"Project-Id-Version: gtk+ 3.2.4\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-02-18 00:07+0000\n"
|
||||
-"PO-Revision-Date: 2022-08-16 20:44+0200\n"
|
||||
+"PO-Revision-Date: 2022-09-11 20:44+0200\n"
|
||||
"Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
|
||||
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
|
||||
"Language: ca\n"
|
||||
@@ -495,7 +495,7 @@ msgstr "Desperta"
|
||||
#: gdk/keyname-table.h:6916
|
||||
msgctxt "keyboard label"
|
||||
msgid "Suspend"
|
||||
-msgstr "Atura temporalment"
|
||||
+msgstr "Suspèn"
|
||||
|
||||
#: gdk/quartz/gdkglcontext-quartz.c:123
|
||||
msgid "Unable to create a GL pixel format"
|
||||
58
debian/patches/Update-Catalan-translation.patch
vendored
Normal file
58
debian/patches/Update-Catalan-translation.patch
vendored
Normal file
@ -0,0 +1,58 @@
|
||||
From: Jordi Mas <jmas@softcatala.org>
|
||||
Date: Tue, 14 Jun 2022 19:45:46 +0200
|
||||
Subject: Update Catalan translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po/ca.po | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index fc06420..1e8aaac 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -2525,7 +2525,7 @@ msgstr "_Afegeix a les adreces d'interès"
|
||||
#: gtk/gtkfilechooserwidget.c:2334 gtk/gtkplacessidebar.c:2744
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:569
|
||||
msgid "_Rename"
|
||||
-msgstr "Canvia el _nom…"
|
||||
+msgstr "Canvia el _nom"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:2336
|
||||
msgid "_Move to Trash"
|
||||
@@ -4964,7 +4964,7 @@ msgstr "Amplada completa"
|
||||
#: gtk/open-type-layout.h:46
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Half Forms"
|
||||
-msgstr "Formes mitjanes"
|
||||
+msgstr "Mitges formes"
|
||||
|
||||
#: gtk/open-type-layout.h:47
|
||||
msgctxt "OpenType layout"
|
||||
@@ -5004,7 +5004,7 @@ msgstr "Formes Hojo Kanji"
|
||||
#: gtk/open-type-layout.h:54
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Half Widths"
|
||||
-msgstr "Amplada mitja"
|
||||
+msgstr "Mitges amplades"
|
||||
|
||||
#: gtk/open-type-layout.h:55
|
||||
msgctxt "OpenType layout"
|
||||
@@ -6790,7 +6790,7 @@ msgstr "Lidi"
|
||||
#: gtk/script-names.c:94
|
||||
msgctxt "Script"
|
||||
msgid "Avestan"
|
||||
-msgstr "avèstic"
|
||||
+msgstr "Avèstic"
|
||||
|
||||
#: gtk/script-names.c:95
|
||||
msgctxt "Script"
|
||||
@@ -6825,7 +6825,7 @@ msgstr "Javanès"
|
||||
#: gtk/script-names.c:101
|
||||
msgctxt "Script"
|
||||
msgid "Kaithi"
|
||||
-msgstr "kaithi"
|
||||
+msgstr "Kaithi"
|
||||
|
||||
#: gtk/script-names.c:102
|
||||
msgctxt "Script"
|
||||
514
debian/patches/Update-Chinese-Taiwan-translation.patch
vendored
Normal file
514
debian/patches/Update-Chinese-Taiwan-translation.patch
vendored
Normal file
@ -0,0 +1,514 @@
|
||||
From: Cheng-Chia Tseng <pswo10680@gmail.com>
|
||||
Date: Sat, 10 Sep 2022 09:21:40 +0000
|
||||
Subject: Update Chinese (Taiwan) translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:b425e724ee50e003c5886b099f43b5a40b2ceaac
|
||||
---
|
||||
po/zh_TW.po | 128 ++++++++++++++++++++++++++++++++----------------------------
|
||||
1 file changed, 68 insertions(+), 60 deletions(-)
|
||||
|
||||
diff --git a/po/zh_TW.po b/po/zh_TW.po
|
||||
index 5a04eb2..d3d8e24 100644
|
||||
--- a/po/zh_TW.po
|
||||
+++ b/po/zh_TW.po
|
||||
@@ -4,20 +4,22 @@
|
||||
# taijuin <taijuin@gmail.com>, 2010.
|
||||
# Wei-Lun Chao <chaoweilun@gmail.com>, 2010.
|
||||
# Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2012.
|
||||
+# Freddy Cheng <freddy4212@gmail.com>, 2022.
|
||||
+#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 3.3.11\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-03-19 00:25+0000\n"
|
||||
-"PO-Revision-Date: 2022-03-22 22:28+0800\n"
|
||||
+"POT-Creation-Date: 2022-06-05 17:13+0000\n"
|
||||
+"PO-Revision-Date: 2022-09-10 17:19+0800\n"
|
||||
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
|
||||
-"Language-Team: <>\n"
|
||||
+"Language-Team: Chinese - Taiwan <chinese-l10n@googlegroups.com>\n"
|
||||
"Language: zh_TW\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
"X-Project-Style: gnome\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
@@ -172,6 +174,8 @@ msgctxt "keyboard label"
|
||||
msgid "Page_Up"
|
||||
msgstr "Page_Up"
|
||||
|
||||
+# gdk/keyname-table.h:6857
|
||||
+# gtk/gtkshortcutlabel.c:225
|
||||
#: gdk/keyname-table.h:6857 gtk/gtkshortcutlabel.c:225
|
||||
msgctxt "keyboard label"
|
||||
msgid "Page_Down"
|
||||
@@ -421,12 +425,12 @@ msgstr "執行1"
|
||||
#: gdk/keyname-table.h:6907
|
||||
msgctxt "keyboard label"
|
||||
msgid "Forward"
|
||||
-msgstr "向前"
|
||||
+msgstr "前進鍵"
|
||||
|
||||
#: gdk/keyname-table.h:6908
|
||||
msgctxt "keyboard label"
|
||||
msgid "Back"
|
||||
-msgstr "向後"
|
||||
+msgstr "返回鍵"
|
||||
|
||||
#: gdk/keyname-table.h:6909
|
||||
msgctxt "keyboard label"
|
||||
@@ -927,12 +931,12 @@ msgstr "屬性(_P)"
|
||||
#: gtk/a11y/gtkimageaccessible.c:109 gtk/deprecated/gtkstock.c:437
|
||||
msgctxt "Stock label"
|
||||
msgid "_Quit"
|
||||
-msgstr "結束(_Q)"
|
||||
+msgstr "退出(_Q)"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:110 gtk/deprecated/gtkstock.c:438
|
||||
msgctxt "Stock label"
|
||||
msgid "_Redo"
|
||||
-msgstr "取消復原(_R)"
|
||||
+msgstr "重做(_R)"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:111 gtk/deprecated/gtkstock.c:439
|
||||
msgctxt "Stock label"
|
||||
@@ -962,7 +966,7 @@ msgstr "另存新檔(_A)"
|
||||
#: gtk/a11y/gtkimageaccessible.c:116 gtk/deprecated/gtkstock.c:444
|
||||
msgctxt "Stock label"
|
||||
msgid "Select _All"
|
||||
-msgstr "全部選取(_A)"
|
||||
+msgstr "全選(_A)"
|
||||
|
||||
#. Sorting direction
|
||||
#: gtk/a11y/gtkimageaccessible.c:117 gtk/deprecated/gtkstock.c:448
|
||||
@@ -1001,7 +1005,7 @@ msgstr "底線(_U)"
|
||||
#: gtk/a11y/gtkimageaccessible.c:123 gtk/deprecated/gtkstock.c:458
|
||||
msgctxt "Stock label"
|
||||
msgid "_Undo"
|
||||
-msgstr "復原(_U)"
|
||||
+msgstr "還原(_U)"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:124 gtk/deprecated/gtkstock.c:388
|
||||
msgctxt "Stock label"
|
||||
@@ -1285,7 +1289,7 @@ msgstr "取消(_C)"
|
||||
#: gtk/deprecated/gtkstock.c:353
|
||||
msgctxt "Stock label"
|
||||
msgid "C_onnect"
|
||||
-msgstr "連線(_O)"
|
||||
+msgstr "連接(_O)"
|
||||
|
||||
#: gtk/deprecated/gtkstock.c:354
|
||||
msgctxt "Stock label"
|
||||
@@ -1543,7 +1547,7 @@ msgid ""
|
||||
"This program comes with absolutely no warranty.\n"
|
||||
"See the <a href=\"%s\">%s</a> for details."
|
||||
msgstr ""
|
||||
-"這個程式沒有任何保證。\n"
|
||||
+"這個程式沒有擔保任何責任。\n"
|
||||
"需要更多資訊，請參閱 <a href=\"%s\">%s</a>。"
|
||||
|
||||
#. This is the text that should appear next to menu accelerators
|
||||
@@ -1640,7 +1644,7 @@ msgstr "正在開啟「%s」。"
|
||||
#: gtk/gtkappchooserdialog.c:210
|
||||
#, c-format
|
||||
msgid "No applications found for “%s”"
|
||||
-msgstr "沒有應用程式可開啟「%s」"
|
||||
+msgstr "沒有應用程式可以開啟「%s」"
|
||||
|
||||
#. Translators: %s is a file type description
|
||||
#: gtk/gtkappchooserdialog.c:215
|
||||
@@ -1651,7 +1655,7 @@ msgstr "正在開啟「%s」檔案。"
|
||||
#: gtk/gtkappchooserdialog.c:217
|
||||
#, c-format
|
||||
msgid "No applications found for “%s” files"
|
||||
-msgstr "沒有應用程式可開啟「%s」檔案"
|
||||
+msgstr "沒有應用程式可以開啟「%s」檔案"
|
||||
|
||||
#: gtk/gtkappchooserdialog.c:310
|
||||
msgid "Forget association"
|
||||
@@ -1659,28 +1663,28 @@ msgstr "消除關聯"
|
||||
|
||||
#: gtk/gtkappchooserdialog.c:453
|
||||
msgid "Failed to start GNOME Software"
|
||||
-msgstr "無法啟動《GNOME 軟體》"
|
||||
+msgstr "無法啟動《軟體》"
|
||||
|
||||
#: gtk/gtkappchooserwidget.c:593
|
||||
msgid "Default Application"
|
||||
-msgstr "預設的應用程式"
|
||||
+msgstr "預設應用程式"
|
||||
|
||||
#: gtk/gtkappchooserwidget.c:643
|
||||
#, c-format
|
||||
msgid "No applications found for “%s”."
|
||||
-msgstr "沒有應用程式可開啟「%s」。"
|
||||
+msgstr "沒有應用程式可以開啟「%s」。"
|
||||
|
||||
#: gtk/gtkappchooserwidget.c:726
|
||||
msgid "Recommended Applications"
|
||||
-msgstr "建議的應用程式"
|
||||
+msgstr "建議應用程式"
|
||||
|
||||
#: gtk/gtkappchooserwidget.c:741
|
||||
msgid "Related Applications"
|
||||
-msgstr "相關的應用程式"
|
||||
+msgstr "相關應用程式"
|
||||
|
||||
#: gtk/gtkappchooserwidget.c:755
|
||||
msgid "Other Applications"
|
||||
-msgstr "其他的應用程式"
|
||||
+msgstr "其他應用程式"
|
||||
|
||||
#: gtk/gtkapplicationwindow.c:345 gtk/gtkprintoperation-unix.c:485
|
||||
#: gtk/gtkprintoperation-win32.c:1589 gtk/inspector/prop-editor.c:1686
|
||||
@@ -1695,7 +1699,7 @@ msgstr "%s 不在書籤列表中"
|
||||
#: gtk/gtkbookmarksmanager.c:362
|
||||
#, c-format
|
||||
msgid "%s already exists in the bookmarks list"
|
||||
-msgstr "%s 已存在書籤列表中"
|
||||
+msgstr "%s 已在書籤列表中"
|
||||
|
||||
#: gtk/gtkbuilder-menus.c:223
|
||||
#, c-format
|
||||
@@ -2249,7 +2253,7 @@ msgstr "刪除(_D)"
|
||||
|
||||
#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
msgid "Select _All"
|
||||
-msgstr "全部選取(_A)"
|
||||
+msgstr "全選(_A)"
|
||||
|
||||
#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
msgid "Insert _Emoji"
|
||||
@@ -2257,7 +2261,7 @@ msgstr "插入繪文字(_E)"
|
||||
|
||||
#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
msgid "Select all"
|
||||
-msgstr "選擇全部"
|
||||
+msgstr "全選"
|
||||
|
||||
#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
msgid "Cut"
|
||||
@@ -2277,7 +2281,7 @@ msgstr "Caps Lock 已開啟"
|
||||
|
||||
#: gtk/gtkentry.c:11158
|
||||
msgid "Insert Emoji"
|
||||
-msgstr "插入顏文字"
|
||||
+msgstr "插入繪文字"
|
||||
|
||||
#: gtk/gtkfilechooserbutton.c:112
|
||||
msgid "Select a File"
|
||||
@@ -2379,7 +2383,7 @@ msgstr "檔案無法被刪除"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:895
|
||||
msgid "The file could not be moved to the Trash"
|
||||
-msgstr "檔案無法移至垃圾桶"
|
||||
+msgstr "檔案無法移到垃圾桶"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:1040
|
||||
msgid "A folder with that name already exists"
|
||||
@@ -2431,11 +2435,11 @@ msgstr "檔案名稱不能以空白結尾"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:1121
|
||||
msgid "Folder names starting with a “.” are hidden"
|
||||
-msgstr "以「.」開頭的資料夾名稱為隱藏"
|
||||
+msgstr "以「.」開頭的資料夾為隱藏狀態"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:1122
|
||||
msgid "File names starting with a “.” are hidden"
|
||||
-msgstr "以「.」開頭的檔案名稱為隱藏"
|
||||
+msgstr "以「.」開頭的檔案為隱藏狀態"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:1495
|
||||
#, c-format
|
||||
@@ -2445,7 +2449,7 @@ msgstr "確定要永遠刪除「%s」嗎？"
|
||||
#: gtk/gtkfilechooserwidget.c:1498
|
||||
#, c-format
|
||||
msgid "If you delete an item, it will be permanently lost."
|
||||
-msgstr "如果刪除本項目，它會無法還原。"
|
||||
+msgstr "若刪除本項目將永久遺失。"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:1635
|
||||
msgid "The file could not be renamed"
|
||||
@@ -2478,7 +2482,7 @@ msgstr "重新命名(_R)"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:2336
|
||||
msgid "_Move to Trash"
|
||||
-msgstr "移至垃圾桶(_M)"
|
||||
+msgstr "丟進垃圾桶(_M)"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:2340
|
||||
msgid "Show _Hidden Files"
|
||||
@@ -2498,7 +2502,7 @@ msgstr "顯示時間(_T)"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:2344
|
||||
msgid "Sort _Folders before Files"
|
||||
-msgstr "在檔案前先列出資料夾(_F)"
|
||||
+msgstr "在檔案前列出資料夾(_F)"
|
||||
|
||||
#. this is the header for the location column in the print dialog
|
||||
#: gtk/gtkfilechooserwidget.c:2626 gtk/inspector/css-node-tree.ui:141
|
||||
@@ -2531,7 +2535,7 @@ msgstr "輸入位置或 URL"
|
||||
#: gtk/gtkfilechooserwidget.c:4451 gtk/gtkfilechooserwidget.c:7493
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:278
|
||||
msgid "Modified"
|
||||
-msgstr "已修改"
|
||||
+msgstr "修改日期"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4729
|
||||
#, c-format
|
||||
@@ -2548,7 +2552,7 @@ msgstr "%H:%M"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4895 gtk/gtkfilechooserwidget.c:4943
|
||||
msgid "%l:%M %p"
|
||||
-msgstr "%p%l:%M"
|
||||
+msgstr "%p %l:%M"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:4899
|
||||
msgid "Yesterday"
|
||||
@@ -2585,11 +2589,11 @@ msgstr "封存檔"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5015
|
||||
msgid "Markup"
|
||||
-msgstr "標記"
|
||||
+msgstr "標記語言"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5016 gtk/gtkfilechooserwidget.c:5017
|
||||
msgid "Text"
|
||||
-msgstr "文字"
|
||||
+msgstr "文字檔"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:5019
|
||||
msgid "Video"
|
||||
@@ -2653,7 +2657,7 @@ msgstr "無法傳送搜尋要求"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:7704
|
||||
msgid "Accessed"
|
||||
-msgstr "存取時間"
|
||||
+msgstr "存取日期"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:8824 gtk/ui/gtkfilechooserwidget.ui:89
|
||||
msgid "Create Folder"
|
||||
@@ -2748,7 +2752,7 @@ msgstr "圖示「%s」不存在於佈景主題 %s 中"
|
||||
|
||||
#: gtk/gtkicontheme.c:4101 gtk/gtkicontheme.c:4468
|
||||
msgid "Failed to load icon"
|
||||
-msgstr "載入圖示失敗"
|
||||
+msgstr "無法載入圖示"
|
||||
|
||||
#: gtk/gtkimmodule.c:547
|
||||
msgctxt "input method menu"
|
||||
@@ -2992,7 +2996,7 @@ msgstr "密碼(_P)"
|
||||
|
||||
#: gtk/gtkmountoperation.c:755
|
||||
msgid "Forget password _immediately"
|
||||
-msgstr "立刻忘記密碼(_I)"
|
||||
+msgstr "立即忘記密碼(_I)"
|
||||
|
||||
#: gtk/gtkmountoperation.c:765
|
||||
msgid "Remember password until you _logout"
|
||||
@@ -3159,26 +3163,27 @@ msgstr "新增書籤"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:1473
|
||||
msgid "Connect to Server"
|
||||
-msgstr "連接伺服器"
|
||||
+msgstr "連線到伺服器"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:1475
|
||||
msgid "Connect to a network server address"
|
||||
-msgstr "連接到網路伺服器位址"
|
||||
+msgstr "連線到網路伺服器位址"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:1537
|
||||
msgid "Other Locations"
|
||||
-msgstr "其他的位置"
|
||||
+msgstr "其他位置"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:1538
|
||||
msgid "Show other locations"
|
||||
-msgstr "顯示其他的位置"
|
||||
+msgstr "顯示其他位置"
|
||||
|
||||
#. Adjust start/stop items to reflect the type of the drive
|
||||
#: gtk/gtkplacessidebar.c:2337 gtk/gtkplacessidebar.c:3716
|
||||
msgid "_Start"
|
||||
-msgstr "起動(_S)"
|
||||
+msgstr "啟動(_S)"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2338 gtk/gtkplacessidebar.c:3717
|
||||
+#, fuzzy
|
||||
msgid "_Stop"
|
||||
msgstr "關閉(_S)"
|
||||
|
||||
@@ -3244,7 +3249,7 @@ msgstr "名稱"
|
||||
#: gtk/gtkplacessidebar.c:2938
|
||||
#, c-format
|
||||
msgid "Unable to unmount “%s”"
|
||||
-msgstr "無法卸載 %s"
|
||||
+msgstr "無法卸載「%s」"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3114
|
||||
#, c-format
|
||||
@@ -3262,19 +3267,19 @@ msgid "Unable to eject %s"
|
||||
msgstr "無法退出 %s"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3349
|
||||
-#, c-format
|
||||
+#, fuzzy, c-format
|
||||
msgid "Unable to poll “%s” for media changes"
|
||||
msgstr "無法監測「%s」的媒體變更"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3633 gtk/gtkplacessidebar.c:3699
|
||||
#: gtk/gtkplacesview.c:1715
|
||||
msgid "Open in New _Tab"
|
||||
-msgstr "在新的分頁中開啟(_T)"
|
||||
+msgstr "在新分頁中開啟(_T)"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3639 gtk/gtkplacessidebar.c:3702
|
||||
#: gtk/gtkplacesview.c:1726
|
||||
msgid "Open in New _Window"
|
||||
-msgstr "在新的視窗中開啟(_W)"
|
||||
+msgstr "在新視窗中開啟(_W)"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3706
|
||||
msgid "_Add Bookmark"
|
||||
@@ -3393,7 +3398,7 @@ msgstr "網路"
|
||||
|
||||
#: gtk/gtkplacesview.c:2096 gtk/gtkplacesview.c:2105
|
||||
msgid "On This Computer"
|
||||
-msgstr "這臺電腦上"
|
||||
+msgstr "本機"
|
||||
|
||||
#. Translators: respectively, free and total space of the drive. The plural form
|
||||
#. * should be based on the free space available.
|
||||
@@ -3424,9 +3429,10 @@ msgstr "記住密碼(_R)"
|
||||
|
||||
#: gtk/gtkprinteroptionwidget.c:542
|
||||
msgid "Select a filename"
|
||||
-msgstr "選取檔案名稱"
|
||||
+msgstr "選擇檔案名稱"
|
||||
|
||||
#: gtk/gtkprinteroptionwidget.c:769
|
||||
+#, fuzzy
|
||||
msgid "Not available"
|
||||
msgstr "不存在"
|
||||
|
||||
@@ -3435,7 +3441,7 @@ msgstr "不存在"
|
||||
#. * by the job number.
|
||||
#.
|
||||
#: gtk/gtkprintoperation.c:259
|
||||
-#, c-format
|
||||
+#, fuzzy, c-format
|
||||
msgid "%s job #%d"
|
||||
msgstr "%s 的工作 #%d"
|
||||
|
||||
@@ -3810,7 +3816,7 @@ msgstr "兩指輕掃右方"
|
||||
|
||||
#: gtk/gtkshortcutswindow.c:929
|
||||
msgid "Shortcuts"
|
||||
-msgstr "捷徑鍵"
|
||||
+msgstr "鍵盤快捷鍵"
|
||||
|
||||
#: gtk/gtkshortcutswindow.c:934
|
||||
msgid "Search Results"
|
||||
@@ -3818,7 +3824,7 @@ msgstr "搜尋結果"
|
||||
|
||||
#: gtk/gtkshortcutswindow.c:988
|
||||
msgid "Search Shortcuts"
|
||||
-msgstr "搜尋捷徑鍵"
|
||||
+msgstr "搜尋鍵盤快捷鍵"
|
||||
|
||||
#: gtk/gtkshortcutswindow.c:1053 gtk/ui/gtkemojichooser.ui:376
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:353
|
||||
@@ -4424,7 +4430,7 @@ msgstr "是"
|
||||
|
||||
#: gtk/inspector/signals-list.ui:36
|
||||
msgid "Signal"
|
||||
-msgstr "信號"
|
||||
+msgstr "訊號"
|
||||
|
||||
#: gtk/inspector/signals-list.ui:50
|
||||
msgid "Connected"
|
||||
@@ -7159,7 +7165,7 @@ msgstr "食物和飲品"
|
||||
|
||||
#: gtk/ui/gtkemojichooser.ui:113 gtk/ui/gtkemojichooser.ui:272
|
||||
msgid "Travel & Places"
|
||||
-msgstr "旅遊和地點"
|
||||
+msgstr "旅行和地點"
|
||||
|
||||
#: gtk/ui/gtkemojichooser.ui:128 gtk/ui/gtkemojichooser.ui:287
|
||||
msgid "Activities"
|
||||
@@ -7347,8 +7353,8 @@ msgid ""
|
||||
"Specify one or more page ranges,\n"
|
||||
" e.g. 1–3, 7, 11"
|
||||
msgstr ""
|
||||
-"指定一或多個頁面範圍，\n"
|
||||
-"例如 1-3,7,11"
|
||||
+"指定其中 1 頁或多個頁面範圍，\n"
|
||||
+"例如：1-3,7,11"
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:276
|
||||
msgid "Pages"
|
||||
@@ -7363,6 +7369,7 @@ msgid "Copie_s:"
|
||||
msgstr "份數(_S)："
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:361
|
||||
+#, fuzzy
|
||||
msgid "C_ollate"
|
||||
msgstr "順序分頁(_O)"
|
||||
|
||||
@@ -7456,12 +7463,13 @@ msgstr "於(_T)："
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1007 gtk/ui/gtkprintunixdialog.ui:1009
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1028 gtk/ui/gtkprintunixdialog.ui:1030
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1037
|
||||
+#, fuzzy
|
||||
msgid ""
|
||||
"Specify the time of print,\n"
|
||||
" e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm"
|
||||
msgstr ""
|
||||
"指定列印的時刻格式，\n"
|
||||
-" 例如 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
|
||||
+"例如：15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
|
||||
|
||||
#: gtk/ui/gtkprintunixdialog.ui:1036
|
||||
msgid "Time of print"
|
||||
@@ -7729,7 +7737,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "越南文 (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@@ -7745,7 +7753,7 @@ msgstr "Waylandgtk"
|
||||
#: modules/input/imxim.c:26
|
||||
msgctxt "input method menu"
|
||||
msgid "X Input Method"
|
||||
-msgstr "一般輸入法 (XIM)"
|
||||
+msgstr "X 輸入法 (XIM)"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:1159
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:1468
|
||||
@@ -8275,7 +8283,7 @@ msgstr "輸出"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:537
|
||||
msgid "Print to File"
|
||||
-msgstr "列印至檔案"
|
||||
+msgstr "列印成檔案儲存"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:663
|
||||
msgid "PDF"
|
||||
@@ -8341,7 +8349,7 @@ msgstr "不明"
|
||||
|
||||
#. default filename used for print-to-test
|
||||
#: modules/printbackends/test/gtkprintbackendtest.c:232
|
||||
-#, c-format
|
||||
+#, fuzzy, c-format
|
||||
msgid "test-output.%s"
|
||||
msgstr "test-output.%s"
|
||||
|
||||
3168
debian/patches/Update-Croatian-translation-1.patch
vendored
Normal file
3168
debian/patches/Update-Croatian-translation-1.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
106
debian/patches/Update-Croatian-translation-2.patch
vendored
Normal file
106
debian/patches/Update-Croatian-translation-2.patch
vendored
Normal file
@ -0,0 +1,106 @@
|
||||
From: =?utf-8?q?Goran_Vidovi=C4=87?= <trebelnik2@gmail.com>
|
||||
Date: Thu, 29 Sep 2022 12:16:17 +0000
|
||||
Subject: Update Croatian translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po/hr.po | 32 ++++++++++++++++----------------
|
||||
1 file changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/po/hr.po b/po/hr.po
|
||||
index b257a15..d403b26 100644
|
||||
--- a/po/hr.po
|
||||
+++ b/po/hr.po
|
||||
@@ -5,8 +5,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-08-26 18:50+0000\n"
|
||||
-"PO-Revision-Date: 2022-08-28 16:42+0200\n"
|
||||
+"POT-Creation-Date: 2022-09-29 12:14+0000\n"
|
||||
+"PO-Revision-Date: 2022-09-29 14:15+0200\n"
|
||||
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
|
||||
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
|
||||
"Language: hr\n"
|
||||
@@ -2258,7 +2258,7 @@ msgstr "Odaberi _sve"
|
||||
|
||||
#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
msgid "Insert _Emoji"
|
||||
-msgstr "Umetni _smajli"
|
||||
+msgstr "Umetni _emotikoin"
|
||||
|
||||
#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
msgid "Select all"
|
||||
@@ -2282,7 +2282,7 @@ msgstr "Velika slova upaljena"
|
||||
|
||||
#: gtk/gtkentry.c:11158
|
||||
msgid "Insert Emoji"
|
||||
-msgstr "Umetni smajli"
|
||||
+msgstr "Umetni emotikoin"
|
||||
|
||||
#: gtk/gtkfilechooserbutton.c:112
|
||||
msgid "Select a File"
|
||||
@@ -2688,51 +2688,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nijedno"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Širina"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Debljina"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Ukošeno"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Nagib"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optička veličina"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Zadano"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligature"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Mala slova"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Male brojke"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Razmak brojeva"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Format brojeva"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Varijanta znakova"
|
||||
|
||||
150
debian/patches/Update-Croatian-translation-3.patch
vendored
Normal file
150
debian/patches/Update-Croatian-translation-3.patch
vendored
Normal file
@ -0,0 +1,150 @@
|
||||
From: =?utf-8?q?Goran_Vidovi=C4=87?= <trebelnik2@gmail.com>
|
||||
Date: Sun, 2 Oct 2022 14:37:54 +0000
|
||||
Subject: Update Croatian translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po/hr.po | 38 +++++++++++++++++++-------------------
|
||||
1 file changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/po/hr.po b/po/hr.po
|
||||
index d403b26..e8239b8 100644
|
||||
--- a/po/hr.po
|
||||
+++ b/po/hr.po
|
||||
@@ -5,8 +5,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-09-29 12:14+0000\n"
|
||||
-"PO-Revision-Date: 2022-09-29 14:15+0200\n"
|
||||
+"POT-Creation-Date: 2022-10-02 10:38+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-02 16:36+0200\n"
|
||||
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
|
||||
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
|
||||
"Language: hr\n"
|
||||
@@ -655,15 +655,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Zatvori"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Smanji"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Uvećaj"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Vrati"
|
||||
|
||||
@@ -1212,7 +1212,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1261,7 +1261,7 @@ msgid "_Apply"
|
||||
msgstr "_Primijeni"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_U redu"
|
||||
|
||||
@@ -1491,7 +1491,7 @@ msgstr "BSD 3-klauzula licence"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:130
|
||||
msgid "Apache License, Version 2.0"
|
||||
-msgstr "Apache Licenca, inačica 2.0"
|
||||
+msgstr "Apache licenca, inačica 2.0"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:131
|
||||
msgid "Mozilla Public License 2.0"
|
||||
@@ -1516,7 +1516,7 @@ msgstr "Nemoguće prikazati poveznicu"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:1043
|
||||
msgid "Website"
|
||||
-msgstr "Web stranica"
|
||||
+msgstr "Web naslovnica"
|
||||
|
||||
#. used for the application menu on MacOS. %s is replaced with the application name.
|
||||
#: gtk/gtkaboutdialog.c:1093 gtk/ui/gtkapplication-quartz.ui:7
|
||||
@@ -1526,11 +1526,11 @@ msgstr "O %s"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2320
|
||||
msgid "Created by"
|
||||
-msgstr "Stvorio"
|
||||
+msgstr "Stvorili"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2323
|
||||
msgid "Documented by"
|
||||
-msgstr "Dokumentirao"
|
||||
+msgstr "Dokumentirali"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2333
|
||||
msgid "Translated by"
|
||||
@@ -1538,7 +1538,7 @@ msgstr "Preveli"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:2338
|
||||
msgid "Artwork by"
|
||||
-msgstr "Dizajn"
|
||||
+msgstr "Grafika"
|
||||
|
||||
#. Translators: this is the license preamble; the string at the end
|
||||
#. * contains the name of the license as link text.
|
||||
@@ -2744,7 +2744,7 @@ msgstr "Neuspjelo stvaranje OpenGL sadržaja"
|
||||
msgid "Application menu"
|
||||
msgstr "Izbornik aplikacije"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Zatvori"
|
||||
|
||||
@@ -4025,24 +4025,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Pomakni"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Promijeni veličinu"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Uvijek na vrhu"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Želite li koristiti GTK+ Inspektora?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4053,7 +4053,7 @@ msgstr ""
|
||||
"otkrivanje i promjenu unutrašnjosti bilo koje GTK+ aplikacije. Njegovo "
|
||||
"korištenje može uzrokovati rušenje ili prekid u radu aplikacije."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Ne prikazuj više ovu poruku"
|
||||
|
||||
70
debian/patches/Update-Croatian-translation.patch
vendored
Normal file
70
debian/patches/Update-Croatian-translation.patch
vendored
Normal file
@ -0,0 +1,70 @@
|
||||
From: =?utf-8?q?Goran_Vidovi=C4=87?= <trebelnik2@gmail.com>
|
||||
Date: Sun, 28 Aug 2022 14:43:05 +0000
|
||||
Subject: Update Croatian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:1df4b908a8877689bba7b8d8ef4cc9fbc24a85dc
|
||||
---
|
||||
po/hr.po | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/po/hr.po b/po/hr.po
|
||||
index 487c7ce..b257a15 100644
|
||||
--- a/po/hr.po
|
||||
+++ b/po/hr.po
|
||||
@@ -5,8 +5,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-03-01 11:32+0000\n"
|
||||
-"PO-Revision-Date: 2022-03-01 13:41+0100\n"
|
||||
+"POT-Creation-Date: 2022-08-26 18:50+0000\n"
|
||||
+"PO-Revision-Date: 2022-08-28 16:42+0200\n"
|
||||
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
|
||||
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
|
||||
"Language: hr\n"
|
||||
@@ -17,7 +17,7 @@ msgstr ""
|
||||
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Repor4-Msgid-Bugs-To: \n"
|
||||
"X-Launchpad-Export-Date: 2017-04-10 20:36+0000\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -1443,11 +1443,11 @@ msgstr "GNU Opća Javna Licenca, inačice 3 ili novija"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:118
|
||||
msgid "GNU Lesser General Public License, version 2.1 or later"
|
||||
-msgstr "GNU Sažeta Opća Javna Licenca, inačice 2.1 ili novija"
|
||||
+msgstr "GNU Manja Opća Javna Licenca, inačice 2.1 ili novija"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:119
|
||||
msgid "GNU Lesser General Public License, version 3 or later"
|
||||
-msgstr "GNU Sažeta Opća Javna Licenca, inačice 3 ili novija"
|
||||
+msgstr "GNU Manja Opća Javna Licenca, inačice 3 ili novija"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:120
|
||||
msgid "BSD 2-Clause License"
|
||||
@@ -1471,11 +1471,11 @@ msgstr "GNU Opća Javna Licenca, samo inačica 3"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:125
|
||||
msgid "GNU Lesser General Public License, version 2.1 only"
|
||||
-msgstr "GNU Sažeta Opća Javna Licenca, samo inačica 2.1"
|
||||
+msgstr "GNU Manja Opća Javna Licenca, samo inačica 2.1"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:126
|
||||
msgid "GNU Lesser General Public License, version 3 only"
|
||||
-msgstr "GNU Sažeta Opća Javna Licenca, samo inačica 3"
|
||||
+msgstr "GNU Manja Opća Javna Licenca, samo inačica 3"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:127
|
||||
msgid "GNU Affero General Public License, version 3 or later"
|
||||
@@ -7752,7 +7752,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vijetnamski (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
286
debian/patches/Update-Dutch-translation.patch
vendored
Normal file
286
debian/patches/Update-Dutch-translation.patch
vendored
Normal file
@ -0,0 +1,286 @@
|
||||
From: Nathan Follens <nfollens@gnome.org>
|
||||
Date: Tue, 1 Nov 2022 23:08:40 +0000
|
||||
Subject: Update Dutch translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:230718c326a7e8a38b40439fa0636ad7189aeea3
|
||||
---
|
||||
po/nl.po | 96 +++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 53 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/po/nl.po b/po/nl.po
|
||||
index 6ffb34c..1c730f9 100644
|
||||
--- a/po/nl.po
|
||||
+++ b/po/nl.po
|
||||
@@ -28,8 +28,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-03-24 20:19+0000\n"
|
||||
-"PO-Revision-Date: 2022-03-25 11:59+0100\n"
|
||||
+"POT-Creation-Date: 2022-10-31 12:28+0000\n"
|
||||
+"PO-Revision-Date: 2022-11-02 00:07+0100\n"
|
||||
"Last-Translator: Nathan Follens <nfollens@gnome.org>\n"
|
||||
"Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
|
||||
"Language: nl\n"
|
||||
@@ -38,7 +38,7 @@ msgstr ""
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Launchpad-Export-Date: 2016-03-25 10:32+0000\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
"X-Project-Style: gnome\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
@@ -687,15 +687,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "Sl_uiten"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimaliseren"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maximaliseren"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Herstellen"
|
||||
|
||||
@@ -1274,7 +1274,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1329,7 +1329,7 @@ msgstr "Toe_passen"
|
||||
|
||||
# Ok/OK
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_Ok"
|
||||
|
||||
@@ -1698,14 +1698,24 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
+# NT - Numeriek Toetsenbord - Nathan
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "NT"
|
||||
+
|
||||
# (Was Spatie). Ik denk dat hier de spatiebalk wordt bedoeld, niet een spatie. In het Engels wordt zowel Spacebar als Space gebruikt. Het is wel verwarrend.
|
||||
# (Hannie)
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Spatiebalk"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Backslash"
|
||||
@@ -2318,52 +2328,52 @@ msgstr "_Rechts:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Papiermarges"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "K_nippen"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Kopiëren"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "_Plakken"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Verwijderen"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "_Alles selecteren"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "_Emoji invoegen"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Alles selecteren"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Knippen"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Kopiëren"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Plakken"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Caps Lock staat aan"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Emoji invoegen"
|
||||
|
||||
@@ -2796,53 +2806,53 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Geen"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Breedte"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Gewicht"
|
||||
|
||||
# _schuin/_schuingedrukt/_cursief
|
||||
# voorzover ik kan zien alleen in gucharmap gebruikt.
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Cursief"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Helling"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optische grootte"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Standaard"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligaturen"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Grote/kleine letters"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Grote/kleine cijfers"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Getalspatiëring"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Getalopmaak"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Tekenvarianten"
|
||||
|
||||
@@ -2854,7 +2864,7 @@ msgstr "OpenGL-context aanmaken is mislukt"
|
||||
msgid "Application menu"
|
||||
msgstr "Toepassingenmenu"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Sluiten"
|
||||
|
||||
@@ -4158,24 +4168,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Verplaatsen"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Grootte wijzigen"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Altijd bovenop"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Wilt u GTK+ Inspector gebruiken?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4186,7 +4196,7 @@ msgstr ""
|
||||
"inwendige van een GTK+ toepassing kunt verkennen en wijzigen. Het gebruik "
|
||||
"ervan kan ertoe leiden dat de toepassing afgebroken wordt of vastloopt."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Deze boodschap niet meer tonen"
|
||||
|
||||
@@ -7941,7 +7951,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamees (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
783
debian/patches/Update-Friulian-translation.patch
vendored
Normal file
783
debian/patches/Update-Friulian-translation.patch
vendored
Normal file
@ -0,0 +1,783 @@
|
||||
From: Fabio Tomat <f.t.public@gmail.com>
|
||||
Date: Mon, 3 Oct 2022 08:39:31 +0000
|
||||
Subject: Update Friulian translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po/fur.po | 268 +++++++++++++++++++++++++++++++-------------------------------
|
||||
1 file changed, 134 insertions(+), 134 deletions(-)
|
||||
|
||||
diff --git a/po/fur.po b/po/fur.po
|
||||
index 32ac4af..f9faf45 100644
|
||||
--- a/po/fur.po
|
||||
+++ b/po/fur.po
|
||||
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2021-09-16 01:12+0000\n"
|
||||
-"PO-Revision-Date: 2021-09-16 14:14+0200\n"
|
||||
+"POT-Creation-Date: 2022-10-02 14:38+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-03 10:38+0200\n"
|
||||
"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
|
||||
"Language-Team: Friulian <fur@li.org>\n"
|
||||
"Language: fur\n"
|
||||
@@ -16,7 +16,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
-"X-Generator: Poedit 3.0\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -471,19 +471,19 @@ msgid "Unable to create a GL pixel format"
|
||||
msgstr "Impussibil creâ un formât di pixel GL"
|
||||
|
||||
#: gdk/quartz/gdkglcontext-quartz.c:133 gdk/wayland/gdkglcontext-wayland.c:208
|
||||
-#: gdk/win32/gdkglcontext-win32.c:1100 gdk/win32/gdkglcontext-win32.c:1140
|
||||
+#: gdk/win32/gdkglcontext-win32.c:808 gdk/win32/gdkglcontext-win32.c:1258
|
||||
#: gdk/x11/gdkglcontext-x11.c:724 gdk/x11/gdkglcontext-x11.c:774
|
||||
msgid "Unable to create a GL context"
|
||||
msgstr "Impussibil creâ un contest GL"
|
||||
|
||||
#: gdk/wayland/gdkglcontext-wayland.c:418
|
||||
-#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:938
|
||||
-#: gdk/win32/gdkglcontext-win32.c:948 gdk/win32/gdkglcontext-win32.c:1065
|
||||
+#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:777
|
||||
+#: gdk/win32/gdkglcontext-win32.c:1136 gdk/win32/gdkglcontext-win32.c:1146
|
||||
#: gdk/x11/gdkglcontext-x11.c:975
|
||||
msgid "No available configurations for the given pixel format"
|
||||
msgstr "Nissune configurazion disponibile pal formât pixel furnît"
|
||||
|
||||
-#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1206
|
||||
+#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1491
|
||||
#: gdk/x11/gdkglcontext-x11.c:1281
|
||||
msgid "No GL implementation is available"
|
||||
msgstr "Nissune implementazion GL disponibile"
|
||||
@@ -613,11 +613,9 @@ msgid "Activates the expander"
|
||||
msgstr "Al ative l'espansôr"
|
||||
|
||||
#: gtk/a11y/gtkfilechooserwidgetaccessible.c:101
|
||||
-#, fuzzy
|
||||
-#| msgid "Show other locations"
|
||||
msgctxt "Action name"
|
||||
msgid "Show location"
|
||||
-msgstr "Mostre altris posizions"
|
||||
+msgstr "Mostre posizion"
|
||||
|
||||
#: gtk/a11y/gtkfilechooserwidgetaccessible.c:110
|
||||
msgctxt "Action description"
|
||||
@@ -657,15 +655,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Siere"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimize"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Slargje"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Ripristine"
|
||||
|
||||
@@ -1216,7 +1214,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1265,7 +1263,7 @@ msgid "_Apply"
|
||||
msgstr "_Apliche"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_Va ben"
|
||||
|
||||
@@ -1693,7 +1691,7 @@ msgid "Other Applications"
|
||||
msgstr "Altris aplicazions"
|
||||
|
||||
#: gtk/gtkapplicationwindow.c:345 gtk/gtkprintoperation-unix.c:485
|
||||
-#: gtk/gtkprintoperation-win32.c:1521 gtk/inspector/prop-editor.c:1686
|
||||
+#: gtk/gtkprintoperation-win32.c:1589 gtk/inspector/prop-editor.c:1686
|
||||
msgid "Application"
|
||||
msgstr "Aplicazion"
|
||||
|
||||
@@ -1889,7 +1887,7 @@ msgstr "No valit"
|
||||
msgid "New accelerator…"
|
||||
msgstr "Gnûf aceleradôr…"
|
||||
|
||||
-#: gtk/gtkcellrendererprogress.c:377 gtk/gtkcellrendererprogress.c:470
|
||||
+#: gtk/gtkcellrendererprogress.c:377 gtk/gtkcellrendererprogress.c:481
|
||||
#, c-format
|
||||
msgctxt "progress bar label"
|
||||
msgid "%d %%"
|
||||
@@ -2239,44 +2237,44 @@ msgstr "_Diestre:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Margjins cjarte"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9520
|
||||
+#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
msgid "Cu_t"
|
||||
msgstr "_Taie"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9524
|
||||
+#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
msgid "_Copy"
|
||||
msgstr "_Copie"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9526
|
||||
+#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
msgid "_Paste"
|
||||
msgstr "T_ache"
|
||||
|
||||
#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
msgid "_Delete"
|
||||
msgstr "_Elimine"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9543
|
||||
+#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
msgid "Select _All"
|
||||
msgstr "Selezione _dut"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9553
|
||||
+#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Inserìs _Emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9777
|
||||
+#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
msgid "Select all"
|
||||
msgstr "Selezione dut"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9780
|
||||
+#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
msgid "Cut"
|
||||
msgstr "Taie"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9783
|
||||
+#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
msgid "Copy"
|
||||
msgstr "Copie"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9786
|
||||
+#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
msgid "Paste"
|
||||
msgstr "Tache"
|
||||
|
||||
@@ -2292,7 +2290,7 @@ msgstr "Inserìs Emoji"
|
||||
msgid "Select a File"
|
||||
msgstr "Selezione un file"
|
||||
|
||||
-#: gtk/gtkfilechooserbutton.c:113 gtk/gtkplacessidebar.c:1109
|
||||
+#: gtk/gtkfilechooserbutton.c:113 gtk/gtkplacessidebar.c:1112
|
||||
msgid "Desktop"
|
||||
msgstr "Scritori"
|
||||
|
||||
@@ -2310,7 +2308,7 @@ msgstr "_Non"
|
||||
|
||||
#. Open item is always present
|
||||
#: gtk/gtkfilechoosernative.c:546 gtk/gtkfilechoosernative.c:631
|
||||
-#: gtk/gtkplacessidebar.c:3625 gtk/gtkplacessidebar.c:3693
|
||||
+#: gtk/gtkplacessidebar.c:3628 gtk/gtkplacessidebar.c:3696
|
||||
#: gtk/gtkplacesview.c:1705
|
||||
msgid "_Open"
|
||||
msgstr "_Vierç"
|
||||
@@ -2484,7 +2482,7 @@ msgstr "_Copie posizion"
|
||||
msgid "_Add to Bookmarks"
|
||||
msgstr "_Zonte tai Segnelibris"
|
||||
|
||||
-#: gtk/gtkfilechooserwidget.c:2334 gtk/gtkplacessidebar.c:2741
|
||||
+#: gtk/gtkfilechooserwidget.c:2334 gtk/gtkplacessidebar.c:2744
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:569
|
||||
msgid "_Rename"
|
||||
msgstr "_Cambie non"
|
||||
@@ -2633,7 +2631,7 @@ msgstr "Sfuei di calcul"
|
||||
msgid "Unknown"
|
||||
msgstr "No cognossût"
|
||||
|
||||
-#: gtk/gtkfilechooserwidget.c:5283 gtk/gtkplacessidebar.c:1094
|
||||
+#: gtk/gtkfilechooserwidget.c:5283 gtk/gtkplacessidebar.c:1097
|
||||
msgid "Home"
|
||||
msgstr "Home"
|
||||
|
||||
@@ -2696,54 +2694,54 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nissun"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1556
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Largjece"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1557
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Pês"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1558
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Corsîf"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1559
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Sclavueç"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1560
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Dimension otiche"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Predefinît"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2144
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Leaduris"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2145
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
#, fuzzy
|
||||
#| msgctxt "paper size"
|
||||
#| msgid "US Letter Plus"
|
||||
msgid "Letter Case"
|
||||
msgstr "US Letter Plus"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2146
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Capitalizazion dai numars"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2147
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Spaziadure dai numars"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2148
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Formatazion numars"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2149
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Variantis caratar"
|
||||
|
||||
@@ -2755,7 +2753,7 @@ msgstr "Creazion dal contest OpenGL falide"
|
||||
msgid "Application menu"
|
||||
msgstr "Menù aplicazion"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Siere"
|
||||
|
||||
@@ -3112,218 +3110,218 @@ msgid "File System Root"
|
||||
msgstr "Lidrîs dal filesystem"
|
||||
|
||||
#. translators: %s is the name of a cloud provider for files
|
||||
-#: gtk/gtkplacessidebar.c:981
|
||||
+#: gtk/gtkplacessidebar.c:984
|
||||
#, c-format
|
||||
msgid "Open %s"
|
||||
msgstr "Vierç %s"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1070 gtk/ui/gtkemojichooser.ui:197
|
||||
+#: gtk/gtkplacessidebar.c:1073 gtk/ui/gtkemojichooser.ui:197
|
||||
msgid "Recent"
|
||||
msgstr "Resint"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1072
|
||||
+#: gtk/gtkplacessidebar.c:1075
|
||||
msgid "Recent files"
|
||||
msgstr "File resints"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1082
|
||||
+#: gtk/gtkplacessidebar.c:1085
|
||||
msgid "Starred"
|
||||
msgstr "Preferîts"
|
||||
|
||||
#. TODO: Rename to 'Starred files'
|
||||
-#: gtk/gtkplacessidebar.c:1085
|
||||
+#: gtk/gtkplacessidebar.c:1088
|
||||
msgid "Favorite files"
|
||||
msgstr "File preferîts"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1096
|
||||
+#: gtk/gtkplacessidebar.c:1099
|
||||
msgid "Open your personal folder"
|
||||
msgstr "Vierç la cartele personâl"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1111
|
||||
+#: gtk/gtkplacessidebar.c:1114
|
||||
msgid "Open the contents of your desktop in a folder"
|
||||
msgstr "Vierç il contignût de scrivanie intune cartele"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1125
|
||||
+#: gtk/gtkplacessidebar.c:1128
|
||||
msgid "Enter Location"
|
||||
msgstr "Inserìs posizion"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1127
|
||||
+#: gtk/gtkplacessidebar.c:1130
|
||||
msgid "Manually enter a location"
|
||||
msgstr "Inserìs a man une posizion"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1137
|
||||
+#: gtk/gtkplacessidebar.c:1140
|
||||
msgid "Trash"
|
||||
msgstr "Scovacere"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1139
|
||||
+#: gtk/gtkplacessidebar.c:1142
|
||||
msgid "Open the trash"
|
||||
msgstr "Vierç la scovacere"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1248 gtk/gtkplacessidebar.c:1276
|
||||
-#: gtk/gtkplacessidebar.c:1491
|
||||
+#: gtk/gtkplacessidebar.c:1251 gtk/gtkplacessidebar.c:1279
|
||||
+#: gtk/gtkplacessidebar.c:1494
|
||||
#, c-format
|
||||
msgid "Mount and open “%s”"
|
||||
msgstr "Monte e vierç “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1371
|
||||
+#: gtk/gtkplacessidebar.c:1374
|
||||
msgid "Open the contents of the file system"
|
||||
msgstr "Vierç i contignûts dal filesystem"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1455
|
||||
+#: gtk/gtkplacessidebar.c:1458
|
||||
msgid "New bookmark"
|
||||
msgstr "Gnûf segnelibri"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1457
|
||||
+#: gtk/gtkplacessidebar.c:1460
|
||||
msgid "Add a new bookmark"
|
||||
msgstr "Zonte un gnûf segnelibri"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1470
|
||||
+#: gtk/gtkplacessidebar.c:1473
|
||||
msgid "Connect to Server"
|
||||
msgstr "Conet al servidôr"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1472
|
||||
+#: gtk/gtkplacessidebar.c:1475
|
||||
msgid "Connect to a network server address"
|
||||
msgstr "Conet a une direzion di servidôr di rêt"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1534
|
||||
+#: gtk/gtkplacessidebar.c:1537
|
||||
msgid "Other Locations"
|
||||
msgstr "Altris posizions"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1535
|
||||
+#: gtk/gtkplacessidebar.c:1538
|
||||
msgid "Show other locations"
|
||||
msgstr "Mostre altris posizions"
|
||||
|
||||
#. Adjust start/stop items to reflect the type of the drive
|
||||
-#: gtk/gtkplacessidebar.c:2334 gtk/gtkplacessidebar.c:3713
|
||||
+#: gtk/gtkplacessidebar.c:2337 gtk/gtkplacessidebar.c:3716
|
||||
msgid "_Start"
|
||||
msgstr "_Fâs partî"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2335 gtk/gtkplacessidebar.c:3714
|
||||
+#: gtk/gtkplacessidebar.c:2338 gtk/gtkplacessidebar.c:3717
|
||||
msgid "_Stop"
|
||||
msgstr "_Ferme"
|
||||
|
||||
#. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
|
||||
-#: gtk/gtkplacessidebar.c:2342
|
||||
+#: gtk/gtkplacessidebar.c:2345
|
||||
msgid "_Power On"
|
||||
msgstr "_Impie"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2343
|
||||
+#: gtk/gtkplacessidebar.c:2346
|
||||
msgid "_Safely Remove Drive"
|
||||
msgstr "_Gjave dispositîf in sigurece"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2347
|
||||
+#: gtk/gtkplacessidebar.c:2350
|
||||
msgid "_Connect Drive"
|
||||
msgstr "_Conet unitât"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2348
|
||||
+#: gtk/gtkplacessidebar.c:2351
|
||||
msgid "_Disconnect Drive"
|
||||
msgstr "_Disconet unitât"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2352
|
||||
+#: gtk/gtkplacessidebar.c:2355
|
||||
msgid "_Start Multi-disk Device"
|
||||
msgstr "_Fâs partî il dispositîf Multi-disc"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2353
|
||||
+#: gtk/gtkplacessidebar.c:2356
|
||||
msgid "_Stop Multi-disk Device"
|
||||
msgstr "_Ferme il dispositîf Multi-disc"
|
||||
|
||||
#. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
|
||||
-#: gtk/gtkplacessidebar.c:2358
|
||||
+#: gtk/gtkplacessidebar.c:2361
|
||||
msgid "_Unlock Device"
|
||||
msgstr "_Sbloche dispositîf"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2359
|
||||
+#: gtk/gtkplacessidebar.c:2362
|
||||
msgid "_Lock Device"
|
||||
msgstr "_Bloche dispositîf"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2397 gtk/gtkplacessidebar.c:3394
|
||||
+#: gtk/gtkplacessidebar.c:2400 gtk/gtkplacessidebar.c:3397
|
||||
#, c-format
|
||||
msgid "Unable to start “%s”"
|
||||
msgstr "Impussibil fâ partî “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2430
|
||||
+#: gtk/gtkplacessidebar.c:2433
|
||||
#, c-format
|
||||
msgid "Error unlocking “%s”"
|
||||
msgstr "Erôr tal sblocâ “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2432
|
||||
+#: gtk/gtkplacessidebar.c:2435
|
||||
#, c-format
|
||||
msgid "Unable to access “%s”"
|
||||
msgstr "Impussibil jentrâ in “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2666
|
||||
+#: gtk/gtkplacessidebar.c:2669
|
||||
msgid "This name is already taken"
|
||||
msgstr "Chest non al è za cjapât"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2735 gtk/inspector/actions.ui:43
|
||||
+#: gtk/gtkplacessidebar.c:2738 gtk/inspector/actions.ui:43
|
||||
#: gtk/inspector/css-node-tree.ui:39 gtk/inspector/object-tree.ui:110
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:220 gtk/ui/gtkfilechooserwidget.ui:543
|
||||
msgid "Name"
|
||||
msgstr "Non"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2935
|
||||
+#: gtk/gtkplacessidebar.c:2938
|
||||
#, c-format
|
||||
msgid "Unable to unmount “%s”"
|
||||
msgstr "Impussibil dismontâ “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3111
|
||||
+#: gtk/gtkplacessidebar.c:3114
|
||||
#, c-format
|
||||
msgid "Unable to stop “%s”"
|
||||
msgstr "Impussibil fermâ “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3140
|
||||
+#: gtk/gtkplacessidebar.c:3143
|
||||
#, c-format
|
||||
msgid "Unable to eject “%s”"
|
||||
msgstr "Impussibil parâ fûr “%s”"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3169 gtk/gtkplacessidebar.c:3198
|
||||
+#: gtk/gtkplacessidebar.c:3172 gtk/gtkplacessidebar.c:3201
|
||||
#, c-format
|
||||
msgid "Unable to eject %s"
|
||||
msgstr "Impussibil parâ fûr %s"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3346
|
||||
+#: gtk/gtkplacessidebar.c:3349
|
||||
#, c-format
|
||||
msgid "Unable to poll “%s” for media changes"
|
||||
msgstr "Impussibil interogâ “%s” pai cambiaments dai supuarts"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3630 gtk/gtkplacessidebar.c:3696
|
||||
+#: gtk/gtkplacessidebar.c:3633 gtk/gtkplacessidebar.c:3699
|
||||
#: gtk/gtkplacesview.c:1715
|
||||
msgid "Open in New _Tab"
|
||||
msgstr "Vierç intune gnove _schede"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3636 gtk/gtkplacessidebar.c:3699
|
||||
+#: gtk/gtkplacessidebar.c:3639 gtk/gtkplacessidebar.c:3702
|
||||
#: gtk/gtkplacesview.c:1726
|
||||
msgid "Open in New _Window"
|
||||
msgstr "Vierç intun gnûf _barcon"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3703
|
||||
+#: gtk/gtkplacessidebar.c:3706
|
||||
msgid "_Add Bookmark"
|
||||
msgstr "_Zonte segnelibri"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3704
|
||||
+#: gtk/gtkplacessidebar.c:3707
|
||||
msgid "_Remove"
|
||||
msgstr "_Gjave"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3705
|
||||
+#: gtk/gtkplacessidebar.c:3708
|
||||
msgid "Rename…"
|
||||
msgstr "Cambie non…"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3709 gtk/gtkplacesview.c:1760
|
||||
+#: gtk/gtkplacessidebar.c:3712 gtk/gtkplacesview.c:1760
|
||||
msgid "_Mount"
|
||||
msgstr "_Monte"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3710 gtk/gtkplacesview.c:1750
|
||||
+#: gtk/gtkplacessidebar.c:3713 gtk/gtkplacesview.c:1750
|
||||
msgid "_Unmount"
|
||||
msgstr "_Dismonte"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3711
|
||||
+#: gtk/gtkplacessidebar.c:3714
|
||||
msgid "_Eject"
|
||||
msgstr "Par_e fûr"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3712
|
||||
+#: gtk/gtkplacessidebar.c:3715
|
||||
msgid "_Detect Media"
|
||||
msgstr "_Rilevâ supuart"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:4158 gtk/gtkplacesview.c:1122
|
||||
+#: gtk/gtkplacessidebar.c:4161 gtk/gtkplacesview.c:1122
|
||||
msgid "Computer"
|
||||
msgstr "Computer"
|
||||
|
||||
@@ -3535,58 +3533,58 @@ msgstr "Il motîf plui probabil al è che nol è pussibil creâ un file temporan
|
||||
msgid "Print"
|
||||
msgstr "Stampe"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:631
|
||||
+#: gtk/gtkprintoperation-win32.c:654
|
||||
msgid "Printer offline"
|
||||
msgstr "Stampant distacade"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:633
|
||||
+#: gtk/gtkprintoperation-win32.c:656
|
||||
msgid "Out of paper"
|
||||
msgstr "Cjarte esauride"
|
||||
|
||||
#. Translators: this is a printer status.
|
||||
-#: gtk/gtkprintoperation-win32.c:635
|
||||
+#: gtk/gtkprintoperation-win32.c:658
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:2680
|
||||
msgid "Paused"
|
||||
msgstr "In pause"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:637
|
||||
+#: gtk/gtkprintoperation-win32.c:660
|
||||
msgid "Need user intervention"
|
||||
msgstr "Al è necessari l'intervent dal utent"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:742
|
||||
+#: gtk/gtkprintoperation-win32.c:765
|
||||
msgid "Custom size"
|
||||
msgstr "Dimension personalizade"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1613
|
||||
+#: gtk/gtkprintoperation-win32.c:1681
|
||||
msgid "No printer found"
|
||||
msgstr "Nissune stampant cjatade"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1640
|
||||
+#: gtk/gtkprintoperation-win32.c:1708
|
||||
msgid "Invalid argument to CreateDC"
|
||||
msgstr "Argoment no valit par CreateDC"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1676 gtk/gtkprintoperation-win32.c:1922
|
||||
+#: gtk/gtkprintoperation-win32.c:1744 gtk/gtkprintoperation-win32.c:1996
|
||||
msgid "Error from StartDoc"
|
||||
msgstr "Erôr dal StartDoc"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1777 gtk/gtkprintoperation-win32.c:1800
|
||||
-#: gtk/gtkprintoperation-win32.c:1848
|
||||
+#: gtk/gtkprintoperation-win32.c:1851 gtk/gtkprintoperation-win32.c:1874
|
||||
+#: gtk/gtkprintoperation-win32.c:1922
|
||||
msgid "Not enough free memory"
|
||||
msgstr "No vonde memorie libare"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1853
|
||||
+#: gtk/gtkprintoperation-win32.c:1927
|
||||
msgid "Invalid argument to PrintDlgEx"
|
||||
msgstr "Argoment no valit par PrintDlgEx"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1858
|
||||
+#: gtk/gtkprintoperation-win32.c:1932
|
||||
msgid "Invalid pointer to PrintDlgEx"
|
||||
msgstr "Pontadôr no valit par PrintDlgEx"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1863
|
||||
+#: gtk/gtkprintoperation-win32.c:1937
|
||||
msgid "Invalid handle to PrintDlgEx"
|
||||
msgstr "Gjestion no valide par PrintDlgEx"
|
||||
|
||||
-#: gtk/gtkprintoperation-win32.c:1868
|
||||
+#: gtk/gtkprintoperation-win32.c:1942
|
||||
msgid "Unspecified error"
|
||||
msgstr "Erôr no specificât"
|
||||
|
||||
@@ -4036,24 +4034,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Sposte"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Ridimensione"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Simpri denant"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Doprâ GTK+ Inspector?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4064,7 +4062,7 @@ msgstr ""
|
||||
"il didentri di cualsisei aplicazion GTK+.\n"
|
||||
"Doprantlu ae aplicazion si podarès causâ une interuzion o un colàs."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "No stâ mostrâ plui chest messaç"
|
||||
|
||||
@@ -4077,7 +4075,7 @@ msgstr "Ative"
|
||||
msgid "State"
|
||||
msgstr "Stât"
|
||||
|
||||
-#: gtk/inspector/actions.ui:30 gtk/inspector/general.ui:115
|
||||
+#: gtk/inspector/actions.ui:30 gtk/inspector/general.ui:196
|
||||
#: gtk/ui/gtkplacesview.ui:92
|
||||
msgid "Prefix"
|
||||
msgstr "Prefìs"
|
||||
@@ -4142,12 +4140,12 @@ msgstr "Valôr"
|
||||
msgid "Show data"
|
||||
msgstr "Mostre dâts"
|
||||
|
||||
-#: gtk/inspector/general.c:309
|
||||
+#: gtk/inspector/general.c:330
|
||||
msgctxt "GL version"
|
||||
msgid "None"
|
||||
msgstr "Nissune"
|
||||
|
||||
-#: gtk/inspector/general.c:310
|
||||
+#: gtk/inspector/general.c:331
|
||||
msgctxt "GL vendor"
|
||||
msgid "None"
|
||||
msgstr "Nissun"
|
||||
@@ -4160,23 +4158,31 @@ msgstr "Version GTK+"
|
||||
msgid "GDK Backend"
|
||||
msgstr "Backend GDK"
|
||||
|
||||
-#: gtk/inspector/general.ui:373
|
||||
+#: gtk/inspector/general.ui:115
|
||||
+msgid "Application ID"
|
||||
+msgstr "ID de aplicazion"
|
||||
+
|
||||
+#: gtk/inspector/general.ui:149
|
||||
+msgid "Resource Path"
|
||||
+msgstr "Percors de risorse"
|
||||
+
|
||||
+#: gtk/inspector/general.ui:454
|
||||
msgid "Display"
|
||||
msgstr "Visôr"
|
||||
|
||||
-#: gtk/inspector/general.ui:408
|
||||
+#: gtk/inspector/general.ui:489
|
||||
msgid "RGBA visual"
|
||||
msgstr "Visuâl RGBA"
|
||||
|
||||
-#: gtk/inspector/general.ui:442
|
||||
+#: gtk/inspector/general.ui:523
|
||||
msgid "Composited"
|
||||
msgstr "Composit"
|
||||
|
||||
-#: gtk/inspector/general.ui:489
|
||||
+#: gtk/inspector/general.ui:570
|
||||
msgid "GL Version"
|
||||
msgstr "Version GL"
|
||||
|
||||
-#: gtk/inspector/general.ui:524
|
||||
+#: gtk/inspector/general.ui:605
|
||||
msgid "GL Vendor"
|
||||
msgstr "Produtôr GL"
|
||||
|
||||
@@ -7206,14 +7212,12 @@ msgid "Flags"
|
||||
msgstr "Bandieris"
|
||||
|
||||
#: gtk/ui/gtkfilechooserdialog.ui:32
|
||||
-#, fuzzy
|
||||
-#| msgid "Focus Widget"
|
||||
msgid "File Chooser Widget"
|
||||
-msgstr "Widget focus"
|
||||
+msgstr "Widget seletôr file"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:22
|
||||
msgid "Places"
|
||||
-msgstr ""
|
||||
+msgstr "Puescj"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:47
|
||||
msgid "Browse Header Revealer"
|
||||
@@ -7225,19 +7229,15 @@ msgstr ""
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:75
|
||||
msgid "PathBar Layer"
|
||||
-msgstr ""
|
||||
+msgstr "Strât sbare dal percors"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:121
|
||||
-#, fuzzy
|
||||
-#| msgid "Location"
|
||||
msgid "Location Layer"
|
||||
-msgstr "Posizion"
|
||||
+msgstr "Strât de posizion"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:137
|
||||
-#, fuzzy
|
||||
-#| msgid "Search"
|
||||
msgid "Search Layer"
|
||||
-msgstr "Ricercje"
|
||||
+msgstr "Strât de ricercje"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:199
|
||||
msgid "Files"
|
||||
@@ -7765,7 +7765,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamite (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
13738
debian/patches/Update-Georgian-translation-1.patch
vendored
Normal file
13738
debian/patches/Update-Georgian-translation-1.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
475
debian/patches/Update-Georgian-translation-2.patch
vendored
Normal file
475
debian/patches/Update-Georgian-translation-2.patch
vendored
Normal file
@ -0,0 +1,475 @@
|
||||
From: Zurab Kargareteli <zuraxt@gmail.com>
|
||||
Date: Sun, 2 Oct 2022 10:38:04 +0000
|
||||
Subject: Update Georgian translation
|
||||
|
||||
Origin: upstream, 3.24.35
|
||||
---
|
||||
po-properties/ka.po | 106 ++++++++++++++++++++++++++--------------------------
|
||||
1 file changed, 53 insertions(+), 53 deletions(-)
|
||||
|
||||
diff --git a/po-properties/ka.po b/po-properties/ka.po
|
||||
index 264070b..223edf0 100644
|
||||
--- a/po-properties/ka.po
|
||||
+++ b/po-properties/ka.po
|
||||
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-07-22 22:23+0000\n"
|
||||
-"PO-Revision-Date: 2022-07-25 09:39+0200\n"
|
||||
+"POT-Creation-Date: 2022-10-01 01:35+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-02 12:37+0200\n"
|
||||
"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: ka\n"
|
||||
@@ -105,7 +105,7 @@ msgstr "პროდუქტის ID"
|
||||
|
||||
#: gdk/gdkdevice.c:289 gdk/gdkdevice.c:290
|
||||
msgid "Seat"
|
||||
-msgstr ""
|
||||
+msgstr "სავარძელი"
|
||||
|
||||
#: gdk/gdkdevice.c:306 gdk/gdkdevice.c:307
|
||||
msgid "Number of concurrent touches"
|
||||
@@ -219,7 +219,7 @@ msgstr ""
|
||||
#: gtk/deprecated/gtkthemingengine.c:247 gtk/gtkcssnode.c:638
|
||||
#: gtk/gtkprinter.c:121 gtk/gtkstack.c:516 gtk/gtktextmark.c:136
|
||||
msgid "Name"
|
||||
-msgstr ""
|
||||
+msgstr "სახელი"
|
||||
|
||||
#: gtk/deprecated/gtkaction.c:244
|
||||
msgid "A unique name for the action."
|
||||
@@ -261,7 +261,7 @@ msgstr ""
|
||||
|
||||
#: gtk/deprecated/gtkaction.c:342 gtk/deprecated/gtkstatusicon.c:279
|
||||
msgid "GIcon"
|
||||
-msgstr ""
|
||||
+msgstr "GIcon"
|
||||
|
||||
#: gtk/deprecated/gtkaction.c:343 gtk/deprecated/gtkstatusicon.c:280
|
||||
#: gtk/gtkcellrendererpixbuf.c:282 gtk/gtkimage.c:360
|
||||
@@ -330,7 +330,7 @@ msgstr ""
|
||||
#: gtk/deprecated/gtkaction.c:466 gtk/deprecated/gtkactiongroup.c:215
|
||||
#: gtk/gtkcellrenderer.c:308 gtk/gtkwidget.c:1159
|
||||
msgid "Sensitive"
|
||||
-msgstr ""
|
||||
+msgstr "მგრძნობიარე"
|
||||
|
||||
#: gtk/deprecated/gtkaction.c:467
|
||||
msgid "Whether the action is enabled."
|
||||
@@ -581,7 +581,7 @@ msgstr ""
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:247 gtk/gtkfontchooser.c:90
|
||||
msgid "Preview text"
|
||||
-msgstr ""
|
||||
+msgstr "ტექსტის გადახედვა"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:248 gtk/gtkfontchooser.c:91
|
||||
msgid "The text to display in order to demonstrate the selected font"
|
||||
@@ -737,7 +737,7 @@ msgstr ""
|
||||
|
||||
#: gtk/deprecated/gtkradioaction.c:120
|
||||
msgid "The value"
|
||||
-msgstr ""
|
||||
+msgstr "მნიშვნელობა"
|
||||
|
||||
#: gtk/deprecated/gtkradioaction.c:121
|
||||
msgid ""
|
||||
@@ -748,7 +748,7 @@ msgstr ""
|
||||
#: gtk/deprecated/gtkradioaction.c:139 gtk/gtkradiobutton.c:184
|
||||
#: gtk/gtkradiomenuitem.c:424 gtk/gtkradiotoolbutton.c:83
|
||||
msgid "Group"
|
||||
-msgstr ""
|
||||
+msgstr "GROUP"
|
||||
|
||||
#: gtk/deprecated/gtkradioaction.c:140
|
||||
msgid "The radio action whose group this action belongs to."
|
||||
@@ -1056,7 +1056,7 @@ msgstr ""
|
||||
|
||||
#: gtk/deprecated/gtktrayicon-x11.c:168 gtk/gtkbox.c:350
|
||||
msgid "Padding"
|
||||
-msgstr ""
|
||||
+msgstr "შევსება"
|
||||
|
||||
#: gtk/deprecated/gtktrayicon-x11.c:169
|
||||
msgid "Padding that should be put around icons in the tray"
|
||||
@@ -1130,7 +1130,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkaboutdialog.c:442
|
||||
msgid "License Type"
|
||||
-msgstr ""
|
||||
+msgstr "ლიცენზიის ტიპი"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:443
|
||||
msgid "The license type of the program"
|
||||
@@ -1438,7 +1438,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkapplication.c:877
|
||||
msgid "Menubar"
|
||||
-msgstr ""
|
||||
+msgstr "მენიუს ზოლი"
|
||||
|
||||
#: gtk/gtkapplication.c:878
|
||||
msgid "The GMenuModel for the menubar"
|
||||
@@ -1446,7 +1446,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkapplication.c:884
|
||||
msgid "Active window"
|
||||
-msgstr ""
|
||||
+msgstr "აქტიური ფანჯარა"
|
||||
|
||||
#: gtk/gtkapplication.c:885
|
||||
msgid "The window which most recently had focus"
|
||||
@@ -2030,7 +2030,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkcellrenderer.c:301
|
||||
msgid "visible"
|
||||
-msgstr ""
|
||||
+msgstr "ხილული"
|
||||
|
||||
#: gtk/gtkcellrenderer.c:302
|
||||
msgid "Display the cell"
|
||||
@@ -2245,7 +2245,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkcellrendererprogress.c:180 gtk/gtkcellrendererspinner.c:144
|
||||
msgid "Pulse"
|
||||
-msgstr ""
|
||||
+msgstr "პულსი"
|
||||
|
||||
#: gtk/gtkcellrendererprogress.c:181
|
||||
msgid ""
|
||||
@@ -2299,7 +2299,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkcellrendererspin.c:143 gtk/gtkscale.c:767 gtk/gtkspinbutton.c:395
|
||||
msgid "Digits"
|
||||
-msgstr ""
|
||||
+msgstr "ციფრები"
|
||||
|
||||
#: gtk/gtkcellrendererspin.c:144 gtk/gtkspinbutton.c:396
|
||||
msgid "The number of decimal places to display"
|
||||
@@ -2392,7 +2392,7 @@ msgstr ""
|
||||
#: gtk/gtkcellrenderertext.c:357 gtk/gtkentry.c:861 gtk/gtktexttag.c:309
|
||||
#: gtk/gtktextview.c:826
|
||||
msgid "Editable"
|
||||
-msgstr ""
|
||||
+msgstr "ჩასწორებადი"
|
||||
|
||||
#: gtk/gtkcellrenderertext.c:358 gtk/gtktexttag.c:310 gtk/gtktextview.c:827
|
||||
msgid "Whether the text can be modified by the user"
|
||||
@@ -2422,7 +2422,7 @@ msgstr ""
|
||||
#: gtk/gtkcellrenderertext.c:385 gtk/gtkcellrenderertext.c:386
|
||||
#: gtk/gtktexttag.c:349
|
||||
msgid "Font style"
|
||||
-msgstr ""
|
||||
+msgstr "ფონტის სტილი"
|
||||
|
||||
#: gtk/gtkcellrenderertext.c:393 gtk/gtkcellrenderertext.c:394
|
||||
#: gtk/gtktexttag.c:358
|
||||
@@ -2432,7 +2432,7 @@ msgstr ""
|
||||
#: gtk/gtkcellrenderertext.c:401 gtk/gtkcellrenderertext.c:402
|
||||
#: gtk/gtktexttag.c:367
|
||||
msgid "Font weight"
|
||||
-msgstr ""
|
||||
+msgstr "ფონტის წონა"
|
||||
|
||||
#: gtk/gtkcellrenderertext.c:409 gtk/gtkcellrenderertext.c:410
|
||||
#: gtk/gtktexttag.c:378
|
||||
@@ -3062,7 +3062,7 @@ msgstr "ID"
|
||||
|
||||
#: gtk/gtkcssnode.c:633
|
||||
msgid "Unique ID"
|
||||
-msgstr ""
|
||||
+msgstr "უნიკალური ID"
|
||||
|
||||
#: gtk/gtkcssnode.c:643 gtk/gtkswitch.c:894
|
||||
msgid "State"
|
||||
@@ -3578,7 +3578,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkentrycompletion.c:370 gtk/gtkiconview.c:445
|
||||
msgid "Text column"
|
||||
-msgstr ""
|
||||
+msgstr "ტექსტის სვეტი"
|
||||
|
||||
#: gtk/gtkentrycompletion.c:371
|
||||
msgid "The column of the model containing the strings."
|
||||
@@ -3860,7 +3860,7 @@ msgstr "სუბტიტრები"
|
||||
|
||||
#: gtk/gtkfixed.c:156 gtk/gtklayout.c:648 gtk/gtktreeviewcolumn.c:260
|
||||
msgid "X position"
|
||||
-msgstr ""
|
||||
+msgstr "X მდებარეობა"
|
||||
|
||||
#: gtk/gtkfixed.c:157 gtk/gtklayout.c:649
|
||||
msgid "X position of child widget"
|
||||
@@ -3868,7 +3868,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfixed.c:164 gtk/gtklayout.c:658
|
||||
msgid "Y position"
|
||||
-msgstr ""
|
||||
+msgstr "Y მდებარეობა"
|
||||
|
||||
#: gtk/gtkfixed.c:165 gtk/gtklayout.c:659
|
||||
msgid "Y position of child widget"
|
||||
@@ -3877,11 +3877,11 @@ msgstr ""
|
||||
#: gtk/gtkflowbox.c:3822 gtk/gtkiconview.c:408 gtk/gtklistbox.c:485
|
||||
#: gtk/gtktreeselection.c:131
|
||||
msgid "Selection mode"
|
||||
-msgstr ""
|
||||
+msgstr "მონიშვნის რეჟიმი"
|
||||
|
||||
#: gtk/gtkflowbox.c:3823 gtk/gtkiconview.c:409 gtk/gtklistbox.c:486
|
||||
msgid "The selection mode"
|
||||
-msgstr ""
|
||||
+msgstr "მონიშვნის რეჟიმი"
|
||||
|
||||
#: gtk/gtkflowbox.c:3836 gtk/gtkiconview.c:665 gtk/gtklistbox.c:493
|
||||
#: gtk/gtktreeview.c:1221
|
||||
@@ -3963,7 +3963,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkfontbutton.c:572
|
||||
msgid "Show size"
|
||||
-msgstr ""
|
||||
+msgstr "ზომის ჩვენება"
|
||||
|
||||
#: gtk/gtkfontbutton.c:573
|
||||
msgid "Whether selected font size is shown in the label"
|
||||
@@ -4255,7 +4255,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkiconview.c:490
|
||||
msgid "Number of columns"
|
||||
-msgstr ""
|
||||
+msgstr "სვეტების რაოდენობა"
|
||||
|
||||
#: gtk/gtkiconview.c:491
|
||||
msgid "Number of columns to display"
|
||||
@@ -4275,7 +4275,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkiconview.c:540
|
||||
msgid "Row Spacing"
|
||||
-msgstr ""
|
||||
+msgstr "რიგების დაშორება"
|
||||
|
||||
#: gtk/gtkiconview.c:541
|
||||
msgid "Space which is inserted between grid rows"
|
||||
@@ -4283,7 +4283,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkiconview.c:556
|
||||
msgid "Column Spacing"
|
||||
-msgstr ""
|
||||
+msgstr "სვეტების დაშორება"
|
||||
|
||||
#: gtk/gtkiconview.c:557
|
||||
msgid "Space which is inserted between grid columns"
|
||||
@@ -4291,7 +4291,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkiconview.c:572
|
||||
msgid "Margin"
|
||||
-msgstr ""
|
||||
+msgstr "ზღვარი"
|
||||
|
||||
#: gtk/gtkiconview.c:573
|
||||
msgid "Space which is inserted at the edges of the icon view"
|
||||
@@ -4308,11 +4308,11 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkiconview.c:605 gtk/gtktreeview.c:1060 gtk/gtktreeviewcolumn.c:351
|
||||
msgid "Reorderable"
|
||||
-msgstr ""
|
||||
+msgstr "გადალაგებადი"
|
||||
|
||||
#: gtk/gtkiconview.c:606 gtk/gtktreeview.c:1061
|
||||
msgid "View is reorderable"
|
||||
-msgstr ""
|
||||
+msgstr "ხედი გადალაგებადია"
|
||||
|
||||
#: gtk/gtkiconview.c:613 gtk/gtktreeview.c:1205
|
||||
msgid "Tooltip Column"
|
||||
@@ -4381,7 +4381,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkimage.c:328
|
||||
msgid "Animation"
|
||||
-msgstr ""
|
||||
+msgstr "ანიმაცია"
|
||||
|
||||
#: gtk/gtkimage.c:329
|
||||
msgid "GdkPixbufAnimation to display"
|
||||
@@ -4413,7 +4413,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkinfobar.c:465 gtk/gtksearchbar.c:425
|
||||
msgid "Show Close Button"
|
||||
-msgstr ""
|
||||
+msgstr "დახურვის ღილაკის ჩვენება"
|
||||
|
||||
#: gtk/gtkinfobar.c:466
|
||||
msgid "Whether to include a standard close button"
|
||||
@@ -4725,7 +4725,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkmenubutton.c:486
|
||||
msgid "Popup"
|
||||
-msgstr ""
|
||||
+msgstr "მხტუნარა"
|
||||
|
||||
#: gtk/gtkmenubutton.c:487
|
||||
msgid "The dropdown menu."
|
||||
@@ -4951,7 +4951,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkmenuitem.c:761 gtk/gtkpopovermenu.c:376
|
||||
msgid "Submenu"
|
||||
-msgstr ""
|
||||
+msgstr "ქვემენიუ"
|
||||
|
||||
#: gtk/gtkmenuitem.c:762
|
||||
msgid "The submenu attached to the menu item, or NULL if it has none"
|
||||
@@ -5337,7 +5337,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkoverlay.c:788
|
||||
msgid "Pass Through"
|
||||
-msgstr ""
|
||||
+msgstr "გატარება"
|
||||
|
||||
#: gtk/gtkoverlay.c:788
|
||||
msgid "Pass through input, does not affect main child"
|
||||
@@ -5595,7 +5595,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkpopover.c:1739
|
||||
msgid "Relative to"
|
||||
-msgstr ""
|
||||
+msgstr "ორიენტრირი"
|
||||
|
||||
#: gtk/gtkpopover.c:1740
|
||||
msgid "Widget the bubble window points to"
|
||||
@@ -5651,7 +5651,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkprinter.c:128
|
||||
msgid "Backend"
|
||||
-msgstr ""
|
||||
+msgstr "უკანბოლო"
|
||||
|
||||
#: gtk/gtkprinter.c:129
|
||||
msgid "Backend for the printer"
|
||||
@@ -5793,7 +5793,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkprintoperation.c:1147
|
||||
msgid "Job Name"
|
||||
-msgstr ""
|
||||
+msgstr "დავალების სახელი"
|
||||
|
||||
#: gtk/gtkprintoperation.c:1148
|
||||
msgid "A string used for identifying the print job."
|
||||
@@ -5965,7 +5965,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkprogressbar.c:309
|
||||
msgid "Show text"
|
||||
-msgstr ""
|
||||
+msgstr "ტექსტის ჩვენება"
|
||||
|
||||
#: gtk/gtkprogressbar.c:310
|
||||
msgid "Whether the progress is shown as text."
|
||||
@@ -6815,7 +6815,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtksettings.c:795
|
||||
msgid "Enable Animations"
|
||||
-msgstr ""
|
||||
+msgstr "ანიმაციების ჩართვა"
|
||||
|
||||
#: gtk/gtksettings.c:796
|
||||
msgid "Whether to enable toolkit-wide animations."
|
||||
@@ -7251,7 +7251,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkshortcutlabel.c:479 gtk/gtkshortcutsshortcut.c:537
|
||||
msgid "Accelerator"
|
||||
-msgstr ""
|
||||
+msgstr "ამაჩქარებელი"
|
||||
|
||||
#: gtk/gtkshortcutlabel.c:491
|
||||
msgid "Disabled text"
|
||||
@@ -7259,7 +7259,7 @@ msgstr "გათიშული ტექსტი"
|
||||
|
||||
#: gtk/gtkshortcutsgroup.c:322
|
||||
msgid "View"
|
||||
-msgstr ""
|
||||
+msgstr "ნახვა"
|
||||
|
||||
#: gtk/gtkshortcutsgroup.c:335 gtk/gtkshortcutsgroup.c:336
|
||||
#: gtk/gtkshortcutsshortcut.c:618 gtk/gtkshortcutsshortcut.c:619
|
||||
@@ -7382,7 +7382,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkspinbutton.c:419
|
||||
msgid "Wrap"
|
||||
-msgstr ""
|
||||
+msgstr "შემოხვევა"
|
||||
|
||||
#: gtk/gtkspinbutton.c:420
|
||||
msgid "Whether a spin button should wrap upon reaching its limits"
|
||||
@@ -7527,7 +7527,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtkstyleproperty.c:109
|
||||
msgid "Property name"
|
||||
-msgstr ""
|
||||
+msgstr "თვისების სახელი"
|
||||
|
||||
#: gtk/gtkstyleproperty.c:110
|
||||
msgid "The name of the property"
|
||||
@@ -7807,7 +7807,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktexttag.c:663
|
||||
msgid "Fallback"
|
||||
-msgstr ""
|
||||
+msgstr "გადართვა შეცდომის შემთხვევაში"
|
||||
|
||||
#: gtk/gtktexttag.c:664
|
||||
msgid "Whether font fallback is enabled."
|
||||
@@ -8039,7 +8039,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktextview.c:1063
|
||||
msgid "Monospace"
|
||||
-msgstr ""
|
||||
+msgstr "ერთსიგანიანი"
|
||||
|
||||
#: gtk/gtktextview.c:1064
|
||||
msgid "Whether to use a monospace font"
|
||||
@@ -8263,7 +8263,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktoolpalette.c:1012
|
||||
msgid "Exclusive"
|
||||
-msgstr ""
|
||||
+msgstr "ექსკლუზიური"
|
||||
|
||||
#: gtk/gtktoolpalette.c:1013
|
||||
msgid "Whether the item group should be the only expanded at a given time"
|
||||
@@ -8372,7 +8372,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktreeview.c:1082
|
||||
msgid "Enable Search"
|
||||
-msgstr ""
|
||||
+msgstr "ძებნის ჩართვა"
|
||||
|
||||
#: gtk/gtktreeview.c:1083
|
||||
msgid "View allows user to search through columns interactively"
|
||||
@@ -8380,7 +8380,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktreeview.c:1089
|
||||
msgid "Search Column"
|
||||
-msgstr ""
|
||||
+msgstr "ძებნის სვეტი"
|
||||
|
||||
#: gtk/gtktreeview.c:1090
|
||||
msgid "Model column to search through during interactive search"
|
||||
@@ -8542,7 +8542,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktreeviewcolumn.c:253 gtk/gtkwindow.c:783
|
||||
msgid "Resizable"
|
||||
-msgstr ""
|
||||
+msgstr "შეცვლადი ზომით"
|
||||
|
||||
#: gtk/gtktreeviewcolumn.c:254
|
||||
msgid "Column is user-resizable"
|
||||
@@ -8558,7 +8558,7 @@ msgstr ""
|
||||
|
||||
#: gtk/gtktreeviewcolumn.c:284
|
||||
msgid "Sizing"
|
||||
-msgstr ""
|
||||
+msgstr "ზომების შეცვლა"
|
||||
|
||||
#: gtk/gtktreeviewcolumn.c:285
|
||||
msgid "Resize mode of the column"
|
||||
12662
debian/patches/Update-Georgian-translation.patch
vendored
Normal file
12662
debian/patches/Update-Georgian-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
285
debian/patches/Update-Hungarian-translation-1.patch
vendored
Normal file
285
debian/patches/Update-Hungarian-translation-1.patch
vendored
Normal file
@ -0,0 +1,285 @@
|
||||
From: =?utf-8?b?QmFsw6F6cyDDmnI=?= <balazs@urbalazs.hu>
|
||||
Date: Sun, 30 Oct 2022 00:00:03 +0000
|
||||
Subject: Update Hungarian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:ae42ed0a187a268eef9a4cdea3907656085b86e6
|
||||
---
|
||||
po/hu.po | 95 ++++++++++++++++++++++++++++++++++------------------------------
|
||||
1 file changed, 51 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/po/hu.po b/po/hu.po
|
||||
index 570bbc6..24c248a 100644
|
||||
--- a/po/hu.po
|
||||
+++ b/po/hu.po
|
||||
@@ -11,8 +11,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-03-08 21:04+0000\n"
|
||||
-"PO-Revision-Date: 2022-03-11 02:14+0100\n"
|
||||
+"POT-Creation-Date: 2022-10-29 15:46+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-30 01:58+0200\n"
|
||||
"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
|
||||
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
|
||||
"Language: hu\n"
|
||||
@@ -657,15 +657,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Bezárás"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimalizálás"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maximalizálás"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Visszaállítás"
|
||||
|
||||
@@ -1217,7 +1217,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1266,7 +1266,7 @@ msgid "_Apply"
|
||||
msgstr "_Alkalmaz"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_OK"
|
||||
|
||||
@@ -1623,12 +1623,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "SZB"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Szóköz"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Fordított törtvonal"
|
||||
@@ -2241,52 +2250,52 @@ msgstr "J_obb:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Papírmargók"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "_Kivágás"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Másolás"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "_Beillesztés"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Törlés"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Ö_sszes kijelölése"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "_Emodzsi beszúrása"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Összes kijelölése"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Kivágás"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Másolás"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Beillesztés"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "A Caps Lock be van kapcsolva"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Emodzsi beszúrása"
|
||||
|
||||
@@ -2695,51 +2704,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nincs"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Szélesség"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Súly"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Dőlt"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Döntött"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optikai méret"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Alapértelmezett"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligatúrák"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Kis- és nagybetűk"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Számok mérete"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Számok távolsága"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Számformázás"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Karakterváltozatok"
|
||||
|
||||
@@ -2751,7 +2760,7 @@ msgstr "Az OpenGL környezet létrehozása sikertelen"
|
||||
msgid "Application menu"
|
||||
msgstr "Alkalmazásmenü"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Bezárás"
|
||||
|
||||
@@ -4032,24 +4041,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Mozgatás"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Átméretezés"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Mindig felül"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Szeretné használni a GTK+ vizsgálót?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4060,7 +4069,7 @@ msgstr ""
|
||||
"alkalmazás belső működésének felfedezését és módosítását. A használata miatt "
|
||||
"az alkalmazás hibásan működhet vagy összeomolhat."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Ne jelenjen meg többé ez az üzenet"
|
||||
|
||||
@@ -4156,12 +4165,10 @@ msgid "GDK Backend"
|
||||
msgstr "GDK háttérprogram"
|
||||
|
||||
#: gtk/inspector/general.ui:115
|
||||
-#| msgid "Application"
|
||||
msgid "Application ID"
|
||||
msgstr "Alkalmazásazonosító"
|
||||
|
||||
#: gtk/inspector/general.ui:149
|
||||
-#| msgid "Resources"
|
||||
msgid "Resource Path"
|
||||
msgstr "Erőforrás útvonala"
|
||||
|
||||
@@ -7764,7 +7771,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnami (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
3199
debian/patches/Update-Hungarian-translation.patch
vendored
Normal file
3199
debian/patches/Update-Hungarian-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
282
debian/patches/Update-Indonesian-translation.patch
vendored
Normal file
282
debian/patches/Update-Indonesian-translation.patch
vendored
Normal file
@ -0,0 +1,282 @@
|
||||
From: Kukuh Syafaat <kukuhsyafaat@gnome.org>
|
||||
Date: Thu, 3 Nov 2022 03:47:01 +0000
|
||||
Subject: Update Indonesian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:56eaeff89dda85ecc77167b63fb3624e0ffc0d92
|
||||
---
|
||||
po/id.po | 95 +++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 52 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/po/id.po b/po/id.po
|
||||
index 6dd9598..b0047b1 100644
|
||||
--- a/po/id.po
|
||||
+++ b/po/id.po
|
||||
@@ -13,8 +13,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ gtk-3-22\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-20 22:45+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-21 13:43+0700\n"
|
||||
+"POT-Creation-Date: 2022-11-01 23:09+0000\n"
|
||||
+"PO-Revision-Date: 2022-11-03 10:46+0700\n"
|
||||
"Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
|
||||
"Language-Team: Indonesian <gnome@i15n.org>\n"
|
||||
"Language: id\n"
|
||||
@@ -22,7 +22,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
-"X-Generator: Poedit 3.0\n"
|
||||
+"X-Generator: Poedit 3.2.1\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -660,15 +660,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Tutup"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimalkan"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maksimalkan"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Pulihkan"
|
||||
|
||||
@@ -1220,7 +1220,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1269,7 +1269,7 @@ msgid "_Apply"
|
||||
msgstr "Ter_apkan"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_Ok"
|
||||
|
||||
@@ -1626,12 +1626,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "KP"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Spasi"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Backslash"
|
||||
@@ -2244,52 +2253,52 @@ msgstr "_Kanan:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Margin Kertas"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Po_tong"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Salin"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Tem_pel"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Hapus"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Pilih Semu_a"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Sisipkan _Emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Pilih semua"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Potong"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Salin"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Tempel"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Caps Lock menyala"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Sisipkan Emoji"
|
||||
|
||||
@@ -2700,52 +2709,52 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nihil"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Lebar"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Bobot"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Miring"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Miring"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Ukuran Optik"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Baku"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligatura"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Huruf besar kecil"
|
||||
|
||||
# https://www.bamagazine.com/Text-type-typeface-s/105.htm
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Notasi angka"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Spasi Angka"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Format Angka"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Varian Karakter"
|
||||
|
||||
@@ -2757,7 +2766,7 @@ msgstr "Pembuatan konteks OpenGL gagal"
|
||||
msgid "Application menu"
|
||||
msgstr "Menu aplikasi"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Tutup"
|
||||
|
||||
@@ -4030,24 +4039,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Pindah"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Ubah Ukuran"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Selalu Paling Atas"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Apakah Anda ingin memakai GTK+ Inspector?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4058,7 +4067,7 @@ msgstr ""
|
||||
"mengeksplorasi dan mengubah internal dari sebarang aplikasi GTK+. Memakainya "
|
||||
"dapat menyebabkan aplikasi rusak atau remuk."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Jangan tunjukkan pesan ini lagi"
|
||||
|
||||
@@ -7758,7 +7767,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnam (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
283
debian/patches/Update-Norwegian-Bokm-l-translation.patch
vendored
Normal file
283
debian/patches/Update-Norwegian-Bokm-l-translation.patch
vendored
Normal file
@ -0,0 +1,283 @@
|
||||
From: Kjartan Maraas <kmaraas@gnome.org>
|
||||
Date: Fri, 4 Nov 2022 07:49:02 +0000
|
||||
Subject: =?utf-8?q?Update_Norwegian_Bokm=C3=A5l_translation?=
|
||||
|
||||
Origin: upstream, 3.24.35, commit:d3c39fb4385bb39ec4da273322f6e9ffea18fd4d
|
||||
---
|
||||
po/nb.po | 99 +++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 54 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/po/nb.po b/po/nb.po
|
||||
index dc01b8c..418fe2b 100644
|
||||
--- a/po/nb.po
|
||||
+++ b/po/nb.po
|
||||
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 3.24.x\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-03-15 08:56+0000\n"
|
||||
-"PO-Revision-Date: 2022-03-15 16:13+0100\n"
|
||||
+"POT-Creation-Date: 2022-11-03 03:47+0000\n"
|
||||
+"PO-Revision-Date: 2022-11-04 08:48+0100\n"
|
||||
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
|
||||
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
|
||||
"Language: nb\n"
|
||||
@@ -653,15 +653,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Lukk"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimer"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maksimer"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Gjenopprett"
|
||||
|
||||
@@ -1210,7 +1210,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1259,7 +1259,7 @@ msgid "_Apply"
|
||||
msgstr "_Bruk"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_OK"
|
||||
|
||||
@@ -1616,12 +1616,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "KP"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Mellomrom"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Backslash"
|
||||
@@ -2230,52 +2239,52 @@ msgstr "Høy_re:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Papirmarger"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Klipp u_t"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Kopier"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "_Lim inn"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Slett"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Velg _alt"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Sett inn _emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Velg alt"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Klipp ut"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Kopier"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Lim inn"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Caps Lock er på"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Sett inn emoji"
|
||||
|
||||
@@ -2686,51 +2695,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Ingen"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Bredde"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Vekt"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Kursiv"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Helling"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optisk størrelse"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Forvalg"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligaturer"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
-msgstr ""
|
||||
+msgstr "Bokstaver"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
-msgstr ""
|
||||
+msgstr "Tall"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Mellomrom for tall"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Tallformattering"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Tegnvarianter"
|
||||
|
||||
@@ -2742,7 +2751,7 @@ msgstr "Oppretting av OpenGL-kontekst feilet"
|
||||
msgid "Application menu"
|
||||
msgstr "Programmeny"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Lukk"
|
||||
|
||||
@@ -4020,24 +4029,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Flytt"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Endre størrelse"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Alltid øverst"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Vil du bruke GTK+ inspektør?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4048,7 +4057,7 @@ msgstr ""
|
||||
"endre interne detaljer av ethvert GTK+ program. Bruk av denne kan få "
|
||||
"programmet til å slutte å virke eller krasje."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Ikke vis denne meldingen igjen"
|
||||
|
||||
@@ -6637,7 +6646,7 @@ msgstr ""
|
||||
#: gtk/script-names.c:75
|
||||
msgctxt "Script"
|
||||
msgid "Old Persian"
|
||||
-msgstr ""
|
||||
+msgstr "Gammelpersisk"
|
||||
|
||||
#: gtk/script-names.c:76
|
||||
msgctxt "Script"
|
||||
@@ -7746,7 +7755,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamesisk (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
36
debian/patches/Update-Occitan-translation-1.patch
vendored
Normal file
36
debian/patches/Update-Occitan-translation-1.patch
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
From: =?utf-8?q?Quentin_PAG=C3=88S?= <pages_quentin@hotmail.com>
|
||||
Date: Tue, 26 Jul 2022 19:24:15 +0000
|
||||
Subject: Update Occitan translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:d71549942b4583d0cdc5ab472b842dbce8237c04
|
||||
---
|
||||
po/oc.po | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/po/oc.po b/po/oc.po
|
||||
index a9a6237..91db6c0 100644
|
||||
--- a/po/oc.po
|
||||
+++ b/po/oc.po
|
||||
@@ -8,8 +8,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ HEAD\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-07-22 12:42+0000\n"
|
||||
-"PO-Revision-Date: 2022-07-23 00:22+0200\n"
|
||||
+"POT-Creation-Date: 2022-07-26 11:14+0000\n"
|
||||
+"PO-Revision-Date: 2022-07-26 21:24+0200\n"
|
||||
"Last-Translator: Quentin PAGÈS\n"
|
||||
"Language-Team: Tot En Òc\n"
|
||||
"Language: oc\n"
|
||||
@@ -4081,10 +4081,8 @@ msgid "Resize"
|
||||
msgstr "Redimensionar"
|
||||
|
||||
#: gtk/gtkwindow.c:9343
|
||||
-#, fuzzy
|
||||
-#| msgid "Always"
|
||||
msgid "Always on Top"
|
||||
-msgstr "Totjorn"
|
||||
+msgstr "Totjorn en dessús"
|
||||
|
||||
#: gtk/gtkwindow.c:12778
|
||||
#, c-format
|
||||
835
debian/patches/Update-Occitan-translation.patch
vendored
Normal file
835
debian/patches/Update-Occitan-translation.patch
vendored
Normal file
@ -0,0 +1,835 @@
|
||||
From: =?utf-8?q?Quentin_PAG=C3=88S?= <pages_quentin@hotmail.com>
|
||||
Date: Fri, 22 Jul 2022 22:23:11 +0000
|
||||
Subject: Update Occitan translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:f5b78522a1a08559541f6d4102724ab798f82363
|
||||
---
|
||||
po/oc.po | 293 +++++++++++++++++++++++++++++----------------------------------
|
||||
1 file changed, 135 insertions(+), 158 deletions(-)
|
||||
|
||||
diff --git a/po/oc.po b/po/oc.po
|
||||
index 26cf837..a9a6237 100644
|
||||
--- a/po/oc.po
|
||||
+++ b/po/oc.po
|
||||
@@ -8,8 +8,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ HEAD\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2021-12-01 15:48+0000\n"
|
||||
-"PO-Revision-Date: 2021-12-02 16:46+0100\n"
|
||||
+"POT-Creation-Date: 2022-07-22 12:42+0000\n"
|
||||
+"PO-Revision-Date: 2022-07-23 00:22+0200\n"
|
||||
"Last-Translator: Quentin PAGÈS\n"
|
||||
"Language-Team: Tot En Òc\n"
|
||||
"Language: oc\n"
|
||||
@@ -17,7 +17,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
-"X-Generator: Poedit 3.0\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -626,7 +626,7 @@ msgstr "Afichar l'emplaçament"
|
||||
#: gtk/a11y/gtkfilechooserwidgetaccessible.c:110
|
||||
msgctxt "Action description"
|
||||
msgid "Show the File Chooser's Location text field"
|
||||
-msgstr ""
|
||||
+msgstr "Afichar lo camp tèxt d’emplaçament del selector de fichièr"
|
||||
|
||||
#. FIXME these need accelerators when appropriate, and
|
||||
#. * need the mnemonics to be rationalized
|
||||
@@ -1493,16 +1493,12 @@ msgid "GNU Affero General Public License, version 3 or later"
|
||||
msgstr "Licéncia publica generala GNU Affero, version 3 o ulteriora"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:128
|
||||
-#, fuzzy
|
||||
-#| msgid "GNU General Public License, version 3 only"
|
||||
msgid "GNU Affero General Public License, version 3 only"
|
||||
-msgstr "Licéncia publica generala GNU, version 3 unicament"
|
||||
+msgstr "Licéncia publica generala GNU Affero, version 3 solament"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:129
|
||||
-#, fuzzy
|
||||
-#| msgid "BSD 2-Clause License"
|
||||
msgid "BSD 3-Clause License"
|
||||
-msgstr "Licéncia BSD a 2 clausas"
|
||||
+msgstr "Licéncia BSD a 3 clausas"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:130
|
||||
msgid "Apache License, Version 2.0"
|
||||
@@ -1901,7 +1897,7 @@ msgstr "Invalid"
|
||||
msgid "New accelerator…"
|
||||
msgstr "Acorchi novèl…"
|
||||
|
||||
-#: gtk/gtkcellrendererprogress.c:377 gtk/gtkcellrendererprogress.c:470
|
||||
+#: gtk/gtkcellrendererprogress.c:377 gtk/gtkcellrendererprogress.c:481
|
||||
#, c-format
|
||||
msgctxt "progress bar label"
|
||||
msgid "%d %%"
|
||||
@@ -2251,44 +2247,44 @@ msgstr "_Dreita :"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Marges del papièr"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9520
|
||||
+#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
msgid "Cu_t"
|
||||
msgstr "_Talhar"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9524
|
||||
+#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
msgid "_Copy"
|
||||
msgstr "_Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9526
|
||||
+#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
msgid "_Paste"
|
||||
msgstr "_Pegar"
|
||||
|
||||
#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
msgid "_Delete"
|
||||
msgstr "_Suprimir"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9543
|
||||
+#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
msgid "Select _All"
|
||||
msgstr "Seleccionar _tot"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9553
|
||||
+#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Inserir un emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9777
|
||||
+#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
msgid "Select all"
|
||||
msgstr "Seleccionar tot"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9780
|
||||
+#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
msgid "Cut"
|
||||
msgstr "Talhar"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9783
|
||||
+#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
msgid "Copy"
|
||||
msgstr "Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9786
|
||||
+#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
msgid "Paste"
|
||||
msgstr "Pegar"
|
||||
|
||||
@@ -2304,7 +2300,7 @@ msgstr "Inserir un emoji"
|
||||
msgid "Select a File"
|
||||
msgstr "Seleccionar un fichièr"
|
||||
|
||||
-#: gtk/gtkfilechooserbutton.c:113 gtk/gtkplacessidebar.c:1109
|
||||
+#: gtk/gtkfilechooserbutton.c:113 gtk/gtkplacessidebar.c:1112
|
||||
msgid "Desktop"
|
||||
msgstr "Burèu"
|
||||
|
||||
@@ -2322,7 +2318,7 @@ msgstr "_Nom"
|
||||
|
||||
#. Open item is always present
|
||||
#: gtk/gtkfilechoosernative.c:546 gtk/gtkfilechoosernative.c:631
|
||||
-#: gtk/gtkplacessidebar.c:3625 gtk/gtkplacessidebar.c:3693
|
||||
+#: gtk/gtkplacessidebar.c:3628 gtk/gtkplacessidebar.c:3696
|
||||
#: gtk/gtkplacesview.c:1705
|
||||
msgid "_Open"
|
||||
msgstr "_Dobrir"
|
||||
@@ -2510,7 +2506,7 @@ msgstr "_Copiar l'emplaçament"
|
||||
msgid "_Add to Bookmarks"
|
||||
msgstr "A_pondre als signets"
|
||||
|
||||
-#: gtk/gtkfilechooserwidget.c:2334 gtk/gtkplacessidebar.c:2741
|
||||
+#: gtk/gtkfilechooserwidget.c:2334 gtk/gtkplacessidebar.c:2744
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:569
|
||||
msgid "_Rename"
|
||||
msgstr "_Renomenar…"
|
||||
@@ -2659,7 +2655,7 @@ msgstr "Fuèlh de calcul"
|
||||
msgid "Unknown"
|
||||
msgstr "Desconegut"
|
||||
|
||||
-#: gtk/gtkfilechooserwidget.c:5283 gtk/gtkplacessidebar.c:1094
|
||||
+#: gtk/gtkfilechooserwidget.c:5283 gtk/gtkplacessidebar.c:1097
|
||||
msgid "Home"
|
||||
msgstr "Dorsièr personal"
|
||||
|
||||
@@ -2720,58 +2716,53 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Pas cap"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1601
|
||||
+#: gtk/gtkfontchooserwidget.c:1602
|
||||
msgid "Width"
|
||||
msgstr "Largor"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1603
|
||||
msgid "Weight"
|
||||
msgstr "Graissa"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Italic"
|
||||
msgstr "Italica"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Slant"
|
||||
msgstr ""
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Optical Size"
|
||||
msgstr "Talha optica"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2305 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Per defaut"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2352
|
||||
+#: gtk/gtkfontchooserwidget.c:2353
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligaturas"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
-#, fuzzy
|
||||
-#| msgctxt "paper size"
|
||||
-#| msgid "US Letter Plus"
|
||||
+#: gtk/gtkfontchooserwidget.c:2354
|
||||
msgid "Letter Case"
|
||||
-msgstr "US Letter Plus"
|
||||
+msgstr "Cassa de las letras"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Number Case"
|
||||
msgstr "Cassa del nombres"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Number Spacing"
|
||||
msgstr "Espaçament dels nombres"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Formatting"
|
||||
msgstr "Mesa en forma dels nombres"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
-#, fuzzy
|
||||
-#| msgid "Dark Variant"
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Character Variants"
|
||||
-msgstr "Varianta escura"
|
||||
+msgstr "Variantas de caractèrs"
|
||||
|
||||
#: gtk/gtkglarea.c:314
|
||||
msgid "OpenGL context creation failed"
|
||||
@@ -3030,11 +3021,8 @@ msgid "_Hidden"
|
||||
msgstr "_Amagats"
|
||||
|
||||
#: gtk/gtkmountoperation.c:724
|
||||
-#, fuzzy
|
||||
-#| msgctxt "input method menu"
|
||||
-#| msgid "Windows IME"
|
||||
msgid "_Windows system"
|
||||
-msgstr "Windows IME"
|
||||
+msgstr "_Gestionari de fenèstras"
|
||||
|
||||
#: gtk/gtkmountoperation.c:727
|
||||
msgid "_PIM"
|
||||
@@ -3149,226 +3137,221 @@ msgid "File System Root"
|
||||
msgstr "Raiç del sistèma de fichièrs"
|
||||
|
||||
#. translators: %s is the name of a cloud provider for files
|
||||
-#: gtk/gtkplacessidebar.c:981
|
||||
+#: gtk/gtkplacessidebar.c:984
|
||||
#, c-format
|
||||
msgid "Open %s"
|
||||
msgstr "Dobrir %s"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1070 gtk/ui/gtkemojichooser.ui:197
|
||||
+#: gtk/gtkplacessidebar.c:1073 gtk/ui/gtkemojichooser.ui:197
|
||||
msgid "Recent"
|
||||
msgstr "Recents"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1072
|
||||
+#: gtk/gtkplacessidebar.c:1075
|
||||
msgid "Recent files"
|
||||
msgstr "Fichièrs recents"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1082
|
||||
-#, fuzzy
|
||||
-#| msgid "_Start"
|
||||
+#: gtk/gtkplacessidebar.c:1085
|
||||
msgid "Starred"
|
||||
-msgstr "A_viar"
|
||||
+msgstr "Favorit"
|
||||
|
||||
#. TODO: Rename to 'Starred files'
|
||||
-#: gtk/gtkplacessidebar.c:1085
|
||||
-#, fuzzy
|
||||
-#| msgctxt "printer option"
|
||||
-#| msgid "Printer Profile"
|
||||
+#: gtk/gtkplacessidebar.c:1088
|
||||
msgid "Favorite files"
|
||||
-msgstr "Perfil d'imprimenta"
|
||||
+msgstr "Fichièrs favorits"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1096
|
||||
+#: gtk/gtkplacessidebar.c:1099
|
||||
msgid "Open your personal folder"
|
||||
msgstr "Dobrís vòstre dorsièr personal"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1111
|
||||
+#: gtk/gtkplacessidebar.c:1114
|
||||
msgid "Open the contents of your desktop in a folder"
|
||||
msgstr "Dobrís lo contengut de vòstre burèu dins un dorsièr"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1125
|
||||
+#: gtk/gtkplacessidebar.c:1128
|
||||
msgid "Enter Location"
|
||||
msgstr "Picar un emplaçament"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1127
|
||||
+#: gtk/gtkplacessidebar.c:1130
|
||||
msgid "Manually enter a location"
|
||||
msgstr "Picar manualament un emplaçament"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1137
|
||||
+#: gtk/gtkplacessidebar.c:1140
|
||||
msgid "Trash"
|
||||
msgstr "Escobilhièr"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1139
|
||||
+#: gtk/gtkplacessidebar.c:1142
|
||||
msgid "Open the trash"
|
||||
msgstr "Dobrís l'escobilhièr"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1248 gtk/gtkplacessidebar.c:1276
|
||||
-#: gtk/gtkplacessidebar.c:1491
|
||||
+#: gtk/gtkplacessidebar.c:1251 gtk/gtkplacessidebar.c:1279
|
||||
+#: gtk/gtkplacessidebar.c:1494
|
||||
#, c-format
|
||||
msgid "Mount and open “%s”"
|
||||
msgstr "Montar e dobrir « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1371
|
||||
+#: gtk/gtkplacessidebar.c:1374
|
||||
msgid "Open the contents of the file system"
|
||||
msgstr "Dobrís lo contengut del sistèma de fichièrs"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1455
|
||||
+#: gtk/gtkplacessidebar.c:1458
|
||||
msgid "New bookmark"
|
||||
msgstr "Signet novèl"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1457
|
||||
+#: gtk/gtkplacessidebar.c:1460
|
||||
msgid "Add a new bookmark"
|
||||
msgstr "Apondre un signet novèl"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1470
|
||||
+#: gtk/gtkplacessidebar.c:1473
|
||||
msgid "Connect to Server"
|
||||
msgstr "Connexion a un servidor"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1472
|
||||
+#: gtk/gtkplacessidebar.c:1475
|
||||
msgid "Connect to a network server address"
|
||||
msgstr "Se connècta a una adreça d'un servidor de la ret"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1534
|
||||
+#: gtk/gtkplacessidebar.c:1537
|
||||
msgid "Other Locations"
|
||||
msgstr "Autres emplaçaments"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:1535
|
||||
+#: gtk/gtkplacessidebar.c:1538
|
||||
msgid "Show other locations"
|
||||
msgstr "Afichar d'autres emplaçaments"
|
||||
|
||||
#. Adjust start/stop items to reflect the type of the drive
|
||||
-#: gtk/gtkplacessidebar.c:2334 gtk/gtkplacessidebar.c:3713
|
||||
+#: gtk/gtkplacessidebar.c:2337 gtk/gtkplacessidebar.c:3716
|
||||
msgid "_Start"
|
||||
msgstr "A_viar"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2335 gtk/gtkplacessidebar.c:3714
|
||||
+#: gtk/gtkplacessidebar.c:2338 gtk/gtkplacessidebar.c:3717
|
||||
msgid "_Stop"
|
||||
msgstr "_Arrestar"
|
||||
|
||||
#. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
|
||||
-#: gtk/gtkplacessidebar.c:2342
|
||||
+#: gtk/gtkplacessidebar.c:2345
|
||||
msgid "_Power On"
|
||||
msgstr "A_lucar"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2343
|
||||
+#: gtk/gtkplacessidebar.c:2346
|
||||
msgid "_Safely Remove Drive"
|
||||
msgstr "L_evar lo volum sens risc"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2347
|
||||
+#: gtk/gtkplacessidebar.c:2350
|
||||
msgid "_Connect Drive"
|
||||
msgstr "_Connectar lo volum"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2348
|
||||
+#: gtk/gtkplacessidebar.c:2351
|
||||
msgid "_Disconnect Drive"
|
||||
msgstr "_Desconnectar lo volum"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2352
|
||||
+#: gtk/gtkplacessidebar.c:2355
|
||||
msgid "_Start Multi-disk Device"
|
||||
msgstr "A_viar l'aparelh multidisc"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2353
|
||||
+#: gtk/gtkplacessidebar.c:2356
|
||||
msgid "_Stop Multi-disk Device"
|
||||
msgstr "_Arrestar l'aparelh multidisc"
|
||||
|
||||
#. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
|
||||
-#: gtk/gtkplacessidebar.c:2358
|
||||
+#: gtk/gtkplacessidebar.c:2361
|
||||
msgid "_Unlock Device"
|
||||
msgstr "_Desverrolhar lo volum"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2359
|
||||
+#: gtk/gtkplacessidebar.c:2362
|
||||
msgid "_Lock Device"
|
||||
msgstr "_Verrolhar lo volum"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2397 gtk/gtkplacessidebar.c:3394
|
||||
+#: gtk/gtkplacessidebar.c:2400 gtk/gtkplacessidebar.c:3397
|
||||
#, c-format
|
||||
msgid "Unable to start “%s”"
|
||||
msgstr "Impossible d'aviar « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2430
|
||||
+#: gtk/gtkplacessidebar.c:2433
|
||||
#, c-format
|
||||
msgid "Error unlocking “%s”"
|
||||
msgstr "Error en desverrolhant « %s »."
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2432
|
||||
+#: gtk/gtkplacessidebar.c:2435
|
||||
#, c-format
|
||||
msgid "Unable to access “%s”"
|
||||
msgstr "Impossible d'accedir a « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2666
|
||||
+#: gtk/gtkplacessidebar.c:2669
|
||||
msgid "This name is already taken"
|
||||
msgstr "Aqueste nom es ja atribuit"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2735 gtk/inspector/actions.ui:43
|
||||
+#: gtk/gtkplacessidebar.c:2738 gtk/inspector/actions.ui:43
|
||||
#: gtk/inspector/css-node-tree.ui:39 gtk/inspector/object-tree.ui:110
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:220 gtk/ui/gtkfilechooserwidget.ui:543
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:2935
|
||||
+#: gtk/gtkplacessidebar.c:2938
|
||||
#, c-format
|
||||
msgid "Unable to unmount “%s”"
|
||||
msgstr "Impossible de desmontar « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3111
|
||||
+#: gtk/gtkplacessidebar.c:3114
|
||||
#, c-format
|
||||
msgid "Unable to stop “%s”"
|
||||
msgstr "Impossible d'arrestar « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3140
|
||||
+#: gtk/gtkplacessidebar.c:3143
|
||||
#, c-format
|
||||
msgid "Unable to eject “%s”"
|
||||
msgstr "Impossible d'ejectar « %s »"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3169 gtk/gtkplacessidebar.c:3198
|
||||
+#: gtk/gtkplacessidebar.c:3172 gtk/gtkplacessidebar.c:3201
|
||||
#, c-format
|
||||
msgid "Unable to eject %s"
|
||||
msgstr "Impossible d'ejectar %s"
|
||||
|
||||
# https://developer.gnome.org/gio/2.36/GDrive.html#g-drive-poll-for-media
|
||||
-#: gtk/gtkplacessidebar.c:3346
|
||||
+#: gtk/gtkplacessidebar.c:3349
|
||||
#, c-format
|
||||
msgid "Unable to poll “%s” for media changes"
|
||||
msgstr ""
|
||||
"Impossible d'inspectar « %s » per saber se de mèdias son estats inserits o "
|
||||
"levats"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3630 gtk/gtkplacessidebar.c:3696
|
||||
+#: gtk/gtkplacessidebar.c:3633 gtk/gtkplacessidebar.c:3699
|
||||
#: gtk/gtkplacesview.c:1715
|
||||
msgid "Open in New _Tab"
|
||||
msgstr "Dobrir dins un _onglet novèl"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3636 gtk/gtkplacessidebar.c:3699
|
||||
+#: gtk/gtkplacessidebar.c:3639 gtk/gtkplacessidebar.c:3702
|
||||
#: gtk/gtkplacesview.c:1726
|
||||
msgid "Open in New _Window"
|
||||
msgstr "Dobrir dins una _fenèstra novèla"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3703
|
||||
+#: gtk/gtkplacessidebar.c:3706
|
||||
msgid "_Add Bookmark"
|
||||
msgstr "A_pondre lo signet"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3704
|
||||
+#: gtk/gtkplacessidebar.c:3707
|
||||
msgid "_Remove"
|
||||
msgstr "_Suprimir"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3705
|
||||
+#: gtk/gtkplacessidebar.c:3708
|
||||
msgid "Rename…"
|
||||
msgstr "Renomenar…"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3709 gtk/gtkplacesview.c:1760
|
||||
+#: gtk/gtkplacessidebar.c:3712 gtk/gtkplacesview.c:1760
|
||||
msgid "_Mount"
|
||||
msgstr "_Montar"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3710 gtk/gtkplacesview.c:1750
|
||||
+#: gtk/gtkplacessidebar.c:3713 gtk/gtkplacesview.c:1750
|
||||
msgid "_Unmount"
|
||||
msgstr "_Desmontar"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3711
|
||||
+#: gtk/gtkplacessidebar.c:3714
|
||||
msgid "_Eject"
|
||||
msgstr "E_jectar"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:3712
|
||||
+#: gtk/gtkplacessidebar.c:3715
|
||||
msgid "_Detect Media"
|
||||
msgstr "_Detectar los mèdias"
|
||||
|
||||
-#: gtk/gtkplacessidebar.c:4158 gtk/gtkplacesview.c:1122
|
||||
+#: gtk/gtkplacessidebar.c:4161 gtk/gtkplacesview.c:1122
|
||||
msgid "Computer"
|
||||
msgstr "Ordenador"
|
||||
|
||||
@@ -3402,7 +3385,7 @@ msgstr "Anu_llar"
|
||||
|
||||
#: gtk/gtkplacesview.c:1657
|
||||
msgid "AppleTalk"
|
||||
-msgstr ""
|
||||
+msgstr "AppleTalk"
|
||||
|
||||
#. Translators: do not translate ftp:// and ftps://
|
||||
#: gtk/gtkplacesview.c:1661
|
||||
@@ -4132,7 +4115,7 @@ msgstr "Activar"
|
||||
msgid "State"
|
||||
msgstr "Estat"
|
||||
|
||||
-#: gtk/inspector/actions.ui:30 gtk/inspector/general.ui:115
|
||||
+#: gtk/inspector/actions.ui:30 gtk/inspector/general.ui:196
|
||||
#: gtk/ui/gtkplacesview.ui:92
|
||||
msgid "Prefix"
|
||||
msgstr "Prefix"
|
||||
@@ -4197,12 +4180,12 @@ msgstr "Valor"
|
||||
msgid "Show data"
|
||||
msgstr "Aficha las donadas"
|
||||
|
||||
-#: gtk/inspector/general.c:309
|
||||
+#: gtk/inspector/general.c:330
|
||||
msgctxt "GL version"
|
||||
msgid "None"
|
||||
msgstr "Pas cap"
|
||||
|
||||
-#: gtk/inspector/general.c:310
|
||||
+#: gtk/inspector/general.c:331
|
||||
msgctxt "GL vendor"
|
||||
msgid "None"
|
||||
msgstr "Pas cap"
|
||||
@@ -4215,23 +4198,33 @@ msgstr "Version de GTK+"
|
||||
msgid "GDK Backend"
|
||||
msgstr "Motor GDK"
|
||||
|
||||
-#: gtk/inspector/general.ui:373
|
||||
+#: gtk/inspector/general.ui:115
|
||||
+msgid "Application ID"
|
||||
+msgstr "ID de l'aplicacion"
|
||||
+
|
||||
+#: gtk/inspector/general.ui:149
|
||||
+#, fuzzy
|
||||
+#| msgid "Resources"
|
||||
+msgid "Resource Path"
|
||||
+msgstr "Ressorsas"
|
||||
+
|
||||
+#: gtk/inspector/general.ui:454
|
||||
msgid "Display"
|
||||
msgstr "Afichatge"
|
||||
|
||||
-#: gtk/inspector/general.ui:408
|
||||
+#: gtk/inspector/general.ui:489
|
||||
msgid "RGBA visual"
|
||||
msgstr "Visual RGBA"
|
||||
|
||||
-#: gtk/inspector/general.ui:442
|
||||
+#: gtk/inspector/general.ui:523
|
||||
msgid "Composited"
|
||||
msgstr "Compausat"
|
||||
|
||||
-#: gtk/inspector/general.ui:489
|
||||
+#: gtk/inspector/general.ui:570
|
||||
msgid "GL Version"
|
||||
msgstr "Version de GL"
|
||||
|
||||
-#: gtk/inspector/general.ui:524
|
||||
+#: gtk/inspector/general.ui:605
|
||||
msgid "GL Vendor"
|
||||
msgstr "Provesidor GL"
|
||||
|
||||
@@ -4840,7 +4833,7 @@ msgstr "Fraccions alternativas"
|
||||
#: gtk/open-type-layout.h:18
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Akhands"
|
||||
-msgstr ""
|
||||
+msgstr "Akhands"
|
||||
|
||||
#: gtk/open-type-layout.h:19
|
||||
msgctxt "OpenType layout"
|
||||
@@ -4920,7 +4913,7 @@ msgstr ""
|
||||
#: gtk/open-type-layout.h:34
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Distances"
|
||||
-msgstr ""
|
||||
+msgstr "Distàncias"
|
||||
|
||||
#: gtk/open-type-layout.h:35
|
||||
msgctxt "OpenType layout"
|
||||
@@ -4930,7 +4923,7 @@ msgstr ""
|
||||
#: gtk/open-type-layout.h:36
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Denominators"
|
||||
-msgstr ""
|
||||
+msgstr "Denominators"
|
||||
|
||||
#: gtk/open-type-layout.h:37
|
||||
msgctxt "OpenType layout"
|
||||
@@ -5051,22 +5044,22 @@ msgstr ""
|
||||
#: gtk/open-type-layout.h:59
|
||||
msgctxt "OpenType layout"
|
||||
msgid "JIS78 Forms"
|
||||
-msgstr ""
|
||||
+msgstr "Fòrmas JIS78"
|
||||
|
||||
#: gtk/open-type-layout.h:60
|
||||
msgctxt "OpenType layout"
|
||||
msgid "JIS83 Forms"
|
||||
-msgstr ""
|
||||
+msgstr "Fòrmas JIS83"
|
||||
|
||||
#: gtk/open-type-layout.h:61
|
||||
msgctxt "OpenType layout"
|
||||
msgid "JIS90 Forms"
|
||||
-msgstr ""
|
||||
+msgstr "Fòrmas JIS90"
|
||||
|
||||
#: gtk/open-type-layout.h:62
|
||||
msgctxt "OpenType layout"
|
||||
msgid "JIS2004 Forms"
|
||||
-msgstr ""
|
||||
+msgstr "Fòrmas JIS200"
|
||||
|
||||
#: gtk/open-type-layout.h:63
|
||||
msgctxt "OpenType layout"
|
||||
@@ -5432,11 +5425,9 @@ msgid "Stretching Glyph Decomposition"
|
||||
msgstr "Descomposicion de glyphe espandida"
|
||||
|
||||
#: gtk/open-type-layout.h:132
|
||||
-#, fuzzy
|
||||
-#| msgid "Postscript"
|
||||
msgctxt "OpenType layout"
|
||||
msgid "Subscript"
|
||||
-msgstr "Postscript"
|
||||
+msgstr "Soscrit"
|
||||
|
||||
#: gtk/open-type-layout.h:133
|
||||
#, fuzzy
|
||||
@@ -6738,7 +6729,7 @@ msgstr ""
|
||||
#: gtk/script-names.c:73
|
||||
msgctxt "Script"
|
||||
msgid "Tifinagh"
|
||||
-msgstr ""
|
||||
+msgstr "Tifinagh"
|
||||
|
||||
#: gtk/script-names.c:74
|
||||
msgctxt "Script"
|
||||
@@ -7342,10 +7333,8 @@ msgid "Location Layer"
|
||||
msgstr "Emplaçament"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:137
|
||||
-#, fuzzy
|
||||
-#| msgid "Search"
|
||||
msgid "Search Layer"
|
||||
-msgstr "Recercar"
|
||||
+msgstr "Jaç de recèrca"
|
||||
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:199
|
||||
msgid "Files"
|
||||
@@ -7721,7 +7710,7 @@ msgstr "Impossible d'escriure dins lo fichièr de cache : %s\n"
|
||||
#: gtk/updateiconcache.c:1558
|
||||
#, c-format
|
||||
msgid "The generated cache was invalid.\n"
|
||||
-msgstr "L'cache generat èra pas valide.\n"
|
||||
+msgstr "Lo cache generat èra pas valide.\n"
|
||||
|
||||
#: gtk/updateiconcache.c:1572
|
||||
#, c-format
|
||||
@@ -7873,7 +7862,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamian (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@@ -7882,7 +7871,7 @@ msgstr "Wayland"
|
||||
#: modules/input/imwaylandgtk.c:82
|
||||
msgctxt "input method menu"
|
||||
msgid "Waylandgtk"
|
||||
-msgstr ""
|
||||
+msgstr "Waylandgtk"
|
||||
|
||||
#. ID
|
||||
#: modules/input/imxim.c:26
|
||||
@@ -8172,106 +8161,94 @@ msgstr "Bòrd cort (revirat)"
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4738
|
||||
msgctxt "output-bin"
|
||||
msgid "Top Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc superior"
|
||||
|
||||
#. Translators: Middle output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4740
|
||||
msgctxt "output-bin"
|
||||
msgid "Middle Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc intermediari"
|
||||
|
||||
#. Translators: Bottom output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4742
|
||||
-#, fuzzy
|
||||
-#| msgctxt "Stock label, navigation"
|
||||
-#| msgid "_Bottom"
|
||||
msgctxt "output-bin"
|
||||
msgid "Bottom Bin"
|
||||
-msgstr "_Bas"
|
||||
+msgstr "Nauc inferior"
|
||||
|
||||
#. Translators: Side output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4744
|
||||
msgctxt "output-bin"
|
||||
msgid "Side Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc lateral"
|
||||
|
||||
#. Translators: Left output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4746
|
||||
-#, fuzzy
|
||||
-#| msgctxt "keyboard label"
|
||||
-#| msgid "Left"
|
||||
msgctxt "output-bin"
|
||||
msgid "Left Bin"
|
||||
-msgstr "Esquèrra"
|
||||
+msgstr "Nauc d'esquèrra"
|
||||
|
||||
#. Translators: Right output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4748
|
||||
-#, fuzzy
|
||||
-#| msgctxt "keyboard label"
|
||||
-#| msgid "Right"
|
||||
msgctxt "output-bin"
|
||||
msgid "Right Bin"
|
||||
-msgstr "Dreita"
|
||||
+msgstr "Nauc de drecha"
|
||||
|
||||
#. Translators: Center output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4750
|
||||
-#, fuzzy
|
||||
-#| msgctxt "Stock label"
|
||||
-#| msgid "_Center"
|
||||
msgctxt "output-bin"
|
||||
msgid "Center Bin"
|
||||
-msgstr "_Centrar"
|
||||
+msgstr "Nauc central"
|
||||
|
||||
#. Translators: Rear output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4752
|
||||
msgctxt "output-bin"
|
||||
msgid "Rear Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc arrièr"
|
||||
|
||||
#. Translators: Output bin where one sided output is oriented in the face-up position
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4754
|
||||
msgctxt "output-bin"
|
||||
msgid "Face Up Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc amb fàcia cap amont"
|
||||
|
||||
#. Translators: Output bin where one sided output is oriented in the face-down position
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4756
|
||||
msgctxt "output-bin"
|
||||
msgid "Face Down Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc amb fàcia cap aval"
|
||||
|
||||
#. Translators: Large capacity output bin
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4758
|
||||
msgctxt "output-bin"
|
||||
msgid "Large Capacity Bin"
|
||||
-msgstr ""
|
||||
+msgstr "Nauc de granda capacitat"
|
||||
|
||||
#. Translators: Output stacker number %d
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4780
|
||||
#, c-format
|
||||
msgctxt "output-bin"
|
||||
msgid "Stacker %d"
|
||||
-msgstr ""
|
||||
+msgstr "Empilador %d"
|
||||
|
||||
#. Translators: Output mailbox number %d
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4784
|
||||
#, c-format
|
||||
msgctxt "output-bin"
|
||||
msgid "Mailbox %d"
|
||||
-msgstr ""
|
||||
+msgstr "Bóstia de messatjariá %d"
|
||||
|
||||
#. Translators: Private mailbox
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4788
|
||||
msgctxt "output-bin"
|
||||
msgid "My Mailbox"
|
||||
-msgstr ""
|
||||
+msgstr "Ma bóstia de recepcion"
|
||||
|
||||
#. Translators: Output tray number %d
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:4792
|
||||
#, c-format
|
||||
msgctxt "output-bin"
|
||||
msgid "Tray %d"
|
||||
-msgstr ""
|
||||
+msgstr "Platèu %d"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:5263
|
||||
msgid "Printer Default"
|
||||
2258
debian/patches/Update-Persian-translation.patch
vendored
Normal file
2258
debian/patches/Update-Persian-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
263
debian/patches/Update-Polish-translation-1.patch
vendored
Normal file
263
debian/patches/Update-Polish-translation-1.patch
vendored
Normal file
@ -0,0 +1,263 @@
|
||||
From: =?utf-8?q?Piotr_Dr=C4=85g?= <piotrdrag@gmail.com>
|
||||
Date: Sun, 30 Oct 2022 12:37:05 +0100
|
||||
Subject: Update Polish translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:e6ce24125ce73b18156c6a24ad6dbf941f81f3a1
|
||||
---
|
||||
po/pl.po | 91 +++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 50 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/po/pl.po b/po/pl.po
|
||||
index 3a1bf52..9883ba2 100644
|
||||
--- a/po/pl.po
|
||||
+++ b/po/pl.po
|
||||
@@ -16,8 +16,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-08-28 14:43+0000\n"
|
||||
-"PO-Revision-Date: 2022-08-28 23:32+0200\n"
|
||||
+"POT-Creation-Date: 2022-10-30 00:00+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-30 12:35+0200\n"
|
||||
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
|
||||
"Language-Team: Polish <community-poland@mozilla.org>\n"
|
||||
"Language: pl\n"
|
||||
@@ -663,15 +663,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "Za_mknij"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Zminimalizuj"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Zmaksymalizuj"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Przywróć"
|
||||
|
||||
@@ -1220,7 +1220,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1269,7 +1269,7 @@ msgid "_Apply"
|
||||
msgstr "_Zastosuj"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_OK"
|
||||
|
||||
@@ -1627,12 +1627,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "kl. num."
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Spacja"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "\\"
|
||||
@@ -2244,52 +2253,52 @@ msgstr "_Prawy:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Marginesy papieru"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "_Wytnij"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "S_kopiuj"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Wk_lej"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Usuń"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Z_aznacz wszystko"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Wstaw _emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Zaznacz wszystko"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Wytnij"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Skopiuj"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Wklej"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Klawisz Caps Lock jest włączony"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Wstawia emoji"
|
||||
|
||||
@@ -2699,51 +2708,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Brak"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Szerokość"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Waga"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Pochylenie"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Nachylenie"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Rozmiar wizualny"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Domyślne"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligatury"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Wielkość liter"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Wielkość cyfr"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Odstępy cyfr"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Formatowanie cyfr"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Warianty znaku"
|
||||
|
||||
@@ -2755,7 +2764,7 @@ msgstr "Utworzenie kontekstu OpenGL się nie powiodło"
|
||||
msgid "Application menu"
|
||||
msgstr "Menu programu"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Zamknij"
|
||||
|
||||
@@ -4035,24 +4044,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d%%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Przenieś"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Zmień rozmiar"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Zawsze na wierzchu"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Użyć Inspektora biblioteki GTK?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4063,7 +4072,7 @@ msgstr ""
|
||||
"i modyfikowanie wnętrza programu GTK. Jego użycie może spowodować awarię lub "
|
||||
"uszkodzenie programu."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Bez wyświetlania ponownie"
|
||||
|
||||
42
debian/patches/Update-Polish-translation.patch
vendored
Normal file
42
debian/patches/Update-Polish-translation.patch
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
From: =?utf-8?q?Piotr_Dr=C4=85g?= <piotrdrag@gmail.com>
|
||||
Date: Sun, 28 Aug 2022 23:32:39 +0200
|
||||
Subject: Update Polish translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:1c375f72bc7407dbd1574d2a26ad83f13bb3808b
|
||||
---
|
||||
po/pl.po | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/po/pl.po b/po/pl.po
|
||||
index 39de2bb..3a1bf52 100644
|
||||
--- a/po/pl.po
|
||||
+++ b/po/pl.po
|
||||
@@ -16,8 +16,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-20 11:17+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-20 13:55+0100\n"
|
||||
+"POT-Creation-Date: 2022-08-28 14:43+0000\n"
|
||||
+"PO-Revision-Date: 2022-08-28 23:32+0200\n"
|
||||
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
|
||||
"Language-Team: Polish <community-poland@mozilla.org>\n"
|
||||
"Language: pl\n"
|
||||
@@ -4083,7 +4083,7 @@ msgstr "Przedrostek"
|
||||
|
||||
#: gtk/inspector/actions.ui:56
|
||||
msgid "Enabled"
|
||||
-msgstr "Wyłączone"
|
||||
+msgstr "Włączone"
|
||||
|
||||
#: gtk/inspector/actions.ui:69
|
||||
msgid "Parameter Type"
|
||||
@@ -7761,7 +7761,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "wietnamska (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
287
debian/patches/Update-Portuguese-translation.patch
vendored
Normal file
287
debian/patches/Update-Portuguese-translation.patch
vendored
Normal file
@ -0,0 +1,287 @@
|
||||
From: Hugo Carvalho <hugokarvalho@hotmail.com>
|
||||
Date: Sat, 29 Oct 2022 15:46:12 +0000
|
||||
Subject: Update Portuguese translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:2d76cd4b2b4d509d4ba25976c431a81dc3521929
|
||||
---
|
||||
po/pt.po | 100 +++++++++++++++++++++++++++++++++++----------------------------
|
||||
1 file changed, 55 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/po/pt.po b/po/pt.po
|
||||
index c7b5320..4df5293 100644
|
||||
--- a/po/pt.po
|
||||
+++ b/po/pt.po
|
||||
@@ -14,16 +14,16 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.10\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-17 15:40+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-17 21:26+0000\n"
|
||||
+"POT-Creation-Date: 2022-10-29 05:46+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-29 15:45+0100\n"
|
||||
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
|
||||
-"Language-Team: Portuguese < >\n"
|
||||
+"Language-Team: Portuguese <hugokarvalho@hotmail.com>\n"
|
||||
"Language: pt\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"X-Generator: Poedit 3.2\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -660,15 +660,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Fechar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimizar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maximizar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Repor"
|
||||
|
||||
@@ -1218,7 +1218,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1267,7 +1267,7 @@ msgid "_Apply"
|
||||
msgstr "_Aplicar"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_Aceitar"
|
||||
|
||||
@@ -1624,15 +1624,25 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+# TN (Teclado Numérico) As letras são as iniciais
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "TN"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Espaço"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
-msgstr "Barra atrás"
|
||||
+msgstr "Barra invertida"
|
||||
|
||||
#: gtk/gtkappchooserbutton.c:295
|
||||
msgid "Other application…"
|
||||
@@ -2241,52 +2251,52 @@ msgstr "_Direita:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Margens do papel"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Cor_tar"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Co_lar"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Eliminar"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Selecionar _tudo"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Inserir _Emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Selecionar tudo"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Cortar"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Colar"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Caps Lock está ativo"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Inserir Emoji"
|
||||
|
||||
@@ -2696,51 +2706,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nenhuma"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Largura"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Peso"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Itálico"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Obíquo"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Abertura Óptica"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Predefinição"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligaduras"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Letter Case"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Number Case"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Espaçamento de Números"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Formato de Números"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Caracteres Variantes"
|
||||
|
||||
@@ -2752,7 +2762,7 @@ msgstr "Falha ao criar o contexto OpenGL"
|
||||
msgid "Application menu"
|
||||
msgstr "Menu da aplicação"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Fechar"
|
||||
|
||||
@@ -4034,24 +4044,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Mover"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Redimensionar"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Sempre no topo"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Quer usar o Inspetor GTK+?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4062,7 +4072,7 @@ msgstr ""
|
||||
"modificar os interiores de uma aplicação GTK+. Usá-lo pode levar a que a "
|
||||
"aplicação se estrague ou rebente."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Não mostrar esta mensagem novamente"
|
||||
|
||||
@@ -7764,7 +7774,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamita (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
296
debian/patches/Update-Russian-translation.patch
vendored
Normal file
296
debian/patches/Update-Russian-translation.patch
vendored
Normal file
@ -0,0 +1,296 @@
|
||||
From: Aleksandr Melman <Alexmelman88@gmail.com>
|
||||
Date: Mon, 31 Oct 2022 12:28:26 +0000
|
||||
Subject: Update Russian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:d0f49d9f9d42743302455b3dbd730561beb0c83b
|
||||
---
|
||||
po/ru.po | 103 ++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 56 insertions(+), 47 deletions(-)
|
||||
|
||||
diff --git a/po/ru.po b/po/ru.po
|
||||
index 89404e8..c24c246 100644
|
||||
--- a/po/ru.po
|
||||
+++ b/po/ru.po
|
||||
@@ -23,17 +23,17 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+.master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-17 13:38+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-17 16:46+0300\n"
|
||||
+"POT-Creation-Date: 2022-10-28 06:34+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-28 17:01+0300\n"
|
||||
"Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
|
||||
"Language-Team: Russian <gnome-cyr@gnome.org>\n"
|
||||
"Language: ru\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
|
||||
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
+"X-Generator: Poedit 3.1.1\n"
|
||||
"X-DL-Team: ru\n"
|
||||
"X-DL-Module: gtk\n"
|
||||
"X-DL-Branch: gtk-3-24\n"
|
||||
@@ -676,15 +676,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Закрыть"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Свернуть"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Развернуть"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Восстановить"
|
||||
|
||||
@@ -1233,7 +1233,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1282,7 +1282,7 @@ msgid "_Apply"
|
||||
msgstr "_Применить"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_OK"
|
||||
|
||||
@@ -1639,12 +1639,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "KP"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Пробел"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Backslash"
|
||||
@@ -2256,52 +2265,52 @@ msgstr "_Правое:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Поля страницы"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "В_ырезать"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Копировать"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Вст_авить"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Удалить"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Выделить вс_ё"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Вставить _Emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Выделить все"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Вырезать"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Копировать"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Вставить"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Включён режим Caps Lock"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Вставить Emoji"
|
||||
|
||||
@@ -2709,52 +2718,52 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Нет"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Ширина"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Вес"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Курсив"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Наклон"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Оптический размер"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "По умолчанию"
|
||||
|
||||
# Этап передачи событий
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Лигатуры"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Размер букв"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Размер цифр"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Размер отступов"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Форматирование цифр"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Варианты символов"
|
||||
|
||||
@@ -2766,7 +2775,7 @@ msgstr "Не удалось создать контекст OpenGL"
|
||||
msgid "Application menu"
|
||||
msgstr "Меню приложения"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Закрыть"
|
||||
|
||||
@@ -3963,8 +3972,8 @@ msgstr "Тег «%s» имеет ошибочный приоритет «%s»"
|
||||
#, c-format
|
||||
msgid "Outermost element in text must be <text_view_markup> not <%s>"
|
||||
msgstr ""
|
||||
-"Наиболее удалённым элементом в тексте должен быть <text_view_markup>, а не <"
|
||||
-"%s>"
|
||||
+"Наиболее удалённым элементом в тексте должен быть <text_view_markup>, а не "
|
||||
+"<%s>"
|
||||
|
||||
#: gtk/gtktextbufferserialize.c:1366 gtk/gtktextbufferserialize.c:1382
|
||||
#, c-format
|
||||
@@ -4049,24 +4058,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Переместить"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Изменить размер"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Всегда сверху"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Хотите использовать инспектор GTK+?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4077,7 +4086,7 @@ msgstr ""
|
||||
"изменять внутренние данные любого приложения GTK+. Использование инспектора "
|
||||
"может привести к зависанию или аварийному завершению приложения."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Не показывать это сообщение снова"
|
||||
|
||||
@@ -7784,7 +7793,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Вьетнамский (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
281
debian/patches/Update-Slovenian-translation.patch
vendored
Normal file
281
debian/patches/Update-Slovenian-translation.patch
vendored
Normal file
@ -0,0 +1,281 @@
|
||||
From: Martin <miles@filmsi.net>
|
||||
Date: Fri, 28 Oct 2022 06:33:43 +0000
|
||||
Subject: Update Slovenian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:89ea9ba6003837cdd5e82b131a6e61a13f2952c0
|
||||
---
|
||||
po/sl.po | 95 +++++++++++++++++++++++++++++++++++-----------------------------
|
||||
1 file changed, 52 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/po/sl.po b/po/sl.po
|
||||
index 332874f..86c9c72 100644
|
||||
--- a/po/sl.po
|
||||
+++ b/po/sl.po
|
||||
@@ -11,8 +11,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-19 13:40+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-20 10:55+0100\n"
|
||||
+"POT-Creation-Date: 2022-10-28 04:03+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-28 08:33+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"
|
||||
@@ -22,7 +22,7 @@ msgstr ""
|
||||
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
|
||||
"%100==4 ? 3 : 0);\n"
|
||||
"X-Poedit-SourceCharset: utf-8\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"X-Generator: Poedit 3.2\n"
|
||||
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
#, c-format
|
||||
@@ -661,15 +661,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Zapri"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Skrči"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Razpni"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Obnovi"
|
||||
|
||||
@@ -1216,7 +1216,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1265,7 +1265,7 @@ msgid "_Apply"
|
||||
msgstr "_Uveljavi"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_V redu"
|
||||
|
||||
@@ -1622,12 +1622,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "ŠT"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Preslednica"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Leva poševnica"
|
||||
@@ -2239,52 +2248,52 @@ msgstr "_Desno:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Robovi papirja"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Iz_reži"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Kopiraj"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Pr_ilepi"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "_Izbriši"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Izberi _vse"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Vstavi izrazno _ikono"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Izberi vse"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Izreži"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Kopiraj"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Prilepi"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Tipka Caps Lock je vključena"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Vstavi izrazno ikono"
|
||||
|
||||
@@ -2690,51 +2699,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Brez"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Širina"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Teža"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Ležeče"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Nagib"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optična velikost"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Privzeto"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligature"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Črke"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Številke"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Številski razmiki"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Oblikovanje števil"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Različica znakov"
|
||||
|
||||
@@ -2746,7 +2755,7 @@ msgstr "Ustvarjanje vsebine OpenGL je spodletelo"
|
||||
msgid "Application menu"
|
||||
msgstr "Programski meni"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Zapri"
|
||||
|
||||
@@ -4027,24 +4036,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Premakni"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Spremeni velikost"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Vedno na vrhu"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Ali želite uporabljati nadzorni program GTK+?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4054,7 +4063,7 @@ msgstr ""
|
||||
"Nadzornik GTK+ je razhroščevalnik, ki omogoča raziskovanje in spreminjanje "
|
||||
"nastavitev GTK+. Neustrezna raba lahko povzroči nedelovanje okolja."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Sporočila ne pokaži več"
|
||||
|
||||
@@ -7752,7 +7761,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "vietnamski (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
540
debian/patches/Update-Turkish-translation-1.patch
vendored
Normal file
540
debian/patches/Update-Turkish-translation-1.patch
vendored
Normal file
@ -0,0 +1,540 @@
|
||||
From: =?utf-8?q?Sabri_=C3=9Cnal?= <libreajans@gmail.com>
|
||||
Date: Sun, 18 Sep 2022 08:19:53 +0000
|
||||
Subject: Update Turkish translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:a533474dfe20f064023e9452e64e4cf2432657c7
|
||||
---
|
||||
po/tr.po | 463 +++------------------------------------------------------------
|
||||
1 file changed, 16 insertions(+), 447 deletions(-)
|
||||
|
||||
diff --git a/po/tr.po b/po/tr.po
|
||||
index fefc7f4..c53641b 100644
|
||||
--- a/po/tr.po
|
||||
+++ b/po/tr.po
|
||||
@@ -1,5 +1,7 @@
|
||||
# Turkish translations of gtk+.
|
||||
# Copyright (C) 1999-2003, 2004, 2006, 2007 Free Software Foundation, Inc.
|
||||
+# Copyright (C) 2008-2022 gtk+'s COPYRIGHT HOLDER
|
||||
+# This file is distributed under the same licence as the gtk+ package.
|
||||
#
|
||||
# Arman Aksoy <armish@linux-sevenler.de, 2003.
|
||||
# Ömer Fadıl USTA <omer_fad@hotmail.com>,2002.
|
||||
@@ -19,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-20 11:17+0000\n"
|
||||
+"POT-Creation-Date: 2022-09-14 00:37+0000\n"
|
||||
"PO-Revision-Date: 2022-02-20 17:49+0300\n"
|
||||
"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
|
||||
"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
|
||||
@@ -2699,51 +2701,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Hiçbiri"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Genişlik"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Ağırlık"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Eğik"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Eğrilik"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Optik Boyut"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Öntanımlı"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Bağlamalar"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Harf Durumu"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Sayı Durumu"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Numara Boşluklama"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Numara Biçimlendirme"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Karakter Değişkeleri"
|
||||
|
||||
@@ -7754,7 +7756,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamca (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@@ -8373,436 +8375,3 @@ msgstr "sınama-çıktısı.%s"
|
||||
#: modules/printbackends/test/gtkprintbackendtest.c:465
|
||||
msgid "Print to Test Printer"
|
||||
msgstr "Sınama Yazıcısına Yazdır"
|
||||
-
|
||||
-#~ msgid "Don't batch GDI requests"
|
||||
-#~ msgstr "GDI isteklerini yığınlama"
|
||||
-
|
||||
-#~ msgid "Don't use the Wintab API for tablet support"
|
||||
-#~ msgstr "Tablet desteği için Wintab APIʼsini kullanma"
|
||||
-
|
||||
-#~ msgid "Same as --no-wintab"
|
||||
-#~ msgstr "--no-wintab ile aynı"
|
||||
-
|
||||
-#~ msgid "Do use the Wintab API [default]"
|
||||
-#~ msgstr "Wintab API'sini kullan [öntanımlı]"
|
||||
-
|
||||
-#~ msgid "Size of the palette in 8 bit mode"
|
||||
-#~ msgstr "8 bit kipinde paletin boyutu"
|
||||
-
|
||||
-#~ msgid "COLORS"
|
||||
-#~ msgstr "RENKLER"
|
||||
-
|
||||
-#~ msgid "Online"
|
||||
-#~ msgstr "Çevrim İçi"
|
||||
-
|
||||
-#~ msgid "Offline"
|
||||
-#~ msgstr "Çevrim Dışı"
|
||||
-
|
||||
-#~ msgid "Dormant"
|
||||
-#~ msgstr "Uykuda"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Dark"
|
||||
-#~ msgstr "Koyu"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Scarlet Red"
|
||||
-#~ msgstr "Açık Kırmızı Kızıl"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Scarlet Red"
|
||||
-#~ msgstr "Kırmızı Kızıl"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Butter"
|
||||
-#~ msgstr "Açık Sarı"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Butter"
|
||||
-#~ msgstr "Sarı"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Chameleon"
|
||||
-#~ msgstr "Açık Bukalemun Rengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Chameleon"
|
||||
-#~ msgstr "Bukalemun Rengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Dark Chameleon"
|
||||
-#~ msgstr "Koyu Bukalemun Rengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Sky Blue"
|
||||
-#~ msgstr "Gök Mavisi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Plum"
|
||||
-#~ msgstr "Yeşil"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Chocolate"
|
||||
-#~ msgstr "Açık Çikolata Rengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Chocolate"
|
||||
-#~ msgstr "Çikolata Rengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Dark Chocolate"
|
||||
-#~ msgstr "Koyu Kahverengi"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Aluminum 1"
|
||||
-#~ msgstr "Açık Gri 1"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Aluminum 1"
|
||||
-#~ msgstr "Gri 1"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Dark Aluminum 1"
|
||||
-#~ msgstr "Koyu Gri 1"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Light Aluminum 2"
|
||||
-#~ msgstr "Açık Gri 2"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Aluminum 2"
|
||||
-#~ msgstr "Gri 2"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Dark Aluminum 2"
|
||||
-#~ msgstr "Koyu Gri 2"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Darker Gray"
|
||||
-#~ msgstr "Daha Koyu Gri"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Medium Gray"
|
||||
-#~ msgstr "Orta Gri"
|
||||
-
|
||||
-#~ msgctxt "Color name"
|
||||
-#~ msgid "Lighter Gray"
|
||||
-#~ msgstr "Daha Açık Gri"
|
||||
-
|
||||
-#~ msgid "3.2 core GL profile is not available on EGL implementation"
|
||||
-#~ msgstr "3.2 çekirdek profili, EGL uygulamasında kullanılabilir değil"
|
||||
-
|
||||
-#~ msgid "Not implemented on OS X"
|
||||
-#~ msgstr "OS X için geliştirilmedi"
|
||||
-
|
||||
-#~ msgctxt "switch"
|
||||
-#~ msgid "ON"
|
||||
-#~ msgstr "AÇIK"
|
||||
-
|
||||
-#~ msgctxt "switch"
|
||||
-#~ msgid "OFF"
|
||||
-#~ msgstr "KAPALI"
|
||||
-
|
||||
-#~ msgid "smb://"
|
||||
-#~ msgstr "smb://"
|
||||
-
|
||||
-#~ msgid "This clipboard cannot store data."
|
||||
-#~ msgstr "Bu pano veri depolayamaz."
|
||||
-
|
||||
-#~ msgid "Cannot read from empty clipboard."
|
||||
-#~ msgstr "Boş panodan okunamaz."
|
||||
-
|
||||
-#~ msgid "No compatible formats to transfer clipboard contents."
|
||||
-#~ msgstr "Pano içeriklerini aktarmak için uyumlu biçim yok."
|
||||
-
|
||||
-#~ msgid "Cannot provide contents as “%s”"
|
||||
-#~ msgstr "İçerikler “%s” olarak sağlanamıyor"
|
||||
-
|
||||
-#~ msgid "Cannot provide contents as %s"
|
||||
-#~ msgstr "İçerikler %s olarak sağlanamıyor"
|
||||
-
|
||||
-#~ msgid "Reading not implemented."
|
||||
-#~ msgstr "Okuma henüz gerçeklenmemiş."
|
||||
-
|
||||
-#~ msgid "Vulkan support disabled via GDK_DEBUG"
|
||||
-#~ msgstr "Vulkan desteği GDK_DEBUG yoluyla devre dışı bırakılmış"
|
||||
-
|
||||
-#~ msgid "No compatible transfer format found"
|
||||
-#~ msgstr "Uyumlu aktarım biçimi bulunamadı"
|
||||
-
|
||||
-#~ msgid "Cannot claim clipboard ownership. OpenClipboard() timed out."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano sahipliği istemi yapılamıyor. OpenClipboard() zaman aşımına uğradı."
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "Cannot claim clipboard ownership. Another process claimed it before us."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano sahipliği istemi yapılamıyor. Başka bir süreç bizden önce istedi."
|
||||
-
|
||||
-#~ msgid "Cannot claim clipboard ownership. OpenClipboard() failed: 0x%lx."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano sahipliği istemi yapılamıyor. OpenClipboard() başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot claim clipboard ownership. EmptyClipboard() failed: 0x%lx."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano sahipliği istemi yapılamıyor. EmptyClipboard() başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot set clipboard data. OpenClipboard() timed out."
|
||||
-#~ msgstr "Pano verisi belirlenemiyor. OpenClipboard() zaman aşımına uğradı."
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "Cannot set clipboard data. Another process claimed clipboard ownership."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano verisi belirlenemiyor. Başka bir süreç pano sahipliği isteminde "
|
||||
-#~ "bulundu."
|
||||
-
|
||||
-#~ msgid "Cannot set clipboard data. OpenClipboard() failed: 0x%lx."
|
||||
-#~ msgstr "Pano verisi belirlenemiyor. OpenClipboard() başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. GlobalLock(0x%p) failed: 0x%lx."
|
||||
-#~ msgstr "Pano verisi alınamıyor. GlobalLock(0x%p) başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. GlobalSize(0x%p) failed: 0x%lx."
|
||||
-#~ msgstr "Pano verisi alınamıyor. GlobalSize(0x%p) başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "Cannot get clipboard data. Failed to allocate %lu bytes to store the data."
|
||||
-#~ msgstr ""
|
||||
-#~ "Pano verisi alınamadı. %lu bayt, veriyi depolamak için tahsis edilemedi."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. OpenClipboard() timed out."
|
||||
-#~ msgstr "Pano verisi alınamıyor. OpenClipboard() zaman aşımına uğradı."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. Clipboard ownership changed."
|
||||
-#~ msgstr "Pano verisi alınamıyor. Pano sahipliği değişti."
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "Cannot get clipboard data. Clipboard data changed before we could get it."
|
||||
-#~ msgstr "Pano verisi alınamıyor. Pano verisi biz almadan önce değişti."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. OpenClipboard() failed: 0x%lx."
|
||||
-#~ msgstr "Pano verisi alınamıyor. OpenClipboard() başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. No compatible transfer format found."
|
||||
-#~ msgstr "Pano verisi alınamıyor. Uyumlu aktarım biçimi bulunamadı."
|
||||
-
|
||||
-#~ msgid "Cannot get clipboard data. GetClipboardData() failed: 0x%lx."
|
||||
-#~ msgstr "Pano verisi alınamıyor. GetClipboardData() başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get DnD data. GlobalLock(0x%p) failed: 0x%lx."
|
||||
-#~ msgstr "DnD verisi alınamıyor. GlobalLock(0x%p) başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get DnD data. GlobalSize(0x%p) failed: 0x%lx."
|
||||
-#~ msgstr "DnD verisi alınamıyor. GlobalSize(0x%p) başarısız: 0x%lx."
|
||||
-
|
||||
-#~ msgid "Cannot get DnD data. Failed to allocate %lu bytes to store the data."
|
||||
-#~ msgstr ""
|
||||
-#~ "DnD verisi alınamadı. %lu bayt, veriyi depolamak için tahsis edilemedi."
|
||||
-
|
||||
-#~ msgid "Failed to find target context record for context 0x%p"
|
||||
-#~ msgstr "0x%p bağlamı için hedef bağlam kaydı bulma başarısız"
|
||||
-
|
||||
-#~ msgid "Target context record 0x%p has no data object"
|
||||
-#~ msgstr "0x%p hedef bağlam kaydının veri nesnesi yok"
|
||||
-
|
||||
-#~ msgid "IDataObject_GetData (0x%x) failed, returning 0x%lx"
|
||||
-#~ msgstr "IDataObject_GetData (0x%x) başarısız, 0x%lx döndürüyor"
|
||||
-
|
||||
-#~ msgid "Failed to transmute DnD data W32 format 0x%x to %p (%s)"
|
||||
-#~ msgstr "W32 biçimli 0x%x DnD verisi, %p hedefine dönüştürülürken hata (%s)"
|
||||
-
|
||||
-#~ msgid "writing a closed stream"
|
||||
-#~ msgstr "kapalı akışa yazılıyor"
|
||||
-
|
||||
-#~ msgid "g_try_realloc () failed"
|
||||
-#~ msgstr "g_try_realloc () başarısız"
|
||||
-
|
||||
-#~ msgid "GlobalReAlloc() failed: "
|
||||
-#~ msgstr "GlobalReAlloc() başarısız: "
|
||||
-
|
||||
-#~ msgid "Ran out of buffer space (buffer size is fixed)"
|
||||
-#~ msgstr "Tampon alan bitti (tampon alan sabittir)"
|
||||
-
|
||||
-#~ msgid "Can't transmute a single handle"
|
||||
-#~ msgstr "Eldeki tekli dönüştürülemez"
|
||||
-
|
||||
-#~ msgid "Failed to transmute %zu bytes of data from %s to %u"
|
||||
-#~ msgstr "Verinin %zu baytını %s kaynağından %u hedefine dönüştürme başarısız"
|
||||
-
|
||||
-#~ msgid "GlobalLock() failed: "
|
||||
-#~ msgstr "GlobalLock() başarısız: "
|
||||
-
|
||||
-#~ msgid "GlobalAlloc() failed: "
|
||||
-#~ msgstr "GlobalAlloc() başarısız: "
|
||||
-
|
||||
-#~ msgid "Clipboard manager could not store selection."
|
||||
-#~ msgstr "Pano yöneticisi seçimi depolayamadı."
|
||||
-
|
||||
-#~ msgid "Cannot store clipboard. No clipboard manager is active."
|
||||
-#~ msgstr "Pano depolanamadı. Aktif pano yöneticisi yok."
|
||||
-
|
||||
-#~ msgid "Format %s not supported"
|
||||
-#~ msgstr "%s biçimi desteklenmiyor"
|
||||
-
|
||||
-#~ msgid "Not enough space in destination"
|
||||
-#~ msgstr "Hedefte yeterli alan yok"
|
||||
-
|
||||
-#~ msgid "Need complete input to do conversion"
|
||||
-#~ msgstr "Dönüştürülme için girdinin tamamlanması gerekir"
|
||||
-
|
||||
-#~ msgid "Invalid byte sequence in conversion input"
|
||||
-#~ msgstr "Dönüşüm girdisinde geçersiz bayt dizisi"
|
||||
-
|
||||
-#~ msgid "Invalid formats in compound text conversion."
|
||||
-#~ msgstr "Bileşik metin dönüşümünde geçersiz biçimler."
|
||||
-
|
||||
-#~ msgctxt "long time format"
|
||||
-#~ msgid "%d:%02d:%02d"
|
||||
-#~ msgstr "%d.%02d.%02d"
|
||||
-
|
||||
-#~ msgctxt "long time format"
|
||||
-#~ msgid "-%d:%02d:%02d"
|
||||
-#~ msgstr "-%d.%02d.%02d"
|
||||
-
|
||||
-#~ msgctxt "short time format"
|
||||
-#~ msgid "-%d:%02d"
|
||||
-#~ msgstr "-%d.%02d"
|
||||
-
|
||||
-#~ msgctxt "short time format"
|
||||
-#~ msgid "%d:%02d"
|
||||
-#~ msgstr "%d.%02d"
|
||||
-
|
||||
-#~ msgid "GTK could not find a media module. Check your installation."
|
||||
-#~ msgstr "GTK, ortam modülü bulamadı. Kurulumunuzu gözden geçirin."
|
||||
-
|
||||
-#~ msgid "Starred files"
|
||||
-#~ msgstr "Yıldızlı dosyalar"
|
||||
-
|
||||
-#~ msgid "Swipe left"
|
||||
-#~ msgstr "Sola kaydır"
|
||||
-
|
||||
-#~ msgid "Swipe right"
|
||||
-#~ msgstr "Sağa kaydır"
|
||||
-
|
||||
-#~ msgctxt "Vulkan device"
|
||||
-#~ msgid "None"
|
||||
-#~ msgstr "Hiçbiri"
|
||||
-
|
||||
-#~ msgctxt "Vulkan version"
|
||||
-#~ msgid "None"
|
||||
-#~ msgstr "Hiçbiri"
|
||||
-
|
||||
-#~ msgid "GSK Renderer"
|
||||
-#~ msgstr "GSK Gerçekleme"
|
||||
-
|
||||
-#~ msgid "Vulkan Device"
|
||||
-#~ msgstr "Vulkan Aygıtı"
|
||||
-
|
||||
-#~ msgid "Vulkan API version"
|
||||
-#~ msgstr "Vulkan API sürümü"
|
||||
-
|
||||
-#~ msgid "Vulkan driver version"
|
||||
-#~ msgstr "Vulkan sürücü sürümü"
|
||||
-
|
||||
-#~ msgid "Saving RenderNode failed"
|
||||
-#~ msgstr "RenderNode kaydetme başarısız"
|
||||
-
|
||||
-#~ msgid "Record frames"
|
||||
-#~ msgstr "Kareleri kaydet"
|
||||
-
|
||||
-#~ msgid "Clear recorded frames"
|
||||
-#~ msgstr "Kaydedilen kareleri temizle"
|
||||
-
|
||||
-#~ msgid "Add debug nodes"
|
||||
-#~ msgstr "Hata ayıklama düğümleri ekle"
|
||||
-
|
||||
-#~ msgid "Save selected node"
|
||||
-#~ msgstr "Seçilen düğümü kaydet"
|
||||
-
|
||||
-#~ msgid "Show fps overlay"
|
||||
-#~ msgstr "Fps katmanını göster"
|
||||
-
|
||||
-#~ msgid "Logging"
|
||||
-#~ msgstr "Günlükleme"
|
||||
-
|
||||
-#~ msgid "Global"
|
||||
-#~ msgstr "Küresel"
|
||||
-
|
||||
-#~ msgid "Recorder"
|
||||
-#~ msgstr "Kaydedici"
|
||||
-
|
||||
-#~ msgctxt "emoji category"
|
||||
-#~ msgid "Recent"
|
||||
-#~ msgstr "Son"
|
||||
-
|
||||
-#~ msgid "horizontal"
|
||||
-#~ msgstr "yatay"
|
||||
-
|
||||
-#~ msgid "Unspecified error decoding video"
|
||||
-#~ msgstr "Video çözülürken belirsiz hata"
|
||||
-
|
||||
-#~ msgid "Not enough memory"
|
||||
-#~ msgstr "Yeterli bellek yok"
|
||||
-
|
||||
-#~ msgid "Not a video file"
|
||||
-#~ msgstr "Video dosyası değil"
|
||||
-
|
||||
-#~ msgid "Unsupported video codec"
|
||||
-#~ msgstr "Desteklenmeyen video çözücüsü"
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "The WGL_ARB_create_context extension needed to create core profiles is "
|
||||
-#~ "not available"
|
||||
-#~ msgstr ""
|
||||
-#~ "Çekirdek profilleri oluşturmak için ihtiyaç duyulan "
|
||||
-#~ "WGL_ARB_create_context uzantısı mevcut değil"
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "The GLX_ARB_create_context_profile extension needed to create core "
|
||||
-#~ "profiles is not available"
|
||||
-#~ msgstr ""
|
||||
-#~ "Çekirdek profiller oluşturmak için ihtiyaç duyulan "
|
||||
-#~ "GLX_ARB_create_context_profile uzantısı mevcut değil"
|
||||
-
|
||||
-#~ msgid "Could not start the search process"
|
||||
-#~ msgstr "Arama süreci başlatılamadı"
|
||||
-
|
||||
-#~ msgid ""
|
||||
-#~ "The program was not able to create a connection to the indexer daemon. "
|
||||
-#~ "Please make sure it is running."
|
||||
-#~ msgstr ""
|
||||
-#~ "Program dizinleyici servisine bağlantı oluşturamadı. Lütfen çalıştığından "
|
||||
-#~ "emin olun."
|
||||
-
|
||||
-#~ msgid "Error launching preview"
|
||||
-#~ msgstr "Önizleme başlatılırken hata"
|
||||
-
|
||||
-#~ msgid "New class"
|
||||
-#~ msgstr "Yeni sınıf"
|
||||
-
|
||||
-#~ msgid "Cancel"
|
||||
-#~ msgstr "İptal Et"
|
||||
-
|
||||
-#~ msgid "Class name"
|
||||
-#~ msgstr "Sınıf adı"
|
||||
-
|
||||
-#~ msgid "Add a class"
|
||||
-#~ msgstr "Sınıf Ekle"
|
||||
-
|
||||
-#~ msgid "Restore defaults for this widget"
|
||||
-#~ msgstr "Parçacık için öntanımları geri yükle"
|
||||
-
|
||||
-#~ msgid "Changes are applied instantly, only for this selected widget."
|
||||
-#~ msgstr "Değişiklikler, sadece seçilen bu parçacık için doğrudan uygulandı."
|
||||
-
|
||||
-#~ msgid "Classes"
|
||||
-#~ msgstr "Sınıflar"
|
||||
-
|
||||
-#~ msgid "Allocated size"
|
||||
-#~ msgstr "Ayrılmış alan"
|
||||
-
|
||||
-#~ msgid "Object Hierarchy"
|
||||
-#~ msgstr "Nesne Hiyerarşisi"
|
||||
-
|
||||
-#~ msgid "Style Properties"
|
||||
-#~ msgstr "Biçem Özellikleri"
|
||||
2926
debian/patches/Update-Turkish-translation.patch
vendored
Normal file
2926
debian/patches/Update-Turkish-translation.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
324
debian/patches/Update-Ukrainian-translation.patch
vendored
Normal file
324
debian/patches/Update-Ukrainian-translation.patch
vendored
Normal file
@ -0,0 +1,324 @@
|
||||
From: Yuri Chornoivan <yurchor@ukr.net>
|
||||
Date: Sat, 29 Oct 2022 05:46:25 +0000
|
||||
Subject: Update Ukrainian translation
|
||||
|
||||
Origin: upstream, 3.24.35, commit:bd736aed8c14e5d61a3a853250e4540ca8205591
|
||||
---
|
||||
po/uk.po | 107 +++++++++++++++++++++++++++++++++++----------------------------
|
||||
1 file changed, 59 insertions(+), 48 deletions(-)
|
||||
|
||||
diff --git a/po/uk.po b/po/uk.po
|
||||
index e01c00b..1418815 100644
|
||||
--- a/po/uk.po
|
||||
+++ b/po/uk.po
|
||||
@@ -9,15 +9,16 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-17 14:38+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-17 17:38+0200\n"
|
||||
+"POT-Creation-Date: 2022-10-28 06:34+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-29 08:45+0300\n"
|
||||
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
|
||||
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
|
||||
"Language: uk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
"X-Generator: Lokalize 20.12.0\n"
|
||||
"X-Project-Style: gnome\n"
|
||||
|
||||
@@ -657,15 +658,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Закрити"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Згорнути"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Розгорнути"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Відновити"
|
||||
|
||||
@@ -1214,7 +1215,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1263,7 +1264,7 @@ msgid "_Apply"
|
||||
msgstr "Заст_осувати"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_Гаразд"
|
||||
|
||||
@@ -1622,12 +1623,21 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "ЦБ"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Пробіл"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Backslash"
|
||||
@@ -2239,52 +2249,52 @@ msgstr "_Праве:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Поля сторінки"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Ви_різати"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Копіювати"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "Вст_авити"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "В_илучити"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "Виді_лити все"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Вставити _емодзі"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Вибрати все"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Вирізати"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Копіювати"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Вставити"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Caps Lock увімкнено"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Вставити емодзі"
|
||||
|
||||
@@ -2690,51 +2700,51 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Немає"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Ширина"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Вага"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Курсив"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Нахил"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Оптичний розмір"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Типово"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Лігатури"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Розмір літер"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Розмір цифр"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Інтервали між цифрами"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Форматування чисел"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Варіанти символів"
|
||||
|
||||
@@ -2746,7 +2756,7 @@ msgstr "Не вдалося створити контекст OpenGL"
|
||||
msgid "Application menu"
|
||||
msgstr "Меню програм"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Закрити"
|
||||
|
||||
@@ -3519,7 +3529,8 @@ msgstr "Помилка при створенні перегляду"
|
||||
|
||||
#: gtk/gtkprintoperation.c:3041
|
||||
#, c-format
|
||||
-msgid "The most probable reason is that a temporary file could not be created."
|
||||
+msgid ""
|
||||
+"The most probable reason is that a temporary file could not be created."
|
||||
msgstr "Найімовірніша причина: не вдалось створити тимчасовий файл."
|
||||
|
||||
#. window
|
||||
@@ -4024,24 +4035,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Пересунути"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Змінити розмір"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Завжди зверху"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Бажаєте використовувати інспектор GTK+?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4052,7 +4063,7 @@ msgstr ""
|
||||
"редагувати внутрішні частини будь-які програми GTK+. Його використання може "
|
||||
"спричинити збої в програмі."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Не показувати надалі"
|
||||
|
||||
@@ -4146,12 +4157,10 @@ msgid "GDK Backend"
|
||||
msgstr "Модуль GDK"
|
||||
|
||||
#: gtk/inspector/general.ui:115
|
||||
-#| msgid "Application"
|
||||
msgid "Application ID"
|
||||
msgstr "Ід. програми"
|
||||
|
||||
#: gtk/inspector/general.ui:149
|
||||
-#| msgid "Resources"
|
||||
msgid "Resource Path"
|
||||
msgstr "Шлях до ресурсів"
|
||||
|
||||
@@ -7306,7 +7315,8 @@ msgstr "Серверні адреси"
|
||||
#: gtk/ui/gtkplacesview.ui:43
|
||||
msgid ""
|
||||
"Server addresses are made up of a protocol prefix and an address. Examples:"
|
||||
-msgstr "Серверні адреси складаються з префіксу протоколу та адреси. Наприклад:"
|
||||
+msgstr ""
|
||||
+"Серверні адреси складаються з префіксу протоколу та адреси. Наприклад:"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:78
|
||||
msgid "Available Protocols"
|
||||
@@ -7751,7 +7761,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "В'єтнамська (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@@ -7841,7 +7851,8 @@ msgstr "Щоб надрукувати документ «%s», потрібно
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:1497
|
||||
#, c-format
|
||||
msgid "Authentication is required to print this document on printer %s"
|
||||
-msgstr "Для друкування документа на принтері %s потрібно пройти автентифікацію"
|
||||
+msgstr ""
|
||||
+"Для друкування документа на принтері %s потрібно пройти автентифікацію"
|
||||
|
||||
#: modules/printbackends/cups/gtkprintbackendcups.c:1499
|
||||
msgid "Authentication is required to print this document"
|
||||
703
debian/patches/build-Drop-gtk3-install.-vsprops-props.patch
vendored
Normal file
703
debian/patches/build-Drop-gtk3-install.-vsprops-props.patch
vendored
Normal file
@ -0,0 +1,703 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Mon, 16 May 2022 17:59:02 +0800
|
||||
Subject: build: Drop gtk3-install.[vsprops|props]
|
||||
|
||||
They are not used anymore, and are removed at this point.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:f4811ea1f1106b34b9980c2566ccd10374dea798
|
||||
---
|
||||
gdk/Makefile.am | 8 --
|
||||
gdk/broadway/Makefile.am | 8 +-
|
||||
gdk/win32/Makefile.am | 8 +-
|
||||
gtk/Makefile.am | 9 --
|
||||
libgail-util/Makefile.am | 8 +-
|
||||
win32/Makefile.msvcproj | 30 +-----
|
||||
win32/vs10/Makefile.am | 16 ---
|
||||
win32/vs10/gtk3-install.propsin | 222 ---------------------------------------
|
||||
win32/vs9/Makefile.am | 11 --
|
||||
win32/vs9/gtk3-install.vspropsin | 208 ------------------------------------
|
||||
10 files changed, 4 insertions(+), 524 deletions(-)
|
||||
delete mode 100644 win32/vs10/gtk3-install.propsin
|
||||
delete mode 100644 win32/vs9/gtk3-install.vspropsin
|
||||
|
||||
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
|
||||
index 632c687..5eae5a1 100644
|
||||
--- a/gdk/Makefile.am
|
||||
+++ b/gdk/Makefile.am
|
||||
@@ -458,13 +458,6 @@ MSVCPROJS = gdk-3
|
||||
|
||||
gdk_3_FILES = $(gdk_c_sources)
|
||||
gdk_3_EXCLUDES = dummy
|
||||
-gdk_3_HEADERS_DIR = $(gdkincludedir)
|
||||
-
|
||||
-gdk_3_HEADERS_INST = \
|
||||
- $(gdkinclude_HEADERS) \
|
||||
- $(deprecatedinclude_HEADERS)
|
||||
-
|
||||
-gdk_3_HEADERS_EXCLUDES = dummy
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
|
||||
@@ -509,7 +502,6 @@ endif
|
||||
|
||||
dist-hook: \
|
||||
$(top_builddir)/win32/vs9/gdk-3.vcproj \
|
||||
- $(top_builddir)/win32/vs9/gdk-3.headers \
|
||||
$(INTROSPECTION_INTERMEDIATE_ITEMS)
|
||||
|
||||
DISTCLEANFILES = gdkconfig.h stamp-gc-h
|
||||
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
|
||||
index 81725de..3b51870 100644
|
||||
--- a/gdk/broadway/Makefile.am
|
||||
+++ b/gdk/broadway/Makefile.am
|
||||
@@ -72,11 +72,6 @@ MSVCPROJS = gdk3-broadway broadwayd
|
||||
|
||||
gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES)
|
||||
gdk3_broadway_EXCLUDES = dummy
|
||||
-gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
|
||||
-
|
||||
-gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
|
||||
-
|
||||
-gdk3_broadway_HEADERS_EXCLUDES = dummy
|
||||
|
||||
broadwayd_FILES = $(broadwayd_SOURCES)
|
||||
broadwayd_EXCLUDES = dummy
|
||||
@@ -85,7 +80,6 @@ include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
|
||||
dist-hook: \
|
||||
$(top_builddir)/win32/vs9/gdk3-broadway.vcproj \
|
||||
- $(top_builddir)/win32/vs9/broadwayd.vcproj \
|
||||
- $(top_builddir)/win32/vs9/gdk3-broadway.headers
|
||||
+ $(top_builddir)/win32/vs9/broadwayd.vcproj
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
|
||||
index a2d52ce..d5fb09a 100644
|
||||
--- a/gdk/win32/Makefile.am
|
||||
+++ b/gdk/win32/Makefile.am
|
||||
@@ -114,16 +114,10 @@ MSVCPROJS = gdk3-win32
|
||||
|
||||
gdk3_win32_FILES = $(libgdk_win32_la_SOURCES)
|
||||
gdk3_win32_EXCLUDES = dummy
|
||||
-gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir)
|
||||
-
|
||||
-gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
|
||||
-
|
||||
-gdk3_win32_HEADERS_EXCLUDES = dummy
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
|
||||
dist-hook: \
|
||||
- $(top_builddir)/win32/vs9/gdk3-win32.vcproj \
|
||||
- $(top_builddir)/win32/vs9/gdk3-win32.headers
|
||||
+ $(top_builddir)/win32/vs9/gdk3-win32.vcproj
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index 1b66241..e96afd3 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -528,14 +528,6 @@ gtk_3_FILES = \
|
||||
$(gtk_use_win32_c_sources)
|
||||
|
||||
gtk_3_EXCLUDES = dummy
|
||||
-gtk_3_HEADERS_DIR = $(gtkincludedir)
|
||||
-
|
||||
-gtk_3_HEADERS_INST = \
|
||||
- $(filter-out gtkversion.h, $(gtkinclude_HEADERS)) \
|
||||
- $(a11y_h_sources) \
|
||||
- $(gtk_deprecated_h_sources)
|
||||
-
|
||||
-gtk_3_HEADERS_EXCLUDES = gtktypebuiltins.h
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
|
||||
@@ -592,7 +584,6 @@ endif
|
||||
|
||||
dist-hook: \
|
||||
$(top_builddir)/win32/vs9/gtk-3.vcproj \
|
||||
- $(top_builddir)/win32/vs9/gtk-3.headers \
|
||||
$(INTROSPECTION_INTERMEDIATE_ITEMS)
|
||||
|
||||
# Install a RC file for the default GTK+ theme, and key themes
|
||||
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
|
||||
index aa2f93a..0b389ad 100644
|
||||
--- a/libgail-util/Makefile.am
|
||||
+++ b/libgail-util/Makefile.am
|
||||
@@ -82,16 +82,10 @@ MSVCPROJS = gailutil-3
|
||||
gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
|
||||
|
||||
gailutil_3_EXCLUDES = dummy
|
||||
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
|
||||
-
|
||||
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
|
||||
-
|
||||
-gailutil_3_HEADERS_EXCLUDES = dummy
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
|
||||
dist-hook: \
|
||||
- $(top_builddir)/win32/vs9/gailutil-3.vcproj \
|
||||
- $(top_builddir)/win32/vs9/gailutil-3.headers
|
||||
+ $(top_builddir)/win32/vs9/gailutil-3.vcproj
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
|
||||
index cd7e469..c341313 100644
|
||||
--- a/win32/Makefile.msvcproj
|
||||
+++ b/win32/Makefile.msvcproj
|
||||
@@ -17,13 +17,9 @@
|
||||
# MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
|
||||
# YourProject_FILES = $(libyourlib_1_0_SOURCES)
|
||||
# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none
|
||||
-# YourProject_HEADERS_DIR = $(libyourlibincludedir)
|
||||
-# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
|
||||
-# YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
|
||||
#
|
||||
# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
|
||||
-# $(top_builddir)/win32/vs9/YourProject.vcproj \
|
||||
-# $(top_builddir)/win32/vs9/YourProject.headers
|
||||
+# $(top_builddir)/win32/vs9/YourProject.vcproj
|
||||
|
||||
|
||||
# Private functions
|
||||
@@ -40,13 +36,6 @@ _proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
|
||||
_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
|
||||
_proj_filters=$($(_proj_name)_EXCLUDES)
|
||||
|
||||
-_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
|
||||
-_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
|
||||
-_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
|
||||
-
|
||||
-_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
|
||||
-_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
|
||||
-
|
||||
#
|
||||
# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
|
||||
# $(1) - Base Name of the MSVC project files (outputs)
|
||||
@@ -95,23 +84,6 @@ $(top_builddir)/win32/vs9/$(1).vcproj: Makefile
|
||||
$(RM) $(1).vs10.sourcefiles
|
||||
$(RM) $(1).vs10.sourcefiles.filters
|
||||
|
||||
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
|
||||
-
|
||||
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
|
||||
- -$(RM) $(top_builddir)/win32/vs9/$(1).headers
|
||||
- -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
|
||||
-
|
||||
- for F in $(_proj_headers); do \
|
||||
- case $$$$F in \
|
||||
- $(_proj_headers_excludes)) \
|
||||
- ;; \
|
||||
- *.h|*.hpp|*.hh|*.hxx) \
|
||||
- echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'
' >>$(top_builddir)/win32/vs9/$(1).headers && \
|
||||
- echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
|
||||
- ;; \
|
||||
- esac; \
|
||||
- done
|
||||
-
|
||||
endef
|
||||
|
||||
$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
|
||||
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
|
||||
index ef62710..c226d5a 100644
|
||||
--- a/win32/vs10/Makefile.am
|
||||
+++ b/win32/vs10/Makefile.am
|
||||
@@ -22,13 +22,6 @@ GENERATED_ITEMS = \
|
||||
gtk3-install.props \
|
||||
gtk3-version-paths.props
|
||||
|
||||
-MSVC10_HEADERS_LISTS = \
|
||||
- gdk3-win32.vs10.headers \
|
||||
- gdk3-broadway.vs10.headers \
|
||||
- gdk-3.vs10.headers \
|
||||
- gtk-3.vs10.headers \
|
||||
- gailutil-3.vs10.headers
|
||||
-
|
||||
EXTRA_DIST += \
|
||||
README.txt \
|
||||
gtk+.sln \
|
||||
@@ -72,13 +65,4 @@ EXTRA_DIST += \
|
||||
DISTCLEANFILES = \
|
||||
$(GENERATED_ITEMS)
|
||||
|
||||
-gtk3-install.props: $(top_srcdir)/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
|
||||
- -$(RM) $(top_builddir)/win32/vs11/gtk3-install.props
|
||||
- -$(RM) $(top_builddir)/win32/vs12/gtk3-install.props
|
||||
- -$(RM) $(top_builddir)/win32/vs14/gtk3-install.props
|
||||
- -$(RM) $(top_builddir)/win32/vs15/gtk3-install.props
|
||||
- -$(RM) $(top_builddir)/win32/vs16/gtk3-install.props
|
||||
- $(CPP) -P - <$(top_srcdir)/win32/vs10/gtk3-install.propsin >$@
|
||||
- rm $(MSVC10_HEADERS_LISTS)
|
||||
-
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/win32/vs10/gtk3-install.propsin b/win32/vs10/gtk3-install.propsin
|
||||
deleted file mode 100644
|
||||
index 7e6cc46..0000000
|
||||
--- a/win32/vs10/gtk3-install.propsin
|
||||
+++ /dev/null
|
||||
@@ -1,222 +0,0 @@
|
||||
-<?xml version="1.0" encoding="utf-8"?>
|
||||
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
- <ImportGroup Label="PropertySheets">
|
||||
- <Import Project="gtk3-build-defines.props" />
|
||||
- </ImportGroup>
|
||||
- <PropertyGroup Label="UserMacros">
|
||||
- <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
|
||||
- <GtkDoInstallBin>
|
||||
-mkdir $(CopyDir)\bin
|
||||
-mkdir $(CopyDir)\share\gir-1.0
|
||||
-mkdir $(CopyDir)\lib\pkgconfig
|
||||
-mkdir $(CopyDir)\lib\girepository-1.0
|
||||
-
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
-
|
||||
-if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
|
||||
-if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
-copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
-copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
|
||||
-if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
-if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
-if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
-if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
-if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
-if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
-goto DONE_BIN
|
||||
-
|
||||
-:DO_BROADWAY_BIN
|
||||
-copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
|
||||
-copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
|
||||
-
|
||||
-if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
|
||||
-if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
|
||||
-:DO_BROADWAY_RELEASE
|
||||
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
|
||||
-copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
|
||||
-copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
-copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
-if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-
|
||||
-goto DONE_BIN
|
||||
-
|
||||
-:DO_BROADWAY_DEBUG
|
||||
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
|
||||
-copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
-
|
||||
-:DONE_BIN
|
||||
-
|
||||
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
|
||||
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc
|
||||
-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
|
||||
-copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc"
|
||||
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
|
||||
- </GtkDoInstallBin>
|
||||
- <GtkDoInstall>
|
||||
-echo off
|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
|
||||
-copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-
|
||||
-if "$(Configuration)" == "Release" goto COPY_RELEASE_BUILT_HEADERS
|
||||
-if "$(Configuration)" == "Release_Broadway" goto COPY_RELEASE_BUILT_HEADERS
|
||||
-if "$(Configuration)" == "Debug" goto COPY_DEBUG_BUILT_HEADERS
|
||||
-if "$(Configuration)" == "Debug_Broadway" goto COPY_DEBUG_BUILT_HEADERS
|
||||
-
|
||||
-:COPY_DEBUG_BUILT_HEADERS
|
||||
-copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
|
||||
-copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
|
||||
-goto CONTINUE_HEADERS
|
||||
-
|
||||
-:COPY_RELEASE_BUILT_HEADERS
|
||||
-copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-copy .\Release\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
|
||||
-copy .\Release\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
|
||||
-goto CONTINUE_HEADERS
|
||||
-
|
||||
-:CONTINUE_HEADERS
|
||||
-#include "gdk-3.vs10.headers"
|
||||
-#include "gdk3-win32.vs10.headers"
|
||||
-
|
||||
-#include "gtk-3.vs10.headers"
|
||||
-
|
||||
-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
|
||||
-#include "gailutil-3.vs10.headers"
|
||||
-
|
||||
-
|
||||
-for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
|
||||
-
|
||||
-mkdir $(CopyDir)\share\glib-2.0\schemas
|
||||
-copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
-copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
-copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
-copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
-copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
- </GtkDoInstall>
|
||||
- <GtkDoInstallBroadwayHeaders>
|
||||
-copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
|
||||
-#include "gdk3-broadway.vs10.headers"
|
||||
- </GtkDoInstallBroadwayHeaders>
|
||||
- <GtkPostInstall>
|
||||
-echo "Compiling gsettings XML Files..."
|
||||
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
|
||||
-
|
||||
-echo "Generating icon cache......"
|
||||
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
|
||||
- </GtkPostInstall>
|
||||
- <GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
|
||||
- <GenerateGtkPCX64>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
|
||||
- <GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
|
||||
- </PropertyGroup>
|
||||
- <PropertyGroup>
|
||||
- <_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
|
||||
- </PropertyGroup>
|
||||
- <ItemGroup>
|
||||
- <BuildMacro Include="BinDir">
|
||||
- <Value>$(BinDir)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="InstalledDlls">
|
||||
- <Value>$(InstalledDlls)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="InstalledBins">
|
||||
- <Value>$(InstalledBins)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="InstalledBroadwayBins">
|
||||
- <Value>$(InstalledBroadwayBins)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GtkDoInstallBin">
|
||||
- <Value>$(GtkDoInstallBin)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GtkDoInstall">
|
||||
- <Value>$(GtkDoInstall)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GtkDoInstallBroadwayHeaders">
|
||||
- <Value>$(GtkDoInstallBroadwayHeaders)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GtkPostInstall">
|
||||
- <Value>$(GtkPostInstall)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GenerateGtkPC">
|
||||
- <Value>$(GenerateGtkPC)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GenerateGtkPCX64">
|
||||
- <Value>$(GenerateGtkPCX64)</Value>
|
||||
- </BuildMacro>
|
||||
- <BuildMacro Include="GtkPCFiles">
|
||||
- <Value>$(GtkPCFiles)</Value>
|
||||
- </BuildMacro>
|
||||
- </ItemGroup>
|
||||
-</Project>
|
||||
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
|
||||
index eded327..0619477 100644
|
||||
--- a/win32/vs9/Makefile.am
|
||||
+++ b/win32/vs9/Makefile.am
|
||||
@@ -1,12 +1,5 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-MSVC_HEADERS_LISTS = \
|
||||
- gdk3-win32.headers \
|
||||
- gdk3-broadway.headers \
|
||||
- gdk-3.headers \
|
||||
- gtk-3.headers \
|
||||
- gailutil-3.headers
|
||||
-
|
||||
GENERATED_ITEMS = \
|
||||
gdk3-win32.vcproj \
|
||||
gdk3-broadway.vcproj \
|
||||
@@ -46,10 +39,6 @@ EXTRA_DIST += \
|
||||
gtk3-version-paths.vsprops.in \
|
||||
$(GENERATED_ITEMS)
|
||||
|
||||
-gtk3-install.vsprops: $(top_srcdir)/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
|
||||
- $(CPP) -P - <$(top_srcdir)/win32/vs9/gtk3-install.vspropsin >$@
|
||||
- rm $(MSVC_HEADERS_LISTS)
|
||||
-
|
||||
DISTCLEANFILES = $(GENERATED_ITEMS)
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/win32/vs9/gtk3-install.vspropsin b/win32/vs9/gtk3-install.vspropsin
|
||||
deleted file mode 100644
|
||||
index 4fb97df..0000000
|
||||
--- a/win32/vs9/gtk3-install.vspropsin
|
||||
+++ /dev/null
|
||||
@@ -1,208 +0,0 @@
|
||||
-<?xml version="1.0" encoding="Windows-1252"?>
|
||||
-<VisualStudioPropertySheet
|
||||
- ProjectType="Visual C++"
|
||||
- Version="8.00"
|
||||
- Name="gtkinstallprops"
|
||||
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
- >
|
||||
- <UserMacro
|
||||
- Name="GtkDoInstallBin"
|
||||
- Value="
|
||||
-mkdir $(CopyDir)\bin

|
||||
-mkdir $(CopyDir)\share\gir-1.0

|
||||
-mkdir $(CopyDir)\lib\pkgconfig

|
||||
-mkdir $(CopyDir)\lib\girepository-1.0

|
||||
-
|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-
|
||||
-if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_BIN

|
||||
-if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_BIN

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-goto DONE_BIN

|
||||
-
|
||||
-:DO_BROADWAY_BIN

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin

|
||||
-copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.pdb $(CopyDir)\bin

|
||||
-
|
||||
-if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_RELEASE

|
||||
-if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG

|
||||
-:DO_BROADWAY_RELEASE

|
||||
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.gir copy .\Release\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.gir copy .\Release\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-goto DONE_BIN

|
||||
-
|
||||
-:DO_BROADWAY_DEBUG

|
||||
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
-:DONE_BIN

|
||||
-
|
||||
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig

|
||||
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc

|
||||
-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig

|
||||
-copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc"

|
||||
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig

|
||||
- "
|
||||
- />
|
||||
- <UserMacro
|
||||
- Name="GtkDoInstall"
|
||||
- Value="
|
||||
-echo off

|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated

|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

|
||||
-
|
||||
-copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-
|
||||
-if "$(ConfigurationName)" == "Release" goto COPY_RELEASE_BUILT_HEADERS

|
||||
-if "$(ConfigurationName)" == "Release_Broadway" goto COPY_RELEASE_BUILT_HEADERS

|
||||
-if "$(ConfigurationName)" == "Debug" goto COPY_DEBUG_BUILT_HEADERS

|
||||
-if "$(ConfigurationName)" == "Debug_Broadway" goto COPY_DEBUG_BUILT_HEADERS

|
||||
-
|
||||
-:COPY_DEBUG_BUILT_HEADERS

|
||||
-copy .\Debug\$(PlatformName)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Debug\$(PlatformName)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Debug\$(PlatformName)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Debug\$(PlatformName)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

|
||||
-copy .\Debug\$(PlatformName)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

|
||||
-goto CONTINUE_HEADERS

|
||||
-
|
||||
-:COPY_RELEASE_BUILT_HEADERS

|
||||
-copy .\Release\$(PlatformName)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Release\$(PlatformName)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Release\$(PlatformName)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-copy .\Release\$(PlatformName)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

|
||||
-copy .\Release\$(PlatformName)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

|
||||
-goto CONTINUE_HEADERS

|
||||
-
|
||||
-:CONTINUE_HEADERS

|
||||
-#include "gdk-3.headers"
|
||||
-#include "gdk3-win32.headers"
|
||||
-#include "gtk-3.headers"
|
||||
-
|
||||
-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

|
||||
-#include "gailutil-3.headers"
|
||||
-
|
||||
-mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

|
||||
-copy ..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

|
||||
-mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

|
||||
-copy ..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

|
||||
-mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

|
||||
-copy ..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

|
||||
-mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

|
||||
-copy ..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

|
||||
-mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

|
||||
-copy ..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

|
||||
-mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

|
||||
-copy ..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\

|
||||
-
|
||||
-mkdir $(CopyDir)\share\glib-2.0\schemas

|
||||
-copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

|
||||
-copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas

|
||||
-copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

|
||||
-copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

|
||||
-copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas

|
||||
- "
|
||||
- />
|
||||
- <UserMacro
|
||||
- Name="GtkPostInstall"
|
||||
- Value="
|
||||
-echo "Compiling gsettings XML Files..."

|
||||
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas

|
||||
-
|
||||
-echo "Generating icon cache..."

|
||||
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
|
||||
- "
|
||||
- />
|
||||
- <UserMacro
|
||||
- Name="GtkDoInstallBroadwayHeaders"
|
||||
- Value="
|
||||
-copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

|
||||
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

|
||||
-#include "gdk3-broadway.headers"
|
||||
- "
|
||||
- />
|
||||
- <UserMacro
|
||||
- Name="GenerateGtkPC"
|
||||
- Value="$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
|
||||
- />
|
||||
- <UserMacro
|
||||
- Name="GenerateGtkPCX64"
|
||||
- Value="$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
|
||||
- />
|
||||
-</VisualStudioPropertySheet>
|
||||
85
debian/patches/demos-Don-t-dist-the-generated-GResource-sources.patch
vendored
Normal file
85
debian/patches/demos-Don-t-dist-the-generated-GResource-sources.patch
vendored
Normal file
@ -0,0 +1,85 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Tue, 17 May 2022 18:44:58 +0800
|
||||
Subject: demos: Don't dist the generated GResource sources
|
||||
|
||||
The Visual Studio projects have support for generating these, especially
|
||||
that the encoded string that result from them may become too big for the
|
||||
Visual Studio compiler to handle (such as for gtk3-demo) and we are normally
|
||||
supposed to generate the GResources sources for all builds, as the
|
||||
generated code depends on the compiler being used).
|
||||
|
||||
Origin: upstream, 3.24.35, commit:472c40fd3febf545d593c36ed57b703082793530
|
||||
---
|
||||
demos/gtk-demo/Makefile.am | 9 ++++-----
|
||||
demos/icon-browser/Makefile.am | 5 +++--
|
||||
demos/widget-factory/Makefile.am | 6 +++---
|
||||
3 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
|
||||
index 9aa1062..b0ecbcc 100644
|
||||
--- a/demos/gtk-demo/Makefile.am
|
||||
+++ b/demos/gtk-demo/Makefile.am
|
||||
@@ -61,22 +61,21 @@ demos.h: $(demos) geninclude.pl
|
||||
demos.h.win32: $(demos_base) geninclude.pl
|
||||
$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
|
||||
|
||||
-nodist_gtk3_demo_SOURCES = demos.h
|
||||
+nodist_gtk3_demo_SOURCES = demos.h demo_resources.c
|
||||
|
||||
gtk3_demo_SOURCES = \
|
||||
$(demos) \
|
||||
gtkfishbowl.c \
|
||||
gtkfishbowl.h \
|
||||
- demo_resources.c \
|
||||
main.c
|
||||
|
||||
gtk3_demo_DEPENDENCIES = $(DEPS)
|
||||
gtk3_demo_LDADD = $(LDADDS)
|
||||
gtk3_demo_LDFLAGS = -export-dynamic
|
||||
|
||||
-gtk3_demo_application_SOURCES = \
|
||||
- application.c \
|
||||
- demo_resources.c
|
||||
+nodist_gtk3_demo_application_SOURCES = demo_resources.c
|
||||
+
|
||||
+gtk3_demo_application_SOURCES = application.c
|
||||
|
||||
gtk3_demo_application_LDADD = $(LDADDS)
|
||||
|
||||
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
|
||||
index bf8425c..4ba64ee 100644
|
||||
--- a/demos/icon-browser/Makefile.am
|
||||
+++ b/demos/icon-browser/Makefile.am
|
||||
@@ -16,12 +16,13 @@ bin_PROGRAMS = gtk3-icon-browser
|
||||
desktopdir = $(datadir)/applications
|
||||
dist_desktop_DATA = gtk3-icon-browser.desktop
|
||||
|
||||
+nodist_gtk3_icon_browser_SOURCES = resources.c
|
||||
+
|
||||
gtk3_icon_browser_SOURCES = \
|
||||
main.c \
|
||||
iconbrowserapp.c iconbrowserapp.h \
|
||||
iconbrowserwin.c iconbrowserwin.h \
|
||||
- iconstore.c iconstore.h \
|
||||
- resources.c
|
||||
+ iconstore.c iconstore.h
|
||||
|
||||
BUILT_SOURCES = \
|
||||
resources.c
|
||||
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
|
||||
index c33a6d0..1afbb50 100644
|
||||
--- a/demos/widget-factory/Makefile.am
|
||||
+++ b/demos/widget-factory/Makefile.am
|
||||
@@ -5,9 +5,9 @@ bin_PROGRAMS = gtk3-widget-factory
|
||||
desktopdir = $(datadir)/applications
|
||||
dist_desktop_DATA = gtk3-widget-factory.desktop
|
||||
|
||||
-gtk3_widget_factory_SOURCES = \
|
||||
- widget-factory.c \
|
||||
- widget_factory_resources.c
|
||||
+nodist_gtk3_widget_factory_SOURCES = widget_factory_resources.c
|
||||
+
|
||||
+gtk3_widget_factory_SOURCES = widget-factory.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
widget_factory_resources.c
|
||||
50
debian/patches/demos-Fix-distcheck.patch
vendored
Normal file
50
debian/patches/demos-Fix-distcheck.patch
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 18 May 2022 17:48:16 +0800
|
||||
Subject: demos: Fix distcheck
|
||||
|
||||
Make sure that we remove the files generated by glib-compile-resources
|
||||
during distclean.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:0264e2d6a6cf748f6adbcfbe06b85fe184774c2e
|
||||
---
|
||||
demos/gtk-demo/Makefile.am | 2 +-
|
||||
demos/icon-browser/Makefile.am | 2 ++
|
||||
demos/widget-factory/Makefile.am | 2 ++
|
||||
3 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
|
||||
index b0ecbcc..0616798 100644
|
||||
--- a/demos/gtk-demo/Makefile.am
|
||||
+++ b/demos/gtk-demo/Makefile.am
|
||||
@@ -129,6 +129,6 @@ dist-hook: \
|
||||
$(top_builddir)/win32/vs9/gtk3-demo.vcproj \
|
||||
$(top_builddir)/win32/vs9/gtk3-demo-application.vcproj
|
||||
|
||||
-DISTCLEANFILES = demos.h demos.h.win32
|
||||
+DISTCLEANFILES = demos.h demos.h.win32 demo_resources.c
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
|
||||
index 4ba64ee..9183b01 100644
|
||||
--- a/demos/icon-browser/Makefile.am
|
||||
+++ b/demos/icon-browser/Makefile.am
|
||||
@@ -27,6 +27,8 @@ gtk3_icon_browser_SOURCES = \
|
||||
BUILT_SOURCES = \
|
||||
resources.c
|
||||
|
||||
+DISTCLEANFILES = resources.c
|
||||
+
|
||||
resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
|
||||
--target=$@ --sourcedir=$(srcdir) --generate-source
|
||||
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
|
||||
index 1afbb50..5faacb0 100644
|
||||
--- a/demos/widget-factory/Makefile.am
|
||||
+++ b/demos/widget-factory/Makefile.am
|
||||
@@ -69,4 +69,6 @@ EXTRA_DIST += \
|
||||
data/symbolic-source.svg \
|
||||
meson.build
|
||||
|
||||
+DISTCLEANFILES = widget_factory_resources.c
|
||||
+
|
||||
-include $(top_srcdir)/git.mk
|
||||
@ -1,369 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Thu, 18 Jul 2019 09:56:06 +0100
|
||||
Subject: demos, examples, tests: Don't distribute built files
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1001
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
|
||||
---
|
||||
demos/gtk-demo/Makefile.am | 14 +++++++++-----
|
||||
demos/icon-browser/Makefile.am | 9 +++++----
|
||||
demos/widget-factory/Makefile.am | 9 ++++-----
|
||||
examples/application10/Makefile.am | 4 +++-
|
||||
examples/application2/Makefile.am | 7 +++++--
|
||||
examples/application3/Makefile.am | 7 +++++--
|
||||
examples/application4/Makefile.am | 7 +++++--
|
||||
examples/application5/Makefile.am | 4 +++-
|
||||
examples/application6/Makefile.am | 4 +++-
|
||||
examples/application7/Makefile.am | 4 +++-
|
||||
examples/application8/Makefile.am | 4 +++-
|
||||
examples/application9/Makefile.am | 4 +++-
|
||||
testsuite/css/style/Makefile.am | 5 ++++-
|
||||
testsuite/gtk/Makefile.am | 4 +++-
|
||||
14 files changed, 58 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
|
||||
index 9aa1062..91af3d5 100644
|
||||
--- a/demos/gtk-demo/Makefile.am
|
||||
+++ b/demos/gtk-demo/Makefile.am
|
||||
@@ -61,13 +61,14 @@ demos.h: $(demos) geninclude.pl
|
||||
demos.h.win32: $(demos_base) geninclude.pl
|
||||
$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
|
||||
|
||||
-nodist_gtk3_demo_SOURCES = demos.h
|
||||
+nodist_gtk3_demo_SOURCES = \
|
||||
+ demos.h \
|
||||
+ demo_resources.c
|
||||
|
||||
gtk3_demo_SOURCES = \
|
||||
$(demos) \
|
||||
gtkfishbowl.c \
|
||||
gtkfishbowl.h \
|
||||
- demo_resources.c \
|
||||
main.c
|
||||
|
||||
gtk3_demo_DEPENDENCIES = $(DEPS)
|
||||
@@ -75,9 +76,12 @@ gtk3_demo_LDADD = $(LDADDS)
|
||||
gtk3_demo_LDFLAGS = -export-dynamic
|
||||
|
||||
gtk3_demo_application_SOURCES = \
|
||||
- application.c \
|
||||
+ application.c
|
||||
+nodist_gtk3_demo_application_SOURCES = \
|
||||
demo_resources.c
|
||||
|
||||
+CLEANFILES = $(BUILT_SOURCES)
|
||||
+
|
||||
gtk3_demo_application_LDADD = $(LDADDS)
|
||||
|
||||
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/demo.gresource.xml)
|
||||
@@ -118,10 +122,10 @@ uninstall-update-icon-cache:
|
||||
# ------------------- MSVC Build Items ----------------
|
||||
MSVCPROJS = gtk3-demo gtk3-demo-application
|
||||
|
||||
-gtk3_demo_FILES = $(gtk3_demo_SOURCES)
|
||||
+gtk3_demo_FILES = $(gtk3_demo_SOURCES) $(nodist_gtk3_demo_SOURCES)
|
||||
gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
|
||||
|
||||
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
|
||||
+gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES) $(nodist_gtk3_demo_application_SOURCES)
|
||||
gtk3_demo_application_EXCLUDES = dummy
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
|
||||
index bf8425c..b168bbb 100644
|
||||
--- a/demos/icon-browser/Makefile.am
|
||||
+++ b/demos/icon-browser/Makefile.am
|
||||
@@ -20,11 +20,12 @@ gtk3_icon_browser_SOURCES = \
|
||||
main.c \
|
||||
iconbrowserapp.c iconbrowserapp.h \
|
||||
iconbrowserwin.c iconbrowserwin.h \
|
||||
- iconstore.c iconstore.h \
|
||||
+ iconstore.c iconstore.h
|
||||
+nodist_gtk3_icon_browser_SOURCES = \
|
||||
resources.c
|
||||
|
||||
-BUILT_SOURCES = \
|
||||
- resources.c
|
||||
+BUILT_SOURCES = $(nodist_gtk3_icon_browser_SOURCES)
|
||||
+CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
|
||||
@@ -40,7 +41,7 @@ EXTRA_DIST = \
|
||||
# ------------------- MSVC Build Items ----------------
|
||||
MSVCPROJS = gtk3-icon-browser
|
||||
|
||||
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
|
||||
+gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES) $(nodist_gtk3_icon_browser_SOURCES)
|
||||
gtk3_icon_browser_EXCLUDES = dummy
|
||||
|
||||
include $(top_srcdir)/win32/Makefile.msvcproj
|
||||
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
|
||||
index c33a6d0..a0d6239 100644
|
||||
--- a/demos/widget-factory/Makefile.am
|
||||
+++ b/demos/widget-factory/Makefile.am
|
||||
@@ -5,12 +5,11 @@ bin_PROGRAMS = gtk3-widget-factory
|
||||
desktopdir = $(datadir)/applications
|
||||
dist_desktop_DATA = gtk3-widget-factory.desktop
|
||||
|
||||
-gtk3_widget_factory_SOURCES = \
|
||||
- widget-factory.c \
|
||||
- widget_factory_resources.c
|
||||
+gtk3_widget_factory_SOURCES = widget-factory.c
|
||||
+nodist_gtk3_widget_factory_SOURCES = widget_factory_resources.c
|
||||
|
||||
-BUILT_SOURCES = \
|
||||
- widget_factory_resources.c
|
||||
+BUILT_SOURCES = $(nodist_gtk3_widget_factory_SOURCES)
|
||||
+CLEANFILES = $(nodist_gtk3_widget_factory_SOURCES)
|
||||
|
||||
gtk3_widget_factory_DEPENDENCIES = \
|
||||
$(top_builddir)/gtk/libgtk-3.la
|
||||
diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am
|
||||
index c5bda45..355c2c0 100644
|
||||
--- a/examples/application10/Makefile.am
|
||||
+++ b/examples/application10/Makefile.am
|
||||
@@ -16,7 +16,8 @@ exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
exampleappwin.c exampleappwin.h \
|
||||
- exampleappprefs.c exampleappprefs.h \
|
||||
+ exampleappprefs.c exampleappprefs.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -45,6 +46,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am
|
||||
index 8fc0478..964e249 100644
|
||||
--- a/examples/application2/Makefile.am
|
||||
+++ b/examples/application2/Makefile.am
|
||||
@@ -15,10 +15,11 @@ exampleapp_LDADD = $(GTK_LIBS)
|
||||
exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
- exampleappwin.c exampleappwin.h \
|
||||
+ exampleappwin.c exampleappwin.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
-BUILT_SOURCES = resources.c
|
||||
+BUILT_SOURCES = $(nodist_exampleapp_SOURCES)
|
||||
|
||||
resources.c: exampleapp.gresource.xml window.ui
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
|
||||
@@ -29,4 +30,6 @@ EXTRA_DIST = \
|
||||
exampleapp.gresource.xml \
|
||||
meson.build
|
||||
|
||||
+CLEANFILES = $(BUILT_SOURCES)
|
||||
+
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am
|
||||
index 8fc0478..964e249 100644
|
||||
--- a/examples/application3/Makefile.am
|
||||
+++ b/examples/application3/Makefile.am
|
||||
@@ -15,10 +15,11 @@ exampleapp_LDADD = $(GTK_LIBS)
|
||||
exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
- exampleappwin.c exampleappwin.h \
|
||||
+ exampleappwin.c exampleappwin.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
-BUILT_SOURCES = resources.c
|
||||
+BUILT_SOURCES = $(nodist_exampleapp_SOURCES)
|
||||
|
||||
resources.c: exampleapp.gresource.xml window.ui
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
|
||||
@@ -29,4 +30,6 @@ EXTRA_DIST = \
|
||||
exampleapp.gresource.xml \
|
||||
meson.build
|
||||
|
||||
+CLEANFILES = $(BUILT_SOURCES)
|
||||
+
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am
|
||||
index 7bc91ba..c95e6d6 100644
|
||||
--- a/examples/application4/Makefile.am
|
||||
+++ b/examples/application4/Makefile.am
|
||||
@@ -15,10 +15,11 @@ exampleapp_LDADD = $(GTK_LIBS)
|
||||
exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
- exampleappwin.c exampleappwin.h \
|
||||
+ exampleappwin.c exampleappwin.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
-BUILT_SOURCES = resources.c
|
||||
+BUILT_SOURCES = $(nodist_exampleapp_SOURCES)
|
||||
|
||||
resources.c: exampleapp.gresource.xml window.ui app-menu.ui
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
|
||||
@@ -30,4 +31,6 @@ EXTRA_DIST = \
|
||||
exampleapp.gresource.xml \
|
||||
meson.build
|
||||
|
||||
+CLEANFILES = $(BUILT_SOURCES)
|
||||
+
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am
|
||||
index b6f34e7..d195699 100644
|
||||
--- a/examples/application5/Makefile.am
|
||||
+++ b/examples/application5/Makefile.am
|
||||
@@ -15,7 +15,8 @@ exampleapp_LDADD = $(GTK_LIBS)
|
||||
exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
- exampleappwin.c exampleappwin.h \
|
||||
+ exampleappwin.c exampleappwin.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -42,6 +43,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am
|
||||
index 9cf885e..18b9a49 100644
|
||||
--- a/examples/application6/Makefile.am
|
||||
+++ b/examples/application6/Makefile.am
|
||||
@@ -16,7 +16,8 @@ exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
exampleappwin.c exampleappwin.h \
|
||||
- exampleappprefs.c exampleappprefs.h \
|
||||
+ exampleappprefs.c exampleappprefs.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -44,6 +45,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am
|
||||
index 9cf885e..012ddc2 100644
|
||||
--- a/examples/application7/Makefile.am
|
||||
+++ b/examples/application7/Makefile.am
|
||||
@@ -16,7 +16,8 @@ exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
exampleappwin.c exampleappwin.h \
|
||||
- exampleappprefs.c exampleappprefs.h \
|
||||
+ exampleappprefs.c exampleappprefs.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -44,6 +45,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am
|
||||
index c5bda45..355c2c0 100644
|
||||
--- a/examples/application8/Makefile.am
|
||||
+++ b/examples/application8/Makefile.am
|
||||
@@ -16,7 +16,8 @@ exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
exampleappwin.c exampleappwin.h \
|
||||
- exampleappprefs.c exampleappprefs.h \
|
||||
+ exampleappprefs.c exampleappprefs.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -45,6 +46,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am
|
||||
index c5bda45..355c2c0 100644
|
||||
--- a/examples/application9/Makefile.am
|
||||
+++ b/examples/application9/Makefile.am
|
||||
@@ -16,7 +16,8 @@ exampleapp_SOURCES = \
|
||||
main.c \
|
||||
exampleapp.c exampleapp.h \
|
||||
exampleappwin.c exampleappwin.h \
|
||||
- exampleappprefs.c exampleappprefs.h \
|
||||
+ exampleappprefs.c exampleappprefs.h
|
||||
+nodist_exampleapp_SOURCES = \
|
||||
resources.c
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -45,6 +46,7 @@ EXTRA_DIST = \
|
||||
meson.build
|
||||
|
||||
CLEANFILES = \
|
||||
+ $(nodist_exampleapp_SOURCES) \
|
||||
gschemas.compiled
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am
|
||||
index 2ef0e55..57c54b2 100644
|
||||
--- a/testsuite/css/style/Makefile.am
|
||||
+++ b/testsuite/css/style/Makefile.am
|
||||
@@ -25,6 +25,8 @@ test_css_style_LDADD = \
|
||||
|
||||
test_css_style_SOURCES = \
|
||||
test-css-style.c \
|
||||
+ $(NULL)
|
||||
+nodist_test_css_style_SOURCES = \
|
||||
resources.c \
|
||||
$(NULL)
|
||||
|
||||
@@ -39,7 +41,8 @@ test_data = \
|
||||
nth-child.ui nth-child.css nth-child.nodes \
|
||||
$(NULL)
|
||||
|
||||
-BUILT_SOURCES = resources.c
|
||||
+BUILT_SOURCES = $(nodist_test_css_style_SOURCES)
|
||||
+CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/test-css-style.gresource.xml)
|
||||
|
||||
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
|
||||
index 843a515..b2ef0cf 100644
|
||||
--- a/testsuite/gtk/Makefile.am
|
||||
+++ b/testsuite/gtk/Makefile.am
|
||||
@@ -150,9 +150,11 @@ keyhash_CFLAGS = \
|
||||
keyhash_SOURCES = \
|
||||
keyhash.c \
|
||||
gtkkeyhash.c \
|
||||
- gtkresources.c \
|
||||
gtkprivate.c \
|
||||
$(NULL)
|
||||
+nodist_keyhash_SOURCES = \
|
||||
+ gtkresources.c \
|
||||
+ $(NULL)
|
||||
|
||||
gtkkeyhash.c: $(top_srcdir)/gtk/gtkkeyhash.c
|
||||
$(AM_V_GEN) $(LN_S) $^ $@
|
||||
56
debian/patches/docs-improve-doc-of-gtk_style_context_get.patch
vendored
Normal file
56
debian/patches/docs-improve-doc-of-gtk_style_context_get.patch
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
From: =?utf-8?q?S=C3=A9bastien_Wilmet?= <swilmet@informatique-libre.be>
|
||||
Date: Wed, 13 Jul 2022 17:12:42 +0200
|
||||
Subject: docs: improve doc of gtk_style_context_get()
|
||||
|
||||
When using this function in GtkSourceView (for GTK 3), there was a
|
||||
mistake for retrieving a GdkRGBA value.
|
||||
|
||||
So, better document the function to avoid further mistakes.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:fea466c13cd882053f563176e1386d2acc52c9a1
|
||||
---
|
||||
gtk/gtkstylecontext.c | 25 ++++++++++++++++++++++++-
|
||||
1 file changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
|
||||
index a96395c..11625d1 100644
|
||||
--- a/gtk/gtkstylecontext.c
|
||||
+++ b/gtk/gtkstylecontext.c
|
||||
@@ -896,13 +896,36 @@ gtk_style_context_get_valist (GtkStyleContext *context,
|
||||
* gtk_style_context_get:
|
||||
* @context: a #GtkStyleContext
|
||||
* @state: state to retrieve the property values for
|
||||
- * @...: property name /return value pairs, followed by %NULL
|
||||
+ * @...: property name / return value pairs, followed by %NULL
|
||||
*
|
||||
* Retrieves several style property values from @context for a
|
||||
* given state.
|
||||
*
|
||||
* See gtk_style_context_get_property() for details.
|
||||
*
|
||||
+ * For the property name / return value pairs, it works similarly as
|
||||
+ * g_object_get(). Example:
|
||||
+ *
|
||||
+ * |[<!-- language="C" -->
|
||||
+ * GdkRGBA *background_color = NULL;
|
||||
+ * PangoFontDescription *font_desc = NULL;
|
||||
+ * gint border_radius = 0;
|
||||
+ *
|
||||
+ * gtk_style_context_get (style_context,
|
||||
+ * gtk_style_context_get_state (style_context),
|
||||
+ * GTK_STYLE_PROPERTY_BACKGROUND_COLOR, &background_color,
|
||||
+ * GTK_STYLE_PROPERTY_FONT, &font_desc,
|
||||
+ * GTK_STYLE_PROPERTY_BORDER_RADIUS, &border_radius,
|
||||
+ * NULL);
|
||||
+ *
|
||||
+ * // Do something with the property values.
|
||||
+ *
|
||||
+ * if (background_color != NULL)
|
||||
+ * gdk_rgba_free (background_color);
|
||||
+ * if (font_desc != NULL)
|
||||
+ * pango_font_description_free (font_desc);
|
||||
+ * ]|
|
||||
+ *
|
||||
* Since: 3.0
|
||||
*/
|
||||
void
|
||||
@ -1,85 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Wed, 17 Jul 2019 13:54:41 +0100
|
||||
Subject: gdk: Don't distribute generated files in tarballs
|
||||
|
||||
gdkversionmacros.h is generated by configure, so it should be in
|
||||
DISTCLEANFILES. The rest of $(gdk_built_sources) are built at compile
|
||||
time by GLib tools, so in principle they should be in CLEANFILES, but
|
||||
DISTCLEANFILES is close enough.
|
||||
|
||||
This is a continuation of the same general topic as commit dad773b1.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1001
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
|
||||
---
|
||||
gdk/Makefile.am | 29 ++++++-----------------------
|
||||
1 file changed, 6 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
|
||||
index 860973b..53ec8d3 100644
|
||||
--- a/gdk/Makefile.am
|
||||
+++ b/gdk/Makefile.am
|
||||
@@ -161,16 +161,8 @@ nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
|
||||
deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
|
||||
deprecatedinclude_HEADERS = $(gdk_deprecated_h_sources)
|
||||
|
||||
-common_sources = \
|
||||
- $(gdk_private_headers) \
|
||||
- $(gdk_c_sources) \
|
||||
- gdkenumtypes.c \
|
||||
- gdkmarshalers.c \
|
||||
- gdkmarshalers.h \
|
||||
- gdkresources.h \
|
||||
- gdkresources.c
|
||||
-
|
||||
-libgdk_3_la_SOURCES = $(common_sources)
|
||||
+libgdk_3_la_SOURCES = $(gdk_private_headers) $(gdk_c_sources)
|
||||
+nodist_libgdk_3_la_SOURCES = $(gdk_built_sources)
|
||||
libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
|
||||
libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
|
||||
libgdk_3_la_LDFLAGS = $(LDADD)
|
||||
@@ -370,10 +362,8 @@ endif
|
||||
|
||||
lib_LTLIBRARIES = libgdk-3.la
|
||||
|
||||
-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
|
||||
-EXTRA_DIST += \
|
||||
- $(gdk_built_sources) \
|
||||
- fallback-c89.c
|
||||
+DISTCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
|
||||
+EXTRA_DIST += fallback-c89.c
|
||||
|
||||
install-exec-hook:
|
||||
if DISABLE_EXPLICIT_DEPS
|
||||
@@ -457,7 +447,7 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
|
||||
# ------------------- MSVC Build Items ----------------
|
||||
MSVCPROJS = gdk-3
|
||||
|
||||
-gdk_3_FILES = $(gdk_c_sources)
|
||||
+gdk_3_FILES = $(gdk_c_sources) $(gdk_built_sources)
|
||||
gdk_3_EXCLUDES = dummy
|
||||
gdk_3_HEADERS_DIR = $(gdkincludedir)
|
||||
|
||||
@@ -513,20 +503,13 @@ dist-hook: \
|
||||
$(top_builddir)/win32/vs9/gdk-3.headers \
|
||||
$(INTROSPECTION_INTERMEDIATE_ITEMS)
|
||||
|
||||
-DISTCLEANFILES = gdkconfig.h stamp-gc-h
|
||||
+DISTCLEANFILES += gdkconfig.h stamp-gc-h
|
||||
|
||||
install-data-local: install-ms-lib install-def-file
|
||||
|
||||
uninstall-local: uninstall-ms-lib uninstall-def-file
|
||||
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
|
||||
|
||||
-# if srcdir!=builddir, clean out maintainer-clean files from builddir
|
||||
-# this allows dist to pass.
|
||||
-distclean-local:
|
||||
- if test $(srcdir) != .; then \
|
||||
- rm -f $(MAINTAINERCLEANFILES); \
|
||||
- fi
|
||||
-
|
||||
.PHONY: files
|
||||
|
||||
files:
|
||||
24
debian/patches/gdk-Don-t-distribute-the-built-sources.patch
vendored
Normal file
24
debian/patches/gdk-Don-t-distribute-the-built-sources.patch
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Tue, 17 May 2022 18:42:37 +0800
|
||||
Subject: gdk/: Don't distribute the built sources
|
||||
|
||||
The Visual Studio projects have support for generating these items, so
|
||||
we don't really need to distribute them with the sources.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:abbf7a3497ec94a97f47b487dd37f4b9ffc36740
|
||||
---
|
||||
gdk/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
|
||||
index 860973b..632c687 100644
|
||||
--- a/gdk/Makefile.am
|
||||
+++ b/gdk/Makefile.am
|
||||
@@ -372,7 +372,6 @@ lib_LTLIBRARIES = libgdk-3.la
|
||||
|
||||
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
|
||||
EXTRA_DIST += \
|
||||
- $(gdk_built_sources) \
|
||||
fallback-c89.c
|
||||
|
||||
install-exec-hook:
|
||||
61
debian/patches/gdk-Ensure-GdkFrameClock-flush-events-with-uncompressed-m.patch
vendored
Normal file
61
debian/patches/gdk-Ensure-GdkFrameClock-flush-events-with-uncompressed-m.patch
vendored
Normal file
@ -0,0 +1,61 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Mon, 3 Oct 2022 16:39:08 +0200
|
||||
Subject: gdk: Ensure GdkFrameClock::flush-events with uncompressed motion
|
||||
|
||||
Sometimes, there may be motion events left in the queue, because at the
|
||||
time of handlign these motion events the GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS
|
||||
phase is not requested.
|
||||
|
||||
Ensure that, when finding motion events on a window that does not disable
|
||||
motion compression, the events are anyways flushed, so they can be processed
|
||||
early by the window/widget event handlers.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4946
|
||||
Origin: upstream, 3.24.35, commit:5ea961ed93ddcdc6fe3c5bedecb8469f08484024
|
||||
---
|
||||
gdk/gdkevents.c | 16 +++++++++++-----
|
||||
1 file changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
|
||||
index 12af9cc..087178e 100644
|
||||
--- a/gdk/gdkevents.c
|
||||
+++ b/gdk/gdkevents.c
|
||||
@@ -258,6 +258,7 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
|
||||
GList *pending_motions = NULL;
|
||||
GdkWindow *pending_motion_window = NULL;
|
||||
GdkDevice *pending_motion_device = NULL;
|
||||
+ gboolean uncompressed_motion = FALSE;
|
||||
|
||||
/* If the last N events in the event queue are motion notify
|
||||
* events for the same window, drop all but the last */
|
||||
@@ -282,10 +283,14 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
|
||||
pending_motion_device != event->event.motion.device)
|
||||
break;
|
||||
|
||||
+ pending_motion_window = event->event.motion.window;
|
||||
+
|
||||
if (!event->event.motion.window->event_compression)
|
||||
- break;
|
||||
+ {
|
||||
+ uncompressed_motion = TRUE;
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- pending_motion_window = event->event.motion.window;
|
||||
pending_motion_device = event->event.motion.device;
|
||||
pending_motions = tmp_list;
|
||||
|
||||
@@ -301,9 +306,10 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
|
||||
pending_motions = next;
|
||||
}
|
||||
|
||||
- if (pending_motions &&
|
||||
- pending_motions == display->queued_events &&
|
||||
- pending_motions == display->queued_tail)
|
||||
+ if (uncompressed_motion ||
|
||||
+ (pending_motions &&
|
||||
+ pending_motions == display->queued_events &&
|
||||
+ pending_motions == display->queued_tail))
|
||||
{
|
||||
GdkFrameClock *clock = gdk_window_get_frame_clock (pending_motion_window);
|
||||
if (clock) /* might be NULL if window was destroyed */
|
||||
391
debian/patches/gdk-Move-source-listings-to-gdk-sources.inc.patch
vendored
Normal file
391
debian/patches/gdk-Move-source-listings-to-gdk-sources.inc.patch
vendored
Normal file
@ -0,0 +1,391 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 18 May 2022 15:59:35 +0800
|
||||
Subject: gdk: Move source listings to gdk-sources.inc
|
||||
|
||||
We want to share those listings with other non-autools build systems.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:7c2e4fa3b250551b67e423898fe9d5f71ae6bcf1
|
||||
---
|
||||
gdk/Makefile.am | 169 ----------------------------------------------------
|
||||
gdk/gdk-sources.inc | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 169 insertions(+), 169 deletions(-)
|
||||
|
||||
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
|
||||
index 619ca01..c0cc804 100644
|
||||
--- a/gdk/Makefile.am
|
||||
+++ b/gdk/Makefile.am
|
||||
@@ -62,94 +62,6 @@ LDADD = \
|
||||
-rpath $(libdir) \
|
||||
$(no_undefined)
|
||||
|
||||
-#
|
||||
-# setup source file variables
|
||||
-#
|
||||
-
|
||||
-gdk_h_sources = \
|
||||
- $(gdk_public_h_sources) \
|
||||
- $(gdk_deprecated_h_sources)
|
||||
-
|
||||
-gdk_private_headers = \
|
||||
- gdk-private.h \
|
||||
- gdkapplaunchcontextprivate.h \
|
||||
- gdkconstructor.h \
|
||||
- gdkcursorprivate.h \
|
||||
- gdkdevicemanagerprivate.h \
|
||||
- gdkdeviceprivate.h \
|
||||
- gdkdevicepadprivate.h \
|
||||
- gdkdevicetoolprivate.h \
|
||||
- gdkdisplaymanagerprivate.h \
|
||||
- gdkdisplayprivate.h \
|
||||
- gdkdndprivate.h \
|
||||
- gdkdrawingcontextprivate.h \
|
||||
- gdkframeclockidle.h \
|
||||
- gdkframeclockprivate.h \
|
||||
- gdkglcontextprivate.h \
|
||||
- gdkmonitorprivate.h \
|
||||
- gdkprofilerprivate.h \
|
||||
- gdkscreenprivate.h \
|
||||
- gdkseatprivate.h \
|
||||
- gdkseatdefaultprivate.h \
|
||||
- gdkinternals.h \
|
||||
- gdkintl.h \
|
||||
- gdkkeysprivate.h \
|
||||
- gdkvisualprivate.h \
|
||||
- gdkx.h
|
||||
-
|
||||
-deprecated_c_sources = \
|
||||
- deprecated/gdkcolor.c
|
||||
-
|
||||
-gdk_c_sources = \
|
||||
- $(deprecated_c_sources) \
|
||||
- gdk-private.c \
|
||||
- gdk.c \
|
||||
- gdkapplaunchcontext.c \
|
||||
- gdkcairo.c \
|
||||
- gdkcursor.c \
|
||||
- gdkdeprecated.c \
|
||||
- gdkdevice.c \
|
||||
- gdkdevicepad.c \
|
||||
- gdkdevicetool.c \
|
||||
- gdkdevicemanager.c \
|
||||
- gdkdisplay.c \
|
||||
- gdkdisplaymanager.c \
|
||||
- gdkdnd.c \
|
||||
- gdkdrawingcontext.c \
|
||||
- gdkevents.c \
|
||||
- gdkframetimings.c \
|
||||
- gdkgl.c \
|
||||
- gdkglcontext.c \
|
||||
- gdkglobals.c \
|
||||
- gdkkeys.c \
|
||||
- gdkkeyuni.c \
|
||||
- gdkmonitor.c \
|
||||
- gdkoffscreenwindow.c \
|
||||
- gdkframeclock.c \
|
||||
- gdkframeclockidle.c \
|
||||
- gdkpango.c \
|
||||
- gdkpixbuf-drawable.c \
|
||||
- gdkprofiler.c \
|
||||
- gdkproperty.c \
|
||||
- gdkrectangle.c \
|
||||
- gdkrgba.c \
|
||||
- gdkscreen.c \
|
||||
- gdkseat.c \
|
||||
- gdkseatdefault.c \
|
||||
- gdkselection.c \
|
||||
- gdkvisual.c \
|
||||
- gdkwindow.c \
|
||||
- gdkwindowimpl.c
|
||||
-
|
||||
-gdk_built_sources = \
|
||||
- gdkenumtypes.h \
|
||||
- gdkenumtypes.c \
|
||||
- gdkmarshalers.h \
|
||||
- gdkmarshalers.c \
|
||||
- gdkresources.h \
|
||||
- gdkresources.c \
|
||||
- gdkversionmacros.h
|
||||
-
|
||||
#
|
||||
# setup GDK sources and their dependencies
|
||||
#
|
||||
@@ -217,57 +129,6 @@ if OS_WIN32
|
||||
Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
|
||||
endif
|
||||
if USE_X11
|
||||
-x11_introspection_files = \
|
||||
- x11/gdkapplaunchcontext-x11.c \
|
||||
- x11/gdkasync.c \
|
||||
- x11/gdkcursor-x11.c \
|
||||
- x11/gdkdevice-core-x11.c \
|
||||
- x11/gdkdevicemanager-core-x11.c \
|
||||
- x11/gdkdevicemanager-x11.c \
|
||||
- x11/gdkdevicemanager-xi2.c \
|
||||
- x11/gdkdevice-xi2.c \
|
||||
- x11/gdkdisplay-x11.c \
|
||||
- x11/gdkdisplaymanager-x11.c \
|
||||
- x11/gdkdnd-x11.c \
|
||||
- x11/gdkeventsource.c \
|
||||
- x11/gdkeventtranslator.c \
|
||||
- x11/gdkgeometry-x11.c \
|
||||
- x11/gdkglcontext-x11.c \
|
||||
- x11/gdkkeys-x11.c \
|
||||
- x11/gdkmain-x11.c \
|
||||
- x11/gdkmonitor-x11.c \
|
||||
- x11/gdkproperty-x11.c \
|
||||
- x11/gdkscreen-x11.c \
|
||||
- x11/gdkselection-x11.c \
|
||||
- x11/gdksettings.c \
|
||||
- x11/gdktestutils-x11.c \
|
||||
- x11/gdkvisual-x11.c \
|
||||
- x11/gdkwindow-x11.c \
|
||||
- x11/gdkxftdefaults.c \
|
||||
- x11/gdkxid.c \
|
||||
- x11/xsettings-client.c \
|
||||
- x11/gdkx.h \
|
||||
- x11/gdkx11applaunchcontext.h \
|
||||
- x11/gdkx11cursor.h \
|
||||
- x11/gdkx11device.h \
|
||||
- x11/gdkx11device-core.h \
|
||||
- x11/gdkx11device-xi2.h \
|
||||
- x11/gdkx11devicemanager.h \
|
||||
- x11/gdkx11devicemanager-core.h \
|
||||
- x11/gdkx11devicemanager-xi2.h \
|
||||
- x11/gdkx11display.h \
|
||||
- x11/gdkx11displaymanager.h \
|
||||
- x11/gdkx11dnd.h \
|
||||
- x11/gdkx11glcontext.h \
|
||||
- x11/gdkx11keys.h \
|
||||
- x11/gdkx11monitor.h \
|
||||
- x11/gdkx11property.h \
|
||||
- x11/gdkx11screen.h \
|
||||
- x11/gdkx11selection.h \
|
||||
- x11/gdkx11utils.h \
|
||||
- x11/gdkx11visual.h \
|
||||
- x11/gdkx11window.h
|
||||
-
|
||||
GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
|
||||
GdkX11_3_0_gir_SCANNERFLAGS = \
|
||||
--identifier-prefix=Gdk \
|
||||
@@ -282,36 +143,6 @@ INTROSPECTION_GIRS += GdkX11-3.0.gir
|
||||
|
||||
endif # USE_X11
|
||||
|
||||
-w32_introspection_files = \
|
||||
- win32/gdkcursor-win32.c \
|
||||
- win32/gdkdevicemanager-win32.c \
|
||||
- win32/gdkdevice-virtual.c \
|
||||
- win32/gdkdevice-win32.c \
|
||||
- win32/gdkdevice-wintab.c \
|
||||
- win32/gdkdisplaymanager-win32.c \
|
||||
- win32/gdkdisplay-win32.c \
|
||||
- win32/gdkdnd-win32.c \
|
||||
- win32/gdkevents-win32.c \
|
||||
- win32/gdkgeometry-win32.c \
|
||||
- win32/gdkglobals-win32.c \
|
||||
- win32/gdkkeys-win32.c \
|
||||
- win32/gdkmain-win32.c \
|
||||
- win32/gdkproperty-win32.c \
|
||||
- win32/gdkscreen-win32.c \
|
||||
- win32/gdkselection-win32.c \
|
||||
- win32/gdktestutils-win32.c \
|
||||
- win32/gdkwin32.h \
|
||||
- win32/gdkwin32cursor.h \
|
||||
- win32/gdkwin32display.h \
|
||||
- win32/gdkwin32displaymanager.h \
|
||||
- win32/gdkwin32dnd.h \
|
||||
- win32/gdkwin32id.c \
|
||||
- win32/gdkwin32keys.h \
|
||||
- win32/gdkwin32misc.h \
|
||||
- win32/gdkwin32screen.h \
|
||||
- win32/gdkwin32window.h \
|
||||
- win32/gdkwindow-win32.c
|
||||
-
|
||||
if OS_WIN32
|
||||
GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
|
||||
GdkWin32_3_0_gir_SCANNERFLAGS = \
|
||||
diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc
|
||||
index e84c5d0..9235edb 100644
|
||||
--- a/gdk/gdk-sources.inc
|
||||
+++ b/gdk/gdk-sources.inc
|
||||
@@ -1,7 +1,11 @@
|
||||
#
|
||||
# GDK header files for public installation (non-generated)
|
||||
#
|
||||
+
|
||||
+#
|
||||
+# setup source file variables
|
||||
#
|
||||
+
|
||||
gdk_public_h_sources = \
|
||||
gdk.h \
|
||||
gdk-autocleanup.h \
|
||||
@@ -42,3 +46,168 @@ gdk_public_h_sources = \
|
||||
|
||||
gdk_deprecated_h_sources = \
|
||||
deprecated/gdkcolor.h
|
||||
+
|
||||
+gdk_h_sources = \
|
||||
+ $(gdk_public_h_sources) \
|
||||
+ $(gdk_deprecated_h_sources)
|
||||
+
|
||||
+gdk_private_headers = \
|
||||
+ gdk-private.h \
|
||||
+ gdkapplaunchcontextprivate.h \
|
||||
+ gdkconstructor.h \
|
||||
+ gdkcursorprivate.h \
|
||||
+ gdkdevicemanagerprivate.h \
|
||||
+ gdkdeviceprivate.h \
|
||||
+ gdkdevicepadprivate.h \
|
||||
+ gdkdevicetoolprivate.h \
|
||||
+ gdkdisplaymanagerprivate.h \
|
||||
+ gdkdisplayprivate.h \
|
||||
+ gdkdndprivate.h \
|
||||
+ gdkdrawingcontextprivate.h \
|
||||
+ gdkframeclockidle.h \
|
||||
+ gdkframeclockprivate.h \
|
||||
+ gdkglcontextprivate.h \
|
||||
+ gdkmonitorprivate.h \
|
||||
+ gdkprofilerprivate.h \
|
||||
+ gdkscreenprivate.h \
|
||||
+ gdkseatprivate.h \
|
||||
+ gdkseatdefaultprivate.h \
|
||||
+ gdkinternals.h \
|
||||
+ gdkintl.h \
|
||||
+ gdkkeysprivate.h \
|
||||
+ gdkvisualprivate.h \
|
||||
+ gdkx.h
|
||||
+
|
||||
+gdk_deprecated_c_sources = \
|
||||
+ deprecated/gdkcolor.c
|
||||
+
|
||||
+gdk_c_sources = \
|
||||
+ $(gdk_deprecated_c_sources) \
|
||||
+ gdk-private.c \
|
||||
+ gdk.c \
|
||||
+ gdkapplaunchcontext.c \
|
||||
+ gdkcairo.c \
|
||||
+ gdkcursor.c \
|
||||
+ gdkdeprecated.c \
|
||||
+ gdkdevice.c \
|
||||
+ gdkdevicepad.c \
|
||||
+ gdkdevicetool.c \
|
||||
+ gdkdevicemanager.c \
|
||||
+ gdkdisplay.c \
|
||||
+ gdkdisplaymanager.c \
|
||||
+ gdkdnd.c \
|
||||
+ gdkdrawingcontext.c \
|
||||
+ gdkevents.c \
|
||||
+ gdkframetimings.c \
|
||||
+ gdkgl.c \
|
||||
+ gdkglcontext.c \
|
||||
+ gdkglobals.c \
|
||||
+ gdkkeys.c \
|
||||
+ gdkkeyuni.c \
|
||||
+ gdkmonitor.c \
|
||||
+ gdkoffscreenwindow.c \
|
||||
+ gdkframeclock.c \
|
||||
+ gdkframeclockidle.c \
|
||||
+ gdkpango.c \
|
||||
+ gdkpixbuf-drawable.c \
|
||||
+ gdkprofiler.c \
|
||||
+ gdkproperty.c \
|
||||
+ gdkrectangle.c \
|
||||
+ gdkrgba.c \
|
||||
+ gdkscreen.c \
|
||||
+ gdkseat.c \
|
||||
+ gdkseatdefault.c \
|
||||
+ gdkselection.c \
|
||||
+ gdkvisual.c \
|
||||
+ gdkwindow.c \
|
||||
+ gdkwindowimpl.c
|
||||
+
|
||||
+gdk_built_sources = \
|
||||
+ gdkenumtypes.h \
|
||||
+ gdkenumtypes.c \
|
||||
+ gdkmarshalers.h \
|
||||
+ gdkmarshalers.c \
|
||||
+ gdkresources.h \
|
||||
+ gdkresources.c \
|
||||
+ gdkversionmacros.h
|
||||
+
|
||||
+x11_introspection_files = \
|
||||
+ x11/gdkapplaunchcontext-x11.c \
|
||||
+ x11/gdkasync.c \
|
||||
+ x11/gdkcursor-x11.c \
|
||||
+ x11/gdkdevice-core-x11.c \
|
||||
+ x11/gdkdevicemanager-core-x11.c \
|
||||
+ x11/gdkdevicemanager-x11.c \
|
||||
+ x11/gdkdevicemanager-xi2.c \
|
||||
+ x11/gdkdevice-xi2.c \
|
||||
+ x11/gdkdisplay-x11.c \
|
||||
+ x11/gdkdisplaymanager-x11.c \
|
||||
+ x11/gdkdnd-x11.c \
|
||||
+ x11/gdkeventsource.c \
|
||||
+ x11/gdkeventtranslator.c \
|
||||
+ x11/gdkgeometry-x11.c \
|
||||
+ x11/gdkglcontext-x11.c \
|
||||
+ x11/gdkkeys-x11.c \
|
||||
+ x11/gdkmain-x11.c \
|
||||
+ x11/gdkmonitor-x11.c \
|
||||
+ x11/gdkproperty-x11.c \
|
||||
+ x11/gdkscreen-x11.c \
|
||||
+ x11/gdkselection-x11.c \
|
||||
+ x11/gdksettings.c \
|
||||
+ x11/gdktestutils-x11.c \
|
||||
+ x11/gdkvisual-x11.c \
|
||||
+ x11/gdkwindow-x11.c \
|
||||
+ x11/gdkxftdefaults.c \
|
||||
+ x11/gdkxid.c \
|
||||
+ x11/xsettings-client.c \
|
||||
+ x11/gdkx.h \
|
||||
+ x11/gdkx11applaunchcontext.h \
|
||||
+ x11/gdkx11cursor.h \
|
||||
+ x11/gdkx11device.h \
|
||||
+ x11/gdkx11device-core.h \
|
||||
+ x11/gdkx11device-xi2.h \
|
||||
+ x11/gdkx11devicemanager.h \
|
||||
+ x11/gdkx11devicemanager-core.h \
|
||||
+ x11/gdkx11devicemanager-xi2.h \
|
||||
+ x11/gdkx11display.h \
|
||||
+ x11/gdkx11displaymanager.h \
|
||||
+ x11/gdkx11dnd.h \
|
||||
+ x11/gdkx11glcontext.h \
|
||||
+ x11/gdkx11keys.h \
|
||||
+ x11/gdkx11monitor.h \
|
||||
+ x11/gdkx11property.h \
|
||||
+ x11/gdkx11screen.h \
|
||||
+ x11/gdkx11selection.h \
|
||||
+ x11/gdkx11utils.h \
|
||||
+ x11/gdkx11visual.h \
|
||||
+ x11/gdkx11window.h
|
||||
+
|
||||
+w32_introspection_files = \
|
||||
+ win32/gdkcursor-win32.c \
|
||||
+ win32/gdkdevicemanager-win32.c \
|
||||
+ win32/gdkdevice-virtual.c \
|
||||
+ win32/gdkdevice-win32.c \
|
||||
+ win32/gdkdevice-wintab.c \
|
||||
+ win32/gdkdisplaymanager-win32.c \
|
||||
+ win32/gdkdisplay-win32.c \
|
||||
+ win32/gdkdnd-win32.c \
|
||||
+ win32/gdkevents-win32.c \
|
||||
+ win32/gdkgeometry-win32.c \
|
||||
+ win32/gdkglobals-win32.c \
|
||||
+ win32/gdkkeys-win32.c \
|
||||
+ win32/gdkmain-win32.c \
|
||||
+ win32/gdkproperty-win32.c \
|
||||
+ win32/gdkscreen-win32.c \
|
||||
+ win32/gdkselection-win32.c \
|
||||
+ win32/gdktestutils-win32.c \
|
||||
+ win32/gdkwin32.h \
|
||||
+ win32/gdkwin32cursor.h \
|
||||
+ win32/gdkwin32display.h \
|
||||
+ win32/gdkwin32displaymanager.h \
|
||||
+ win32/gdkwin32dnd.h \
|
||||
+ win32/gdkwin32id.c \
|
||||
+ win32/gdkwin32keys.h \
|
||||
+ win32/gdkwin32misc.h \
|
||||
+ win32/gdkwin32screen.h \
|
||||
+ win32/gdkwin32window.h \
|
||||
+ win32/gdkwindow-win32.c
|
||||
141
debian/patches/gdk-Rename-gdk-pub-headers.h-to-gdk-sources.inc.patch
vendored
Normal file
141
debian/patches/gdk-Rename-gdk-pub-headers.h-to-gdk-sources.inc.patch
vendored
Normal file
@ -0,0 +1,141 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 18 May 2022 15:49:05 +0800
|
||||
Subject: gdk/: Rename gdk-pub-headers.h to gdk-sources.inc
|
||||
|
||||
We want to make the sources listings for libgdk shared as well.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:f324c650a717d2d0a12faafa7a8c2f2888ace72e
|
||||
---
|
||||
gdk/Makefile.am | 2 +-
|
||||
gdk/gdk-pub-headers.mak | 44 --------------------------------------------
|
||||
gdk/gdk-sources.inc | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
win32/create-lists-msvc.mak | 2 +-
|
||||
4 files changed, 46 insertions(+), 46 deletions(-)
|
||||
delete mode 100644 gdk/gdk-pub-headers.mak
|
||||
create mode 100644 gdk/gdk-sources.inc
|
||||
|
||||
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
|
||||
index 5eae5a1..619ca01 100644
|
||||
--- a/gdk/Makefile.am
|
||||
+++ b/gdk/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
## Makefile.am for gtk+/gdk
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
-include gdk-pub-headers.mak
|
||||
+include gdk-sources.inc
|
||||
|
||||
-include $(INTROSPECTION_MAKEFILE)
|
||||
INTROSPECTION_GIRS =
|
||||
diff --git a/gdk/gdk-pub-headers.mak b/gdk/gdk-pub-headers.mak
|
||||
deleted file mode 100644
|
||||
index e84c5d0..0000000
|
||||
--- a/gdk/gdk-pub-headers.mak
|
||||
+++ /dev/null
|
||||
@@ -1,44 +0,0 @@
|
||||
-#
|
||||
-# GDK header files for public installation (non-generated)
|
||||
-#
|
||||
-#
|
||||
-gdk_public_h_sources = \
|
||||
- gdk.h \
|
||||
- gdk-autocleanup.h \
|
||||
- gdkapplaunchcontext.h \
|
||||
- gdkcairo.h \
|
||||
- gdkcursor.h \
|
||||
- gdkdevice.h \
|
||||
- gdkdevicepad.h \
|
||||
- gdkdevicetool.h \
|
||||
- gdkdevicemanager.h \
|
||||
- gdkdisplay.h \
|
||||
- gdkdisplaymanager.h \
|
||||
- gdkdnd.h \
|
||||
- gdkdrawingcontext.h \
|
||||
- gdkevents.h \
|
||||
- gdkframetimings.h \
|
||||
- gdkglcontext.h \
|
||||
- gdkkeys.h \
|
||||
- gdkkeysyms.h \
|
||||
- gdkkeysyms-compat.h \
|
||||
- gdkmain.h \
|
||||
- gdkmonitor.h \
|
||||
- gdkpango.h \
|
||||
- gdkframeclock.h \
|
||||
- gdkpixbuf.h \
|
||||
- gdkprivate.h \
|
||||
- gdkproperty.h \
|
||||
- gdkrectangle.h \
|
||||
- gdkrgba.h \
|
||||
- gdkscreen.h \
|
||||
- gdkseat.h \
|
||||
- gdkselection.h \
|
||||
- gdktestutils.h \
|
||||
- gdkthreads.h \
|
||||
- gdktypes.h \
|
||||
- gdkvisual.h \
|
||||
- gdkwindow.h
|
||||
-
|
||||
-gdk_deprecated_h_sources = \
|
||||
- deprecated/gdkcolor.h
|
||||
diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc
|
||||
new file mode 100644
|
||||
index 0000000..e84c5d0
|
||||
--- /dev/null
|
||||
+++ b/gdk/gdk-sources.inc
|
||||
@@ -0,0 +1,44 @@
|
||||
+#
|
||||
+# GDK header files for public installation (non-generated)
|
||||
+#
|
||||
+#
|
||||
+gdk_public_h_sources = \
|
||||
+ gdk.h \
|
||||
+ gdk-autocleanup.h \
|
||||
+ gdkapplaunchcontext.h \
|
||||
+ gdkcairo.h \
|
||||
+ gdkcursor.h \
|
||||
+ gdkdevice.h \
|
||||
+ gdkdevicepad.h \
|
||||
+ gdkdevicetool.h \
|
||||
+ gdkdevicemanager.h \
|
||||
+ gdkdisplay.h \
|
||||
+ gdkdisplaymanager.h \
|
||||
+ gdkdnd.h \
|
||||
+ gdkdrawingcontext.h \
|
||||
+ gdkevents.h \
|
||||
+ gdkframetimings.h \
|
||||
+ gdkglcontext.h \
|
||||
+ gdkkeys.h \
|
||||
+ gdkkeysyms.h \
|
||||
+ gdkkeysyms-compat.h \
|
||||
+ gdkmain.h \
|
||||
+ gdkmonitor.h \
|
||||
+ gdkpango.h \
|
||||
+ gdkframeclock.h \
|
||||
+ gdkpixbuf.h \
|
||||
+ gdkprivate.h \
|
||||
+ gdkproperty.h \
|
||||
+ gdkrectangle.h \
|
||||
+ gdkrgba.h \
|
||||
+ gdkscreen.h \
|
||||
+ gdkseat.h \
|
||||
+ gdkselection.h \
|
||||
+ gdktestutils.h \
|
||||
+ gdkthreads.h \
|
||||
+ gdktypes.h \
|
||||
+ gdkvisual.h \
|
||||
+ gdkwindow.h
|
||||
+
|
||||
+gdk_deprecated_h_sources = \
|
||||
+ deprecated/gdkcolor.h
|
||||
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
|
||||
index 02eada5..0d99a00 100644
|
||||
--- a/win32/create-lists-msvc.mak
|
||||
+++ b/win32/create-lists-msvc.mak
|
||||
@@ -34,7 +34,7 @@
|
||||
NULL=
|
||||
|
||||
# For GDK enumeration sources
|
||||
-!include ..\gdk\gdk-pub-headers.mak
|
||||
+!include ..\gdk\gdk-sources.inc
|
||||
|
||||
!if [call create-lists.bat header gdk_headers.mak GDK_PUBLIC_HEADERS]
|
||||
!endif
|
||||
28
debian/patches/gdk-broadway-Makefile.am-Correct-build-variable.patch
vendored
Normal file
28
debian/patches/gdk-broadway-Makefile.am-Correct-build-variable.patch
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 3 Aug 2022 17:17:20 +0800
|
||||
Subject: gdk/broadway/Makefile.am: Correct build variable
|
||||
|
||||
They should be enclosed by $() not ${}.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:3bd0e8ff2efd538cf5ffb6f140803789a28184b8
|
||||
---
|
||||
gdk/broadway/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
|
||||
index 3b51870..7136182 100644
|
||||
--- a/gdk/broadway/Makefile.am
|
||||
+++ b/gdk/broadway/Makefile.am
|
||||
@@ -40,10 +40,10 @@ EXTRA_DIST += broadway.js rawinflate.min.js
|
||||
|
||||
# built headers that don't get installed
|
||||
broadway_built_sources = \
|
||||
- ${broadway_built_private_headers}
|
||||
+ $(broadway_built_private_headers)
|
||||
|
||||
libgdk_broadway_la_SOURCES = \
|
||||
- ${broadway_built_private_headers}\
|
||||
+ $(broadway_built_private_headers)\
|
||||
$(GDK_BROADWAY_NON_GENERATED_SOURCES)
|
||||
|
||||
if OS_UNIX
|
||||
162
debian/patches/gdk-broadway-Split-out-sources-listing.patch
vendored
Normal file
162
debian/patches/gdk-broadway-Split-out-sources-listing.patch
vendored
Normal file
@ -0,0 +1,162 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Fri, 13 May 2022 18:41:15 +0800
|
||||
Subject: gdk/broadway: Split out sources listing
|
||||
|
||||
This way, we can reuse these lists in other non-autotools Makefile-based
|
||||
build systems.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:ea3b599d7fe1135ad9c9b32d11b73a6c73b3b848
|
||||
---
|
||||
gdk/broadway/Makefile.am | 51 ++------------------------------
|
||||
gdk/broadway/gdk-broadway-sources.inc | 55 +++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 58 insertions(+), 48 deletions(-)
|
||||
create mode 100644 gdk/broadway/gdk-broadway-sources.inc
|
||||
|
||||
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
|
||||
index a43a577..81725de 100644
|
||||
--- a/gdk/broadway/Makefile.am
|
||||
+++ b/gdk/broadway/Makefile.am
|
||||
@@ -1,5 +1,6 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
+include gdk-broadway-sources.inc
|
||||
NULL =
|
||||
|
||||
libgdkincludedir = $(includedir)/gtk-3.0/gdk
|
||||
@@ -23,15 +24,7 @@ noinst_LTLIBRARIES = libgdk-broadway.la
|
||||
|
||||
bin_PROGRAMS = broadwayd
|
||||
|
||||
-libgdkinclude_HEADERS = \
|
||||
- gdkbroadway.h
|
||||
-
|
||||
-libgdkbroadwayinclude_HEADERS = \
|
||||
- gdkbroadwaydisplay.h \
|
||||
- gdkbroadwaywindow.h \
|
||||
- gdkbroadwaycursor.h \
|
||||
- gdkbroadwaymonitor.h \
|
||||
- gdkbroadwayvisual.h
|
||||
+libgdkinclude_HEADERS = $(GDK_PUBLIC_H_SRCS_BROADWAY)
|
||||
|
||||
EXTRA_DIST += toarray.pl
|
||||
|
||||
@@ -46,40 +39,12 @@ broadwayjs.h: broadway.js rawinflate.min.js
|
||||
EXTRA_DIST += broadway.js rawinflate.min.js
|
||||
|
||||
# built headers that don't get installed
|
||||
-broadway_built_private_headers = \
|
||||
- clienthtml.h \
|
||||
- broadwayjs.h
|
||||
-
|
||||
broadway_built_sources = \
|
||||
${broadway_built_private_headers}
|
||||
|
||||
libgdk_broadway_la_SOURCES = \
|
||||
${broadway_built_private_headers}\
|
||||
- gdkcursor-broadway.c \
|
||||
- gdkdevice-broadway.h \
|
||||
- gdkdevice-broadway.c \
|
||||
- gdkdevicemanager-broadway.h \
|
||||
- gdkdevicemanager-broadway.c \
|
||||
- gdkdisplay-broadway.c \
|
||||
- gdkdisplay-broadway.h \
|
||||
- gdkdnd-broadway.c \
|
||||
- gdkeventsource.c \
|
||||
- gdkeventsource.h \
|
||||
- gdkglobals-broadway.c \
|
||||
- gdkkeys-broadway.c \
|
||||
- gdkmonitor-broadway.c \
|
||||
- gdkmonitor-broadway.h \
|
||||
- gdkproperty-broadway.c \
|
||||
- gdkscreen-broadway.c \
|
||||
- gdkscreen-broadway.h \
|
||||
- gdkselection-broadway.c \
|
||||
- gdktestutils-broadway.c \
|
||||
- gdkvisual-broadway.c \
|
||||
- gdkwindow-broadway.c \
|
||||
- gdkwindow-broadway.h \
|
||||
- gdkprivate-broadway.h \
|
||||
- gdkbroadway-server.h \
|
||||
- gdkbroadway-server.c
|
||||
+ $(GDK_BROADWAY_NON_GENERATED_SOURCES)
|
||||
|
||||
if OS_UNIX
|
||||
libgdk_broadway_la_LIBADD = \
|
||||
@@ -87,16 +52,6 @@ libgdk_broadway_la_LIBADD = \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
-broadwayd_SOURCES = \
|
||||
- broadway-protocol.h \
|
||||
- broadwayd.c \
|
||||
- broadway-server.h \
|
||||
- broadway-server.c \
|
||||
- broadway-buffer.c \
|
||||
- broadway-buffer.h \
|
||||
- broadway-output.h \
|
||||
- broadway-output.c
|
||||
-
|
||||
if OS_WIN32
|
||||
broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
|
||||
else
|
||||
diff --git a/gdk/broadway/gdk-broadway-sources.inc b/gdk/broadway/gdk-broadway-sources.inc
|
||||
new file mode 100644
|
||||
index 0000000..dd047f9
|
||||
--- /dev/null
|
||||
+++ b/gdk/broadway/gdk-broadway-sources.inc
|
||||
@@ -0,0 +1,55 @@
|
||||
+# Public header list for GdkBroadway
|
||||
+
|
||||
+GDK_PUBLIC_H_SRCS_BROADWAY = \
|
||||
+ gdkbroadway.h
|
||||
+
|
||||
+libgdkbroadwayinclude_HEADERS = \
|
||||
+ gdkbroadwaydisplay.h \
|
||||
+ gdkbroadwaywindow.h \
|
||||
+ gdkbroadwaycursor.h \
|
||||
+ gdkbroadwaymonitor.h \
|
||||
+ gdkbroadwayvisual.h
|
||||
+
|
||||
+# built headers that don't get installed
|
||||
+
|
||||
+broadway_built_private_headers = \
|
||||
+ clienthtml.h \
|
||||
+ broadwayjs.h
|
||||
+
|
||||
+# Other non-generated sources
|
||||
+GDK_BROADWAY_NON_GENERATED_SOURCES = \
|
||||
+ gdkcursor-broadway.c \
|
||||
+ gdkdevice-broadway.h \
|
||||
+ gdkdevice-broadway.c \
|
||||
+ gdkdevicemanager-broadway.h \
|
||||
+ gdkdevicemanager-broadway.c \
|
||||
+ gdkdisplay-broadway.c \
|
||||
+ gdkdisplay-broadway.h \
|
||||
+ gdkdnd-broadway.c \
|
||||
+ gdkeventsource.c \
|
||||
+ gdkeventsource.h \
|
||||
+ gdkglobals-broadway.c \
|
||||
+ gdkkeys-broadway.c \
|
||||
+ gdkmonitor-broadway.c \
|
||||
+ gdkmonitor-broadway.h \
|
||||
+ gdkproperty-broadway.c \
|
||||
+ gdkscreen-broadway.c \
|
||||
+ gdkscreen-broadway.h \
|
||||
+ gdkselection-broadway.c \
|
||||
+ gdktestutils-broadway.c \
|
||||
+ gdkvisual-broadway.c \
|
||||
+ gdkwindow-broadway.c \
|
||||
+ gdkwindow-broadway.h \
|
||||
+ gdkprivate-broadway.h \
|
||||
+ gdkbroadway-server.h \
|
||||
+ gdkbroadway-server.c
|
||||
+
|
||||
+broadwayd_SOURCES = \
|
||||
+ broadway-protocol.h \
|
||||
+ broadwayd.c \
|
||||
+ broadway-server.h \
|
||||
+ broadway-server.c \
|
||||
+ broadway-buffer.c \
|
||||
+ broadway-buffer.h \
|
||||
+ broadway-output.h \
|
||||
+ broadway-output.c
|
||||
52
debian/patches/gdk-wayland-Check-the-GdkSurface-wl_surface-before-using-.patch
vendored
Normal file
52
debian/patches/gdk-wayland-Check-the-GdkSurface-wl_surface-before-using-.patch
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 2 Jun 2022 23:05:39 +0200
|
||||
Subject: gdk/wayland: Check the GdkSurface wl_surface before using it for
|
||||
activation
|
||||
|
||||
Double check the GdkSurface has a wl_surface before using it as the activation
|
||||
token source, since we cannot use NULL surfaces here.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1862
|
||||
Backport-of: 4b41d4f78ce71b60f0d51837cd1b6a1b346d679d
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Origin: upstream, 3.24.35, commit:3b25f9a66221509c11159afd6e49ad227f575939
|
||||
---
|
||||
gdk/wayland/gdkapplaunchcontext-wayland.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
index f95b153..eb1d2cd 100644
|
||||
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
@@ -62,6 +62,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
{
|
||||
struct xdg_activation_token_v1 *token;
|
||||
struct wl_event_queue *event_queue;
|
||||
+ struct wl_surface *wl_surface = NULL;
|
||||
GdkSeat *seat;
|
||||
GdkWindow *focus_window;
|
||||
AppLaunchData app_launch_data = { 0 };
|
||||
@@ -69,7 +70,6 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
event_queue = wl_display_create_queue (display->wl_display);
|
||||
|
||||
seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
|
||||
- focus_window = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (seat));
|
||||
token = xdg_activation_v1_get_activation_token (display->xdg_activation);
|
||||
wl_proxy_set_queue ((struct wl_proxy *) token, event_queue);
|
||||
|
||||
@@ -79,9 +79,13 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
xdg_activation_token_v1_set_serial (token,
|
||||
_gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL),
|
||||
gdk_wayland_seat_get_wl_seat (seat));
|
||||
+
|
||||
+ focus_window = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (seat));
|
||||
if (focus_window)
|
||||
- xdg_activation_token_v1_set_surface (token,
|
||||
- gdk_wayland_window_get_wl_surface (focus_window));
|
||||
+ wl_surface = gdk_wayland_window_get_wl_surface (focus_window);
|
||||
+ if (wl_surface)
|
||||
+ xdg_activation_token_v1_set_surface (token, wl_surface);
|
||||
+
|
||||
xdg_activation_token_v1_commit (token);
|
||||
|
||||
while (app_launch_data.token == NULL)
|
||||
50
debian/patches/gdk-wayland-Dispatch-GdkAppLaunchContext-activation-token.patch
vendored
Normal file
50
debian/patches/gdk-wayland-Dispatch-GdkAppLaunchContext-activation-token.patch
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 2 Jun 2022 23:04:40 +0200
|
||||
Subject: gdk/wayland: Dispatch GdkAppLaunchContext activation token in its
|
||||
own queue
|
||||
|
||||
Use a separate queue to dispatch the token object exclusively, just like we
|
||||
do on the GdkSurface activation paths.
|
||||
|
||||
Backport-of: fb68600d88d4d334f7da7d079b106a1ef14503a6
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Origin: upstream, 3.24.35, commit:7fa87abf8af6a71a02f59eb159c5650ad2a37727
|
||||
---
|
||||
gdk/wayland/gdkapplaunchcontext-wayland.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
index 03f0058..f95b153 100644
|
||||
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
@@ -61,13 +61,17 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
if (display->xdg_activation)
|
||||
{
|
||||
struct xdg_activation_token_v1 *token;
|
||||
+ struct wl_event_queue *event_queue;
|
||||
GdkSeat *seat;
|
||||
GdkWindow *focus_window;
|
||||
AppLaunchData app_launch_data = { 0 };
|
||||
|
||||
+ event_queue = wl_display_create_queue (display->wl_display);
|
||||
+
|
||||
seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
|
||||
focus_window = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (seat));
|
||||
token = xdg_activation_v1_get_activation_token (display->xdg_activation);
|
||||
+ wl_proxy_set_queue ((struct wl_proxy *) token, event_queue);
|
||||
|
||||
xdg_activation_token_v1_add_listener (token,
|
||||
&token_listener,
|
||||
@@ -81,10 +85,11 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
xdg_activation_token_v1_commit (token);
|
||||
|
||||
while (app_launch_data.token == NULL)
|
||||
- wl_display_roundtrip (display->wl_display);
|
||||
+ wl_display_dispatch_queue (display->wl_display, event_queue);
|
||||
|
||||
xdg_activation_token_v1_destroy (token);
|
||||
id = app_launch_data.token;
|
||||
+ wl_event_queue_destroy (event_queue);
|
||||
}
|
||||
else if (display->gtk_shell_version >= 3)
|
||||
{
|
||||
57
debian/patches/gdk-wayland-Drop-motion-hint-mask-from-seat-grab-event-ma.patch
vendored
Normal file
57
debian/patches/gdk-wayland-Drop-motion-hint-mask-from-seat-grab-event-ma.patch
vendored
Normal file
@ -0,0 +1,57 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Fri, 12 Aug 2022 01:36:59 +0200
|
||||
Subject: gdk/wayland: Drop motion hint mask from seat grab event masks
|
||||
|
||||
At best, it's just an awkward event mask sitting there for a backend
|
||||
that does not need it. At worst, this may result in motion events being
|
||||
eaten away in the right set of circumstances.
|
||||
|
||||
Avoid the pointer motion hint mask, and rely on events being further
|
||||
than hints.
|
||||
|
||||
Related: https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/534#note_1526935
|
||||
Origin: upstream, 3.24.35, commit:2c65884a5e31afe3ea5f7983ec423c8e39c5e9f2
|
||||
---
|
||||
gdk/wayland/gdkdevice-wayland.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
|
||||
index 67bd322..ed6ad3b 100644
|
||||
--- a/gdk/wayland/gdkdevice-wayland.c
|
||||
+++ b/gdk/wayland/gdkdevice-wayland.c
|
||||
@@ -4937,7 +4937,7 @@ gdk_wayland_seat_grab (GdkSeat *seat,
|
||||
native,
|
||||
GDK_OWNERSHIP_NONE,
|
||||
owner_events,
|
||||
- GDK_ALL_EVENTS_MASK,
|
||||
+ GDK_ALL_EVENTS_MASK & ~GDK_POINTER_MOTION_HINT_MASK,
|
||||
_gdk_display_get_next_serial (display),
|
||||
evtime,
|
||||
FALSE);
|
||||
@@ -4959,7 +4959,7 @@ gdk_wayland_seat_grab (GdkSeat *seat,
|
||||
native,
|
||||
GDK_OWNERSHIP_NONE,
|
||||
owner_events,
|
||||
- GDK_ALL_EVENTS_MASK,
|
||||
+ GDK_ALL_EVENTS_MASK & ~GDK_POINTER_MOTION_HINT_MASK,
|
||||
_gdk_display_get_next_serial (display),
|
||||
evtime,
|
||||
FALSE);
|
||||
@@ -4977,7 +4977,7 @@ gdk_wayland_seat_grab (GdkSeat *seat,
|
||||
native,
|
||||
GDK_OWNERSHIP_NONE,
|
||||
owner_events,
|
||||
- GDK_ALL_EVENTS_MASK,
|
||||
+ GDK_ALL_EVENTS_MASK & ~GDK_POINTER_MOTION_HINT_MASK,
|
||||
_gdk_display_get_next_serial (display),
|
||||
evtime,
|
||||
FALSE);
|
||||
@@ -5003,7 +5003,7 @@ gdk_wayland_seat_grab (GdkSeat *seat,
|
||||
native,
|
||||
GDK_OWNERSHIP_NONE,
|
||||
owner_events,
|
||||
- GDK_ALL_EVENTS_MASK,
|
||||
+ GDK_ALL_EVENTS_MASK & ~GDK_POINTER_MOTION_HINT_MASK,
|
||||
_gdk_display_get_next_serial (display),
|
||||
evtime,
|
||||
FALSE);
|
||||
292
debian/patches/gdk-wayland-Enable-xdg-activation-only-if-wayland-protoco.patch
vendored
Normal file
292
debian/patches/gdk-wayland-Enable-xdg-activation-only-if-wayland-protoco.patch
vendored
Normal file
@ -0,0 +1,292 @@
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Tue, 16 Aug 2022 23:41:12 +0200
|
||||
Subject: gdk/wayland: Enable xdg-activation only if wayland-protocols >= 1.21
|
||||
|
||||
This way we can keep the same wayland-protocols requirement, so the latest GTK3
|
||||
still builds on distributions shipping older versions of wayland-protocols,
|
||||
such as Debian Bullseye.
|
||||
|
||||
Should fix CI builds as well.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:22c95cd1e9182a419df37f10e1a6c9e2156d8bdb
|
||||
---
|
||||
config.h.meson | 5 ++++-
|
||||
configure.ac | 10 ++++++++++
|
||||
gdk/wayland/Makefile.am | 7 +++++--
|
||||
gdk/wayland/gdkapplaunchcontext-wayland.c | 7 ++++++-
|
||||
gdk/wayland/gdkdisplay-wayland.c | 12 +++++++++++-
|
||||
gdk/wayland/gdkdisplay-wayland.h | 8 +++++++-
|
||||
gdk/wayland/gdkwindow-wayland.c | 7 ++++++-
|
||||
gdk/wayland/meson.build | 7 +++++--
|
||||
meson.build | 2 ++
|
||||
9 files changed, 56 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/config.h.meson b/config.h.meson
|
||||
index ce2aeb2..35ef073 100644
|
||||
--- a/config.h.meson
|
||||
+++ b/config.h.meson
|
||||
@@ -289,4 +289,7 @@
|
||||
#mesondefine ISO_CODES_PREFIX
|
||||
|
||||
/* Define if tracker3 is available */
|
||||
-#mesondefine HAVE_TRACKER3
|
||||
\ No newline at end of file
|
||||
+#mesondefine HAVE_TRACKER3
|
||||
+
|
||||
+/* Define if xdg_activation's wl-protocols definition is available */
|
||||
+#mesondefine HAVE_XDG_ACTIVATION
|
||||
\ No newline at end of file
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e9ded99..94e5c4a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -467,6 +467,16 @@ if test "$enable_wayland_backend" = "yes"; then
|
||||
[AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
|
||||
AC_SUBST([WAYLAND_SCANNER])
|
||||
|
||||
+ # For xdg-activation support
|
||||
+ XDG_ACTIVATION_DEPENDENCIES="wayland-protocols >= 1.21"
|
||||
+ PKG_CHECK_EXISTS($XDG_ACTIVATION_DEPENDENCIES, [have_xdg_activation_deps=yes], [have_xdg_activation_deps=no])
|
||||
+ AC_MSG_CHECKING([for XDG_ACTIVATION_DEPENDENCIES])
|
||||
+ AM_CONDITIONAL(USE_XDG_ACTIVATION, test "$have_xdg_activation_deps" = "yes")
|
||||
+ if test "$have_xdg_activation_deps" = "yes" ; then
|
||||
+ AC_DEFINE([HAVE_XDG_ACTIVATION], [1],
|
||||
+ [Define if xdg_activation's wl-protocols definition is available])
|
||||
+ fi
|
||||
+
|
||||
AM_CONDITIONAL(USE_WAYLAND, true)
|
||||
else
|
||||
AM_CONDITIONAL(USE_WAYLAND, false)
|
||||
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
|
||||
index e292a54..08ed75c 100644
|
||||
--- a/gdk/wayland/Makefile.am
|
||||
+++ b/gdk/wayland/Makefile.am
|
||||
@@ -23,8 +23,6 @@ noinst_LTLIBRARIES = \
|
||||
BUILT_SOURCES = \
|
||||
pointer-gestures-unstable-v1-client-protocol.h \
|
||||
pointer-gestures-unstable-v1-protocol.c \
|
||||
- xdg-activation-v1-client-protocol.h \
|
||||
- xdg-activation-v1-protocol.c \
|
||||
xdg-shell-client-protocol.h \
|
||||
xdg-shell-protocol.c \
|
||||
xdg-shell-unstable-v6-client-protocol.h \
|
||||
@@ -45,6 +43,11 @@ BUILT_SOURCES = \
|
||||
gtk-shell-protocol.c \
|
||||
primary-selection-unstable-v1-client-protocol.h \
|
||||
primary-selection-unstable-v1-protocol.c
|
||||
+if USE_XDG_ACTIVATION
|
||||
+BUILT_SOURCES += \
|
||||
+ xdg-activation-v1-client-protocol.h \
|
||||
+ xdg-activation-v1-protocol.c
|
||||
+endif
|
||||
|
||||
nodist_libgdk_wayland_la_SOURCES = \
|
||||
$(BUILT_SOURCES)
|
||||
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
index eb1d2cd..340a037 100644
|
||||
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkintl.h"
|
||||
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
typedef struct {
|
||||
gchar *token;
|
||||
} AppLaunchData;
|
||||
@@ -47,6 +48,7 @@ token_done (gpointer data,
|
||||
static const struct xdg_activation_token_v1_listener token_listener = {
|
||||
token_done,
|
||||
};
|
||||
+#endif
|
||||
|
||||
static char *
|
||||
gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
|
||||
@@ -58,6 +60,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
|
||||
g_object_get (context, "display", &display, NULL);
|
||||
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
if (display->xdg_activation)
|
||||
{
|
||||
struct xdg_activation_token_v1 *token;
|
||||
@@ -95,7 +98,9 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
id = app_launch_data.token;
|
||||
wl_event_queue_destroy (event_queue);
|
||||
}
|
||||
- else if (display->gtk_shell_version >= 3)
|
||||
+ else
|
||||
+#endif
|
||||
+ if (display->gtk_shell_version >= 3)
|
||||
{
|
||||
id = g_uuid_string_random ();
|
||||
gtk_shell1_notify_launch (display->gtk_shell, id);
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index e473996..55c0388 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -85,7 +85,9 @@
|
||||
#define MIN_SYSTEM_BELL_DELAY_MS 20
|
||||
|
||||
#define GTK_SHELL1_VERSION 5
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
#define XDG_ACTIVATION_VERSION 1
|
||||
+#endif
|
||||
|
||||
static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
|
||||
|
||||
@@ -520,6 +522,7 @@ gdk_registry_handle_global (void *data,
|
||||
_gdk_wayland_screen_init_xdg_output (display_wayland->screen);
|
||||
_gdk_wayland_display_async_roundtrip (display_wayland);
|
||||
}
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
else if (strcmp (interface, "xdg_activation_v1") == 0)
|
||||
{
|
||||
display_wayland->xdg_activation_version =
|
||||
@@ -529,6 +532,7 @@ gdk_registry_handle_global (void *data,
|
||||
&xdg_activation_v1_interface,
|
||||
display_wayland->xdg_activation_version);
|
||||
}
|
||||
+#endif
|
||||
|
||||
g_hash_table_insert (display_wayland->known_globals,
|
||||
GUINT_TO_POINTER (id), g_strdup (interface));
|
||||
@@ -945,9 +949,11 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
|
||||
{
|
||||
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
|
||||
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
/* Will be signaled with focus activation */
|
||||
if (display_wayland->xdg_activation)
|
||||
return;
|
||||
+#endif
|
||||
|
||||
if (startup_id == NULL)
|
||||
{
|
||||
@@ -957,7 +963,11 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
|
||||
return;
|
||||
}
|
||||
|
||||
- if (!display_wayland->xdg_activation && display_wayland->gtk_shell)
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
+ if (display_wayland->xdg_activation) /* FIXME: Isn't this redundant? */
|
||||
+ return;
|
||||
+#endif
|
||||
+ if (display_wayland->gtk_shell)
|
||||
gtk_shell1_set_startup_id (display_wayland->gtk_shell, startup_id);
|
||||
}
|
||||
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
|
||||
index 0f66304..925476a 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.h
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.h
|
||||
@@ -36,7 +36,9 @@
|
||||
#include <gdk/wayland/server-decoration-client-protocol.h>
|
||||
#include <gdk/wayland/xdg-output-unstable-v1-client-protocol.h>
|
||||
#include <gdk/wayland/primary-selection-unstable-v1-client-protocol.h>
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
#include <gdk/wayland/xdg-activation-v1-client-protocol.h>
|
||||
+#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdkkeys.h>
|
||||
@@ -98,8 +100,10 @@ struct _GdkWaylandDisplay
|
||||
struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit;
|
||||
struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
|
||||
struct zxdg_output_manager_v1 *xdg_output_manager;
|
||||
- struct xdg_activation_v1 *xdg_activation;
|
||||
uint32_t xdg_output_version;
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
+ struct xdg_activation_v1 *xdg_activation;
|
||||
+#endif
|
||||
|
||||
GList *async_roundtrips;
|
||||
|
||||
@@ -127,7 +131,9 @@ struct _GdkWaylandDisplay
|
||||
int data_device_manager_version;
|
||||
int gtk_shell_version;
|
||||
int xdg_output_manager_version;
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
int xdg_activation_version;
|
||||
+#endif
|
||||
|
||||
uint32_t server_decoration_mode;
|
||||
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index e3f97cf..6ba939a 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -3811,6 +3811,7 @@ gdk_wayland_window_get_input_shape (GdkWindow *window)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
static void
|
||||
token_done (gpointer data,
|
||||
struct xdg_activation_token_v1 *provider,
|
||||
@@ -3824,6 +3825,7 @@ token_done (gpointer data,
|
||||
static const struct xdg_activation_token_v1_listener token_listener = {
|
||||
token_done,
|
||||
};
|
||||
+#endif
|
||||
|
||||
static void
|
||||
gdk_wayland_window_focus (GdkWindow *window,
|
||||
@@ -3836,6 +3838,7 @@ gdk_wayland_window_focus (GdkWindow *window,
|
||||
|
||||
startup_id = g_steal_pointer (&display_wayland->startup_notification_id);
|
||||
|
||||
+#ifdef HAVE_XDG_ACTIVATION
|
||||
if (display_wayland->xdg_activation)
|
||||
{
|
||||
GdkSeat *seat = gdk_display_get_default_seat (display);
|
||||
@@ -3874,7 +3877,9 @@ gdk_wayland_window_focus (GdkWindow *window,
|
||||
startup_id,
|
||||
impl->display_server.wl_surface);
|
||||
}
|
||||
- else if (impl->display_server.gtk_surface)
|
||||
+ else
|
||||
+#endif
|
||||
+ if (impl->display_server.gtk_surface)
|
||||
{
|
||||
if (timestamp != GDK_CURRENT_TIME)
|
||||
gtk_surface1_present (impl->display_server.gtk_surface, timestamp);
|
||||
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
|
||||
index cdc955e..1a90060 100644
|
||||
--- a/gdk/wayland/meson.build
|
||||
+++ b/gdk/wayland/meson.build
|
||||
@@ -36,7 +36,8 @@ gdk_wayland_deps = [
|
||||
]
|
||||
|
||||
# wayland protocols
|
||||
-proto_dir = dependency('wayland-protocols').get_pkgconfig_variable('pkgdatadir')
|
||||
+wlprotocolsdep = dependency('wayland-protocols')
|
||||
+proto_dir = wlprotocolsdep.get_pkgconfig_variable('pkgdatadir')
|
||||
assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
|
||||
|
||||
wayland_scanner = find_program('wayland-scanner')
|
||||
@@ -57,8 +58,10 @@ proto_sources = [
|
||||
['server-decoration', 'private' ],
|
||||
['xdg-output', 'unstable', 'v1', ],
|
||||
['primary-selection', 'unstable', 'v1', ],
|
||||
- ['xdg-activation', 'staging', 'v1', ],
|
||||
]
|
||||
+if wlprotocolsdep.version().version_compare('>=1.21')
|
||||
+ proto_sources += [['xdg-activation', 'staging', 'v1', ]]
|
||||
+endif
|
||||
|
||||
gdk_wayland_gen_headers = []
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f0b4fab..8aaeb71 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -561,6 +561,8 @@ if wayland_enabled
|
||||
wlegldep = dependency('wayland-egl')
|
||||
backend_immodules += ['wayland']
|
||||
|
||||
+ cdata.set('HAVE_XDG_ACTIVATION', wlprotocolsdep.version().version_compare('>=1.21'))
|
||||
+
|
||||
wayland_pkgs = [
|
||||
'wayland-client', wayland_req,
|
||||
'xkbcommon', xkbcommon_req,
|
||||
250
debian/patches/gdk-wayland-Support-the-xdg-activation-wayland-protocol.patch
vendored
Normal file
250
debian/patches/gdk-wayland-Support-the-xdg-activation-wayland-protocol.patch
vendored
Normal file
@ -0,0 +1,250 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Wed, 2 Dec 2020 17:22:41 +0100
|
||||
Subject: gdk/wayland: Support the xdg-activation wayland protocol
|
||||
|
||||
This protocol implements the IPC necessary to focus application
|
||||
windows across launcher/launchee. Add support for it.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:a79d6972e08480384993d1e2046029ef9034dded
|
||||
---
|
||||
gdk/wayland/Makefile.am | 7 +++++
|
||||
gdk/wayland/gdkapplaunchcontext-wayland.c | 47 ++++++++++++++++++++++++++++++-
|
||||
gdk/wayland/gdkdevice-wayland.c | 2 +-
|
||||
gdk/wayland/gdkdisplay-wayland.c | 12 +++++++-
|
||||
gdk/wayland/gdkdisplay-wayland.h | 3 ++
|
||||
gdk/wayland/gdkprivate-wayland.h | 1 +
|
||||
gdk/wayland/gdkwindow-wayland.c | 16 +++++++++--
|
||||
gdk/wayland/meson.build | 5 ++++
|
||||
8 files changed, 87 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
|
||||
index 6595013..e292a54 100644
|
||||
--- a/gdk/wayland/Makefile.am
|
||||
+++ b/gdk/wayland/Makefile.am
|
||||
@@ -23,6 +23,8 @@ noinst_LTLIBRARIES = \
|
||||
BUILT_SOURCES = \
|
||||
pointer-gestures-unstable-v1-client-protocol.h \
|
||||
pointer-gestures-unstable-v1-protocol.c \
|
||||
+ xdg-activation-v1-client-protocol.h \
|
||||
+ xdg-activation-v1-protocol.c \
|
||||
xdg-shell-client-protocol.h \
|
||||
xdg-shell-protocol.c \
|
||||
xdg-shell-unstable-v6-client-protocol.h \
|
||||
@@ -98,6 +100,11 @@ endef
|
||||
%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
|
||||
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
||||
|
||||
+xdg-activation-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-activation/xdg-activation-v1.xml
|
||||
+ $(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
|
||||
+xdg-activation-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-activation/xdg-activation-v1.xml
|
||||
+ $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
||||
+
|
||||
%-protocol.c : $(srcdir)/protocol/%.xml
|
||||
$(AM_V_GEN)$(WAYLAND_SCANNER) private-code < $< > $@
|
||||
|
||||
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
index f18c13e..004a390 100644
|
||||
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
@@ -30,6 +30,24 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkintl.h"
|
||||
|
||||
+typedef struct {
|
||||
+ gchar *token;
|
||||
+} AppLaunchData;
|
||||
+
|
||||
+static void
|
||||
+token_done (gpointer data,
|
||||
+ struct xdg_activation_token_v1 *provider,
|
||||
+ const char *token)
|
||||
+{
|
||||
+ AppLaunchData *app_launch_data = data;
|
||||
+
|
||||
+ app_launch_data->token = g_strdup (token);
|
||||
+}
|
||||
+
|
||||
+static const struct xdg_activation_token_v1_listener token_listener = {
|
||||
+ token_done,
|
||||
+};
|
||||
+
|
||||
static char *
|
||||
gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
|
||||
GAppInfo *info,
|
||||
@@ -40,7 +58,34 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
|
||||
g_object_get (context, "display", &display, NULL);
|
||||
|
||||
- if (display->gtk_shell_version >= 3)
|
||||
+ if (display->xdg_activation)
|
||||
+ {
|
||||
+ struct xdg_activation_token_v1 *token;
|
||||
+ GdkSeat *seat;
|
||||
+ GdkWindow *focus_window;
|
||||
+ AppLaunchData app_launch_data = { 0 };
|
||||
+
|
||||
+ seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
|
||||
+ focus_window = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (seat));
|
||||
+ token = xdg_activation_v1_get_activation_token (display->xdg_activation);
|
||||
+
|
||||
+ xdg_activation_token_v1_add_listener (token,
|
||||
+ &token_listener,
|
||||
+ &app_launch_data);
|
||||
+ xdg_activation_token_v1_set_serial (token,
|
||||
+ _gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL),
|
||||
+ gdk_wayland_seat_get_wl_seat (seat));
|
||||
+ xdg_activation_token_v1_set_surface (token,
|
||||
+ gdk_wayland_window_get_wl_surface (focus_window));
|
||||
+ xdg_activation_token_v1_commit (token);
|
||||
+
|
||||
+ while (app_launch_data.token == NULL)
|
||||
+ wl_display_roundtrip (display->wl_display);
|
||||
+
|
||||
+ xdg_activation_token_v1_destroy (token);
|
||||
+ id = app_launch_data.token;
|
||||
+ }
|
||||
+ else if (display->gtk_shell_version >= 3)
|
||||
{
|
||||
id = g_uuid_string_random ();
|
||||
gtk_shell1_notify_launch (display->gtk_shell, id);
|
||||
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
|
||||
index a3d464b..9dc86a3 100644
|
||||
--- a/gdk/wayland/gdkdevice-wayland.c
|
||||
+++ b/gdk/wayland/gdkdevice-wayland.c
|
||||
@@ -732,7 +732,7 @@ device_emit_grab_crossing (GdkDevice *device,
|
||||
}
|
||||
}
|
||||
|
||||
-static GdkWindow *
|
||||
+GdkWindow *
|
||||
gdk_wayland_device_get_focus (GdkDevice *device)
|
||||
{
|
||||
GdkWaylandSeat *wayland_seat = GDK_WAYLAND_SEAT (gdk_device_get_seat (device));
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index e91490f..7de55f7 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -85,6 +85,7 @@
|
||||
#define MIN_SYSTEM_BELL_DELAY_MS 20
|
||||
|
||||
#define GTK_SHELL1_VERSION 5
|
||||
+#define XDG_ACTIVATION_VERSION 1
|
||||
|
||||
static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
|
||||
|
||||
@@ -519,6 +520,15 @@ gdk_registry_handle_global (void *data,
|
||||
_gdk_wayland_screen_init_xdg_output (display_wayland->screen);
|
||||
_gdk_wayland_display_async_roundtrip (display_wayland);
|
||||
}
|
||||
+ else if (strcmp (interface, "xdg_activation_v1") == 0)
|
||||
+ {
|
||||
+ display_wayland->xdg_activation_version =
|
||||
+ MIN (version, XDG_ACTIVATION_VERSION);
|
||||
+ display_wayland->xdg_activation =
|
||||
+ wl_registry_bind (display_wayland->wl_registry, id,
|
||||
+ &xdg_activation_v1_interface,
|
||||
+ display_wayland->xdg_activation_version);
|
||||
+ }
|
||||
|
||||
g_hash_table_insert (display_wayland->known_globals,
|
||||
GUINT_TO_POINTER (id), g_strdup (interface));
|
||||
@@ -943,7 +953,7 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
|
||||
return;
|
||||
}
|
||||
|
||||
- if (display_wayland->gtk_shell)
|
||||
+ if (!display_wayland->xdg_activation && display_wayland->gtk_shell)
|
||||
gtk_shell1_set_startup_id (display_wayland->gtk_shell, startup_id);
|
||||
}
|
||||
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
|
||||
index 6269630..0f66304 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.h
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.h
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <gdk/wayland/server-decoration-client-protocol.h>
|
||||
#include <gdk/wayland/xdg-output-unstable-v1-client-protocol.h>
|
||||
#include <gdk/wayland/primary-selection-unstable-v1-client-protocol.h>
|
||||
+#include <gdk/wayland/xdg-activation-v1-client-protocol.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdkkeys.h>
|
||||
@@ -97,6 +98,7 @@ struct _GdkWaylandDisplay
|
||||
struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit;
|
||||
struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
|
||||
struct zxdg_output_manager_v1 *xdg_output_manager;
|
||||
+ struct xdg_activation_v1 *xdg_activation;
|
||||
uint32_t xdg_output_version;
|
||||
|
||||
GList *async_roundtrips;
|
||||
@@ -125,6 +127,7 @@ struct _GdkWaylandDisplay
|
||||
int data_device_manager_version;
|
||||
int gtk_shell_version;
|
||||
int xdg_output_manager_version;
|
||||
+ int xdg_activation_version;
|
||||
|
||||
uint32_t server_decoration_mode;
|
||||
|
||||
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
|
||||
index 4a921b3..5173873 100644
|
||||
--- a/gdk/wayland/gdkprivate-wayland.h
|
||||
+++ b/gdk/wayland/gdkprivate-wayland.h
|
||||
@@ -187,6 +187,7 @@ uint32_t _gdk_wayland_device_get_implicit_grab_serial(GdkWaylandDevice *device,
|
||||
const GdkEvent *event);
|
||||
uint32_t _gdk_wayland_seat_get_last_implicit_grab_serial (GdkSeat *seat,
|
||||
GdkEventSequence **seqence);
|
||||
+GdkWindow * gdk_wayland_device_get_focus (GdkDevice *device);
|
||||
struct wl_data_device * gdk_wayland_device_get_data_device (GdkDevice *gdk_device);
|
||||
void gdk_wayland_seat_set_selection (GdkSeat *seat,
|
||||
struct wl_data_source *source);
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index 30c0898..ed49dd6 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -3825,10 +3825,20 @@ gdk_wayland_window_focus (GdkWindow *window,
|
||||
GdkWaylandDisplay *display_wayland =
|
||||
GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
|
||||
|
||||
- if (display_wayland->gtk_shell_version >= 3)
|
||||
+ if (display_wayland->startup_notification_id)
|
||||
{
|
||||
- gtk_surface1_request_focus (impl->display_server.gtk_surface,
|
||||
- display_wayland->startup_notification_id);
|
||||
+ if (display_wayland->xdg_activation)
|
||||
+ {
|
||||
+ xdg_activation_v1_activate (display_wayland->xdg_activation,
|
||||
+ display_wayland->startup_notification_id,
|
||||
+ impl->display_server.wl_surface);
|
||||
+ }
|
||||
+ else if (display_wayland->gtk_shell_version >= 3)
|
||||
+ {
|
||||
+ gtk_surface1_request_focus (impl->display_server.gtk_surface,
|
||||
+ display_wayland->startup_notification_id);
|
||||
+ }
|
||||
+
|
||||
g_clear_pointer (&display_wayland->startup_notification_id, g_free);
|
||||
}
|
||||
}
|
||||
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
|
||||
index e66afd7..cdc955e 100644
|
||||
--- a/gdk/wayland/meson.build
|
||||
+++ b/gdk/wayland/meson.build
|
||||
@@ -57,6 +57,7 @@ proto_sources = [
|
||||
['server-decoration', 'private' ],
|
||||
['xdg-output', 'unstable', 'v1', ],
|
||||
['primary-selection', 'unstable', 'v1', ],
|
||||
+ ['xdg-activation', 'staging', 'v1', ],
|
||||
]
|
||||
|
||||
gdk_wayland_gen_headers = []
|
||||
@@ -68,6 +69,10 @@ foreach p: proto_sources
|
||||
if proto_stability == 'stable'
|
||||
output_base = proto_name
|
||||
input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
|
||||
+ elif proto_stability == 'staging'
|
||||
+ proto_version = p.get(2)
|
||||
+ output_base = '@0@-@1@'.format(proto_name, proto_version)
|
||||
+ input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
|
||||
elif proto_stability == 'private'
|
||||
output_base = proto_name
|
||||
input = 'protocol/@0@.xml'.format(proto_name)
|
||||
49
debian/patches/gdk-wayland-Update-selection-s-offer-before-updating-dnd-.patch
vendored
Normal file
49
debian/patches/gdk-wayland-Update-selection-s-offer-before-updating-dnd-.patch
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 23 Sep 2022 10:39:41 +0300
|
||||
Subject: gdk/wayland: Update selection's offer before updating dnd targets
|
||||
|
||||
gdk_wayland_drop_context_update_targets gets targets from the
|
||||
selection's offer. In order to ensure that the drop context has
|
||||
up-to-date targets, update the selection's offer before updating
|
||||
targets.
|
||||
|
||||
This fixes drag-and-drop not working reliably when running Firefox in
|
||||
Plasma Wayland session.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:965aa2e65f1c25113472f06b6662b0b69d724605
|
||||
---
|
||||
gdk/wayland/gdkdevice-wayland.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
|
||||
index ed6ad3b..a3d464b 100644
|
||||
--- a/gdk/wayland/gdkdevice-wayland.c
|
||||
+++ b/gdk/wayland/gdkdevice-wayland.c
|
||||
@@ -1188,14 +1188,16 @@ data_device_enter (void *data,
|
||||
seat->pointer_info.surface_x = wl_fixed_to_double (x);
|
||||
seat->pointer_info.surface_y = wl_fixed_to_double (y);
|
||||
|
||||
- gdk_wayland_drop_context_update_targets (seat->drop_context);
|
||||
-
|
||||
selection = gdk_drag_get_selection (seat->drop_context);
|
||||
dnd_owner = gdk_selection_owner_get_for_display (seat->display, selection);
|
||||
|
||||
if (!dnd_owner)
|
||||
dnd_owner = seat->foreign_dnd_window;
|
||||
|
||||
+ gdk_wayland_selection_set_offer (seat->display, selection, offer);
|
||||
+
|
||||
+ gdk_wayland_drop_context_update_targets (seat->drop_context);
|
||||
+
|
||||
_gdk_wayland_drag_context_set_source_window (seat->drop_context, dnd_owner);
|
||||
|
||||
_gdk_wayland_drag_context_set_dest_window (seat->drop_context,
|
||||
@@ -1206,8 +1208,6 @@ data_device_enter (void *data,
|
||||
_gdk_wayland_drag_context_emit_event (seat->drop_context, GDK_DRAG_ENTER,
|
||||
GDK_CURRENT_TIME);
|
||||
|
||||
- gdk_wayland_selection_set_offer (seat->display, selection, offer);
|
||||
-
|
||||
emit_selection_owner_change (dest_window, selection);
|
||||
}
|
||||
|
||||
80
debian/patches/gdk_wayland_display_init_gl-use-GLES-API-if-required.patch
vendored
Normal file
80
debian/patches/gdk_wayland_display_init_gl-use-GLES-API-if-required.patch
vendored
Normal file
@ -0,0 +1,80 @@
|
||||
From: Dominique Martinet <dominique.martinet@atmark-techno.com>
|
||||
Date: Wed, 28 Sep 2022 14:18:31 +0900
|
||||
Subject: gdk_wayland_display_init_gl: use GLES API if required
|
||||
|
||||
gdk_wayland_gl_context_realize properly checks for GLES and uses
|
||||
eglBindAPI with the proper API, but before that init is always called
|
||||
with regular GL interface which is not implemented for many embedded
|
||||
devices.
|
||||
|
||||
This was fixed in GTK 4 with commit 482845b02705 ("wayland: Remove
|
||||
initial GL API bind"), but that commit cannot easily be applied because
|
||||
the current version queries some GL properties during init so we would
|
||||
need to backport more for it to be applicable.
|
||||
|
||||
This patch takes the minimal approach of initializing GLES context,
|
||||
allowing the gtk3 demo OpenGL test (and real applications) to work
|
||||
when GDK_GL=gles is set.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/3028
|
||||
Origin: upstream, 3.24.35, commit:0e5fe45ea20cce074a128911949dbedf4f8265bf
|
||||
---
|
||||
gdk/wayland/gdkglcontext-wayland.c | 12 ++++++++----
|
||||
gdk/wayland/gdkglcontext-wayland.h | 3 ++-
|
||||
2 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
|
||||
index a221025..296e5e0 100644
|
||||
--- a/gdk/wayland/gdkglcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkglcontext-wayland.c
|
||||
@@ -309,11 +309,13 @@ gdk_wayland_get_display (GdkWaylandDisplay *display_wayland)
|
||||
}
|
||||
|
||||
gboolean
|
||||
-gdk_wayland_display_init_gl (GdkDisplay *display)
|
||||
+gdk_wayland_display_init_gl (GdkDisplay *display,
|
||||
+ GdkGLContext *share)
|
||||
{
|
||||
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
|
||||
EGLint major, minor;
|
||||
EGLDisplay dpy;
|
||||
+ gboolean use_es;
|
||||
|
||||
if (display_wayland->have_egl)
|
||||
return TRUE;
|
||||
@@ -326,8 +328,10 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
|
||||
if (!eglInitialize (dpy, &major, &minor))
|
||||
return FALSE;
|
||||
|
||||
- if (!eglBindAPI (EGL_OPENGL_API))
|
||||
- return FALSE;
|
||||
+ use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ||
|
||||
+ (share != NULL && gdk_gl_context_get_use_es (share));
|
||||
+ if (!eglBindAPI (use_es ? EGL_OPENGL_ES_API : EGL_OPENGL_API))
|
||||
+ return FALSE;
|
||||
|
||||
display_wayland->egl_display = dpy;
|
||||
display_wayland->egl_major_version = major;
|
||||
@@ -461,7 +465,7 @@ gdk_wayland_window_create_gl_context (GdkWindow *window,
|
||||
GdkWaylandGLContext *context;
|
||||
EGLConfig config;
|
||||
|
||||
- if (!gdk_wayland_display_init_gl (display))
|
||||
+ if (!gdk_wayland_display_init_gl (display, share))
|
||||
{
|
||||
g_set_error_literal (error, GDK_GL_ERROR,
|
||||
GDK_GL_ERROR_NOT_AVAILABLE,
|
||||
diff --git a/gdk/wayland/gdkglcontext-wayland.h b/gdk/wayland/gdkglcontext-wayland.h
|
||||
index bd2bb88..88a319e 100644
|
||||
--- a/gdk/wayland/gdkglcontext-wayland.h
|
||||
+++ b/gdk/wayland/gdkglcontext-wayland.h
|
||||
@@ -47,7 +47,8 @@ struct _GdkWaylandGLContextClass
|
||||
GdkGLContextClass parent_class;
|
||||
};
|
||||
|
||||
-gboolean gdk_wayland_display_init_gl (GdkDisplay *display);
|
||||
+gboolean gdk_wayland_display_init_gl (GdkDisplay *display,
|
||||
+ GdkGLContext *share);
|
||||
GdkGLContext * gdk_wayland_window_create_gl_context (GdkWindow *window,
|
||||
gboolean attach,
|
||||
GdkGLContext *share,
|
||||
56
debian/patches/gtk-Build-Prefix-deprecated-source-listings.patch
vendored
Normal file
56
debian/patches/gtk-Build-Prefix-deprecated-source-listings.patch
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Thu, 19 May 2022 10:23:59 +0800
|
||||
Subject: gtk: Build: Prefix deprecated source listings
|
||||
|
||||
...with gtk_, so that they are distinguished from other names and is
|
||||
more clear to people.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:c05d21c9af23a73954ea027eb0408e15eafe89fd
|
||||
---
|
||||
gtk/Makefile.am | 4 ++--
|
||||
gtk/deprecated/Makefile.inc | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index e96afd3..a8af5b8 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -136,7 +136,7 @@ gtk_private_h_sources = \
|
||||
# GTK+ C sources to build the library from
|
||||
gtk_base_c_sources = \
|
||||
$(a11y_c_sources) \
|
||||
- $(deprecated_c_sources) \
|
||||
+ $(gtk_deprecated_c_sources) \
|
||||
$(inspector_c_sources) \
|
||||
$(gtk_base_c_sources_base)
|
||||
|
||||
@@ -207,7 +207,7 @@ endif
|
||||
|
||||
gtk_all_private_h_sources = \
|
||||
$(a11y_private_h_sources) \
|
||||
- $(deprecated_private_h_sources) \
|
||||
+ $(gtk_deprecated_private_h_sources) \
|
||||
$(gtk_private_h_sources) \
|
||||
$(gtk_use_x11_private_h_sources) \
|
||||
$(gtk_use_win32_private_h_sources) \
|
||||
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
|
||||
index a4d5811..d1cdc5c 100644
|
||||
--- a/gtk/deprecated/Makefile.inc
|
||||
+++ b/gtk/deprecated/Makefile.inc
|
||||
@@ -40,14 +40,14 @@ gtk_deprecated_h_sources = \
|
||||
deprecated/gtkvseparator.h \
|
||||
deprecated/gtkvpaned.h
|
||||
|
||||
-deprecated_private_h_sources = \
|
||||
+gtk_deprecated_private_h_sources = \
|
||||
deprecated/gtkgradientprivate.h \
|
||||
deprecated/gtkiconfactoryprivate.h \
|
||||
deprecated/gtknumerableiconprivate.h \
|
||||
deprecated/gtkstylepropertiesprivate.h \
|
||||
deprecated/gtksymboliccolorprivate.h
|
||||
|
||||
-deprecated_c_sources = \
|
||||
+gtk_deprecated_c_sources = \
|
||||
deprecated/gtkactivatable.c \
|
||||
deprecated/gtkaction.c \
|
||||
deprecated/gtkactiongroup.c \
|
||||
25
debian/patches/gtk-Don-t-distribute-the-generated-sources.patch
vendored
Normal file
25
debian/patches/gtk-Don-t-distribute-the-generated-sources.patch
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Tue, 17 May 2022 18:43:36 +0800
|
||||
Subject: gtk/: Don't distribute the generated sources
|
||||
|
||||
We already generate some of the sources for all builds, so extend this
|
||||
to the other generated sources as well, since the Visual Studio projects
|
||||
added support for generating these sources too.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:39940e08920be540a0a090ce1016482813c8e3a9
|
||||
---
|
||||
gtk/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index 8fde3a0..8775ced 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -963,7 +963,6 @@ DISTCLEANFILES += gtk-win32.rc
|
||||
endif
|
||||
|
||||
EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
|
||||
-EXTRA_DIST += $(gtk_built_sources)
|
||||
|
||||
|
||||
pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
|
||||
26
debian/patches/gtk-Makefile.am-Fix-distcheck.patch
vendored
Normal file
26
debian/patches/gtk-Makefile.am-Fix-distcheck.patch
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 18 May 2022 15:29:24 +0800
|
||||
Subject: gtk/Makefile.am: Fix distcheck
|
||||
|
||||
Apparently distcheck expects the generated gtk.gresource.xml to be
|
||||
there.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:bac9ff22f57891f71ebd51bb650d2c783421131a
|
||||
---
|
||||
gtk/Makefile.am | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index 8775ced..fc701d1 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -964,6 +964,9 @@ endif
|
||||
|
||||
EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
|
||||
|
||||
+# We need to dist this for `make distcheck`, apparently...
|
||||
+EXTRA_DIST += gtk.gresource.xml
|
||||
+
|
||||
|
||||
pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
|
||||
pkgdata_DATA = gtkbuilder.rng
|
||||
1752
debian/patches/gtk-Makefile.am-Split-out-more-items.patch
vendored
Normal file
1752
debian/patches/gtk-Makefile.am-Split-out-more-items.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,76 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Thu, 18 Jul 2019 09:48:40 +0100
|
||||
Subject: gtk: Really don't distribute built files
|
||||
|
||||
This is a continuation of commit dad773b1.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1001
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
|
||||
---
|
||||
gtk/Makefile.am | 15 +++++++--------
|
||||
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index 8fde3a0..d2deb2d 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -325,7 +325,6 @@ gtk_private_h_sources = \
|
||||
gtkrenderborderprivate.h \
|
||||
gtkrendericonprivate.h \
|
||||
gtkrenderprivate.h \
|
||||
- gtkresources.h \
|
||||
gtkroundedboxprivate.h \
|
||||
gtksearchengine.h \
|
||||
gtksearchenginesimple.h \
|
||||
@@ -950,20 +949,18 @@ gtk_extra_sources = \
|
||||
#
|
||||
# setup GTK+ sources and their dependencies
|
||||
#
|
||||
-MAINTAINERCLEANFILES = \
|
||||
+DISTCLEANFILES = \
|
||||
$(gtk_built_sources) \
|
||||
$(gtk_dbus_built_sources) \
|
||||
$(print_portal_built_sources) \
|
||||
- $(stamp_files)
|
||||
-
|
||||
-DISTCLEANFILES = gtktypefuncs.inc
|
||||
+ $(stamp_files) \
|
||||
+ gtktypefuncs.inc
|
||||
|
||||
if OS_WIN32
|
||||
DISTCLEANFILES += gtk-win32.rc
|
||||
endif
|
||||
|
||||
EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
|
||||
-EXTRA_DIST += $(gtk_built_sources)
|
||||
|
||||
|
||||
pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
|
||||
@@ -1237,7 +1234,8 @@ $(srcdir)/gtktestutils.c: gtktypefuncs.inc
|
||||
lib_LTLIBRARIES = libgtk-3.la
|
||||
|
||||
gtkincludedir = $(includedir)/gtk-3.0/gtk
|
||||
-gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
|
||||
+gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources)
|
||||
+nodist_gtkinclude_HEADERS = $(gtk_built_public_sources) gtkversion.h
|
||||
|
||||
a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
|
||||
a11yinclude_HEADERS= $(a11y_h_sources)
|
||||
@@ -1294,6 +1292,7 @@ gtk_3_HEADERS_DIR = $(gtkincludedir)
|
||||
|
||||
gtk_3_HEADERS_INST = \
|
||||
$(filter-out gtkversion.h, $(gtkinclude_HEADERS)) \
|
||||
+ $(nodist_gtkinclude_HEADERS) \
|
||||
$(a11y_h_sources) \
|
||||
$(gtk_deprecated_h_sources)
|
||||
|
||||
@@ -1376,7 +1375,7 @@ distclean-local:
|
||||
fi
|
||||
|
||||
if HAVE_INTROSPECTION
|
||||
-introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS))
|
||||
+introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS) $(nodist_gtkinclude_HEADERS))
|
||||
|
||||
introspection_files = \
|
||||
$(introspected_pub_headers) \
|
||||
527
debian/patches/gtk-Rename-gtk-mkenums-headers.mak-to-gtk-sources.inc.patch
vendored
Normal file
527
debian/patches/gtk-Rename-gtk-mkenums-headers.mak-to-gtk-sources.inc.patch
vendored
Normal file
@ -0,0 +1,527 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Fri, 13 May 2022 18:54:12 +0800
|
||||
Subject: gtk: Rename gtk-mkenums-headers.mak to gtk-sources.inc
|
||||
|
||||
We want to reuse more sources listings in other non-autotools build
|
||||
systems.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:e21a578cb14a9276d5e32af5ab79f21de3f619d8
|
||||
---
|
||||
gtk/Makefile.am | 2 +-
|
||||
gtk/gtk-mkenums-headers.mak | 236 --------------------------------------------
|
||||
gtk/gtk-sources.inc | 236 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
win32/create-lists-msvc.mak | 2 +-
|
||||
4 files changed, 238 insertions(+), 238 deletions(-)
|
||||
delete mode 100644 gtk/gtk-mkenums-headers.mak
|
||||
create mode 100644 gtk/gtk-sources.inc
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index fc701d1..7991530 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -114,7 +114,7 @@ endif
|
||||
include $(srcdir)/a11y/Makefile.inc
|
||||
include $(srcdir)/deprecated/Makefile.inc
|
||||
include $(srcdir)/inspector/Makefile.inc
|
||||
-include $(srcdir)/gtk-mkenums-headers.mak
|
||||
+include $(srcdir)/gtk-sources.inc
|
||||
|
||||
# GTK+ header files for public installation (non-generated, or generated
|
||||
# by configure)
|
||||
diff --git a/gtk/gtk-mkenums-headers.mak b/gtk/gtk-mkenums-headers.mak
|
||||
deleted file mode 100644
|
||||
index 86c38f9..0000000
|
||||
--- a/gtk/gtk-mkenums-headers.mak
|
||||
+++ /dev/null
|
||||
@@ -1,236 +0,0 @@
|
||||
-# List of headers to be passed into glib-mkenums
|
||||
-
|
||||
-
|
||||
-# GTK+ header files for public installation (non-generated, or generated
|
||||
-# by configure)
|
||||
-
|
||||
-GTK_PUB_HDRS = \
|
||||
- gtk.h \
|
||||
- gtk-autocleanups.h \
|
||||
- gtkx.h \
|
||||
- gtkx-autocleanups.h \
|
||||
- gtk-a11y.h \
|
||||
- gtkaboutdialog.h \
|
||||
- gtkaccelgroup.h \
|
||||
- gtkaccellabel.h \
|
||||
- gtkaccelmap.h \
|
||||
- gtkaccessible.h \
|
||||
- gtkactionable.h \
|
||||
- gtkactionbar.h \
|
||||
- gtkadjustment.h \
|
||||
- gtkappchooser.h \
|
||||
- gtkappchooserbutton.h \
|
||||
- gtkappchooserdialog.h \
|
||||
- gtkappchooserwidget.h \
|
||||
- gtkapplication.h \
|
||||
- gtkapplicationwindow.h \
|
||||
- gtkaspectframe.h \
|
||||
- gtkassistant.h \
|
||||
- gtkbbox.h \
|
||||
- gtkbin.h \
|
||||
- gtkbindings.h \
|
||||
- gtkborder.h \
|
||||
- gtkbox.h \
|
||||
- gtkbuilder.h \
|
||||
- gtkbuildable.h \
|
||||
- gtkbutton.h \
|
||||
- gtkcalendar.h \
|
||||
- gtkcellarea.h \
|
||||
- gtkcellareacontext.h \
|
||||
- gtkcellareabox.h \
|
||||
- gtkcelleditable.h \
|
||||
- gtkcelllayout.h \
|
||||
- gtkcellrenderer.h \
|
||||
- gtkcellrendereraccel.h \
|
||||
- gtkcellrenderercombo.h \
|
||||
- gtkcellrendererpixbuf.h \
|
||||
- gtkcellrendererprogress.h \
|
||||
- gtkcellrendererspin.h \
|
||||
- gtkcellrendererspinner.h\
|
||||
- gtkcellrenderertext.h \
|
||||
- gtkcellrenderertoggle.h \
|
||||
- gtkcellview.h \
|
||||
- gtkcheckbutton.h \
|
||||
- gtkcheckmenuitem.h \
|
||||
- gtkclipboard.h \
|
||||
- gtkcolorbutton.h \
|
||||
- gtkcolorchooser.h \
|
||||
- gtkcolorchooserwidget.h \
|
||||
- gtkcolorchooserdialog.h \
|
||||
- gtkcolorutils.h \
|
||||
- gtkcombobox.h \
|
||||
- gtkcomboboxtext.h \
|
||||
- gtkcontainer.h \
|
||||
- gtkcssprovider.h \
|
||||
- gtkcsssection.h \
|
||||
- gtkdebug.h \
|
||||
- gtkdialog.h \
|
||||
- gtkdnd.h \
|
||||
- gtkdragdest.h \
|
||||
- gtkdragsource.h \
|
||||
- gtkdrawingarea.h \
|
||||
- gtkeditable.h \
|
||||
- gtkentry.h \
|
||||
- gtkentrybuffer.h \
|
||||
- gtkentrycompletion.h \
|
||||
- gtkenums.h \
|
||||
- gtkeventbox.h \
|
||||
- gtkeventcontroller.h \
|
||||
- gtkeventcontrollerkey.h \
|
||||
- gtkeventcontrollermotion.h \
|
||||
- gtkeventcontrollerscroll.h \
|
||||
- gtkexpander.h \
|
||||
- gtkfilechooser.h \
|
||||
- gtkfilechooserbutton.h \
|
||||
- gtkfilechooserdialog.h \
|
||||
- gtkfilechoosernative.h \
|
||||
- gtkfilechooserwidget.h \
|
||||
- gtkfilefilter.h \
|
||||
- gtkfixed.h \
|
||||
- gtkflowbox.h \
|
||||
- gtkfontbutton.h \
|
||||
- gtkfontchooser.h \
|
||||
- gtkfontchooserdialog.h \
|
||||
- gtkfontchooserwidget.h \
|
||||
- gtkframe.h \
|
||||
- gtkgesture.h \
|
||||
- gtkgesturedrag.h \
|
||||
- gtkgesturelongpress.h \
|
||||
- gtkgesturemultipress.h \
|
||||
- gtkgesturepan.h \
|
||||
- gtkgesturerotate.h \
|
||||
- gtkgesturesingle.h \
|
||||
- gtkgesturestylus.h \
|
||||
- gtkgestureswipe.h \
|
||||
- gtkgesturezoom.h \
|
||||
- gtkglarea.h \
|
||||
- gtkgrid.h \
|
||||
- gtkheaderbar.h \
|
||||
- gtkicontheme.h \
|
||||
- gtkiconview.h \
|
||||
- gtkimage.h \
|
||||
- gtkimcontext.h \
|
||||
- gtkimcontextinfo.h \
|
||||
- gtkimcontextsimple.h \
|
||||
- gtkimmodule.h \
|
||||
- gtkimmulticontext.h \
|
||||
- gtkinfobar.h \
|
||||
- gtkinvisible.h \
|
||||
- gtklabel.h \
|
||||
- gtklayout.h \
|
||||
- gtklevelbar.h \
|
||||
- gtklinkbutton.h \
|
||||
- gtklistbox.h \
|
||||
- gtkliststore.h \
|
||||
- gtklockbutton.h \
|
||||
- gtkmain.h \
|
||||
- gtkmenu.h \
|
||||
- gtkmenubar.h \
|
||||
- gtkmenubutton.h \
|
||||
- gtkmenuitem.h \
|
||||
- gtkmenushell.h \
|
||||
- gtkmenutoolbutton.h \
|
||||
- gtkmessagedialog.h \
|
||||
- gtkmodelbutton.h \
|
||||
- gtkmodules.h \
|
||||
- gtkmountoperation.h \
|
||||
- gtknativedialog.h \
|
||||
- gtknotebook.h \
|
||||
- gtkoffscreenwindow.h \
|
||||
- gtkorientable.h \
|
||||
- gtkoverlay.h \
|
||||
- gtkpadcontroller.h \
|
||||
- gtkpagesetup.h \
|
||||
- gtkpaned.h \
|
||||
- gtkpapersize.h \
|
||||
- gtkplacessidebar.h \
|
||||
- gtkplug.h \
|
||||
- gtkpopover.h \
|
||||
- gtkpopovermenu.h \
|
||||
- gtkprintcontext.h \
|
||||
- gtkprintoperation.h \
|
||||
- gtkprintoperationpreview.h \
|
||||
- gtkprintsettings.h \
|
||||
- gtkprogressbar.h \
|
||||
- gtkradiobutton.h \
|
||||
- gtkradiomenuitem.h \
|
||||
- gtkradiotoolbutton.h \
|
||||
- gtkrange.h \
|
||||
- gtkrecentchooser.h \
|
||||
- gtkrecentchooserdialog.h \
|
||||
- gtkrecentchoosermenu.h \
|
||||
- gtkrecentchooserwidget.h \
|
||||
- gtkrecentfilter.h \
|
||||
- gtkrecentmanager.h \
|
||||
- gtkrender.h \
|
||||
- gtkrevealer.h \
|
||||
- gtkscale.h \
|
||||
- gtkscalebutton.h \
|
||||
- gtkscrollable.h \
|
||||
- gtkscrollbar.h \
|
||||
- gtkscrolledwindow.h \
|
||||
- gtksearchbar.h \
|
||||
- gtksearchentry.h \
|
||||
- gtkselection.h \
|
||||
- gtkseparator.h \
|
||||
- gtkseparatormenuitem.h \
|
||||
- gtkseparatortoolitem.h \
|
||||
- gtksettings.h \
|
||||
- gtkshortcutlabel.h \
|
||||
- gtkshortcutsgroup.h \
|
||||
- gtkshortcutssection.h \
|
||||
- gtkshortcutsshortcut.h \
|
||||
- gtkshortcutswindow.h \
|
||||
- gtkshow.h \
|
||||
- gtkstacksidebar.h \
|
||||
- gtksizegroup.h \
|
||||
- gtksizerequest.h \
|
||||
- gtksocket.h \
|
||||
- gtkspinbutton.h \
|
||||
- gtkspinner.h \
|
||||
- gtkstack.h \
|
||||
- gtkstackswitcher.h \
|
||||
- gtkstatusbar.h \
|
||||
- gtkstylecontext.h \
|
||||
- gtkstyleprovider.h \
|
||||
- gtkswitch.h \
|
||||
- gtktestutils.h \
|
||||
- gtktextattributes.h \
|
||||
- gtktextbuffer.h \
|
||||
- gtktextbufferrichtext.h \
|
||||
- gtktextchild.h \
|
||||
- gtktextdisplay.h \
|
||||
- gtktextiter.h \
|
||||
- gtktextmark.h \
|
||||
- gtktexttag.h \
|
||||
- gtktexttagtable.h \
|
||||
- gtktextview.h \
|
||||
- gtktogglebutton.h \
|
||||
- gtktoggletoolbutton.h \
|
||||
- gtktoolbar.h \
|
||||
- gtktoolbutton.h \
|
||||
- gtktoolitem.h \
|
||||
- gtktoolitemgroup.h \
|
||||
- gtktoolpalette.h \
|
||||
- gtktoolshell.h \
|
||||
- gtktooltip.h \
|
||||
- gtktreednd.h \
|
||||
- gtktreemodel.h \
|
||||
- gtktreemodelfilter.h \
|
||||
- gtktreemodelsort.h \
|
||||
- gtktreeselection.h \
|
||||
- gtktreesortable.h \
|
||||
- gtktreestore.h \
|
||||
- gtktreeview.h \
|
||||
- gtktreeviewcolumn.h \
|
||||
- gtktypes.h \
|
||||
- gtkviewport.h \
|
||||
- gtkvolumebutton.h \
|
||||
- gtkwidget.h \
|
||||
- gtkwidgetpath.h \
|
||||
- gtkwindow.h \
|
||||
- gtkwindowgroup.h
|
||||
-
|
||||
-GTK_PRIVATE_TYPE_HDRS = \
|
||||
- gtkcsstypesprivate.h \
|
||||
- gtktexthandleprivate.h
|
||||
diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc
|
||||
new file mode 100644
|
||||
index 0000000..86c38f9
|
||||
--- /dev/null
|
||||
+++ b/gtk/gtk-sources.inc
|
||||
@@ -0,0 +1,236 @@
|
||||
+# List of headers to be passed into glib-mkenums
|
||||
+
|
||||
+
|
||||
+# GTK+ header files for public installation (non-generated, or generated
|
||||
+# by configure)
|
||||
+
|
||||
+GTK_PUB_HDRS = \
|
||||
+ gtk.h \
|
||||
+ gtk-autocleanups.h \
|
||||
+ gtkx.h \
|
||||
+ gtkx-autocleanups.h \
|
||||
+ gtk-a11y.h \
|
||||
+ gtkaboutdialog.h \
|
||||
+ gtkaccelgroup.h \
|
||||
+ gtkaccellabel.h \
|
||||
+ gtkaccelmap.h \
|
||||
+ gtkaccessible.h \
|
||||
+ gtkactionable.h \
|
||||
+ gtkactionbar.h \
|
||||
+ gtkadjustment.h \
|
||||
+ gtkappchooser.h \
|
||||
+ gtkappchooserbutton.h \
|
||||
+ gtkappchooserdialog.h \
|
||||
+ gtkappchooserwidget.h \
|
||||
+ gtkapplication.h \
|
||||
+ gtkapplicationwindow.h \
|
||||
+ gtkaspectframe.h \
|
||||
+ gtkassistant.h \
|
||||
+ gtkbbox.h \
|
||||
+ gtkbin.h \
|
||||
+ gtkbindings.h \
|
||||
+ gtkborder.h \
|
||||
+ gtkbox.h \
|
||||
+ gtkbuilder.h \
|
||||
+ gtkbuildable.h \
|
||||
+ gtkbutton.h \
|
||||
+ gtkcalendar.h \
|
||||
+ gtkcellarea.h \
|
||||
+ gtkcellareacontext.h \
|
||||
+ gtkcellareabox.h \
|
||||
+ gtkcelleditable.h \
|
||||
+ gtkcelllayout.h \
|
||||
+ gtkcellrenderer.h \
|
||||
+ gtkcellrendereraccel.h \
|
||||
+ gtkcellrenderercombo.h \
|
||||
+ gtkcellrendererpixbuf.h \
|
||||
+ gtkcellrendererprogress.h \
|
||||
+ gtkcellrendererspin.h \
|
||||
+ gtkcellrendererspinner.h\
|
||||
+ gtkcellrenderertext.h \
|
||||
+ gtkcellrenderertoggle.h \
|
||||
+ gtkcellview.h \
|
||||
+ gtkcheckbutton.h \
|
||||
+ gtkcheckmenuitem.h \
|
||||
+ gtkclipboard.h \
|
||||
+ gtkcolorbutton.h \
|
||||
+ gtkcolorchooser.h \
|
||||
+ gtkcolorchooserwidget.h \
|
||||
+ gtkcolorchooserdialog.h \
|
||||
+ gtkcolorutils.h \
|
||||
+ gtkcombobox.h \
|
||||
+ gtkcomboboxtext.h \
|
||||
+ gtkcontainer.h \
|
||||
+ gtkcssprovider.h \
|
||||
+ gtkcsssection.h \
|
||||
+ gtkdebug.h \
|
||||
+ gtkdialog.h \
|
||||
+ gtkdnd.h \
|
||||
+ gtkdragdest.h \
|
||||
+ gtkdragsource.h \
|
||||
+ gtkdrawingarea.h \
|
||||
+ gtkeditable.h \
|
||||
+ gtkentry.h \
|
||||
+ gtkentrybuffer.h \
|
||||
+ gtkentrycompletion.h \
|
||||
+ gtkenums.h \
|
||||
+ gtkeventbox.h \
|
||||
+ gtkeventcontroller.h \
|
||||
+ gtkeventcontrollerkey.h \
|
||||
+ gtkeventcontrollermotion.h \
|
||||
+ gtkeventcontrollerscroll.h \
|
||||
+ gtkexpander.h \
|
||||
+ gtkfilechooser.h \
|
||||
+ gtkfilechooserbutton.h \
|
||||
+ gtkfilechooserdialog.h \
|
||||
+ gtkfilechoosernative.h \
|
||||
+ gtkfilechooserwidget.h \
|
||||
+ gtkfilefilter.h \
|
||||
+ gtkfixed.h \
|
||||
+ gtkflowbox.h \
|
||||
+ gtkfontbutton.h \
|
||||
+ gtkfontchooser.h \
|
||||
+ gtkfontchooserdialog.h \
|
||||
+ gtkfontchooserwidget.h \
|
||||
+ gtkframe.h \
|
||||
+ gtkgesture.h \
|
||||
+ gtkgesturedrag.h \
|
||||
+ gtkgesturelongpress.h \
|
||||
+ gtkgesturemultipress.h \
|
||||
+ gtkgesturepan.h \
|
||||
+ gtkgesturerotate.h \
|
||||
+ gtkgesturesingle.h \
|
||||
+ gtkgesturestylus.h \
|
||||
+ gtkgestureswipe.h \
|
||||
+ gtkgesturezoom.h \
|
||||
+ gtkglarea.h \
|
||||
+ gtkgrid.h \
|
||||
+ gtkheaderbar.h \
|
||||
+ gtkicontheme.h \
|
||||
+ gtkiconview.h \
|
||||
+ gtkimage.h \
|
||||
+ gtkimcontext.h \
|
||||
+ gtkimcontextinfo.h \
|
||||
+ gtkimcontextsimple.h \
|
||||
+ gtkimmodule.h \
|
||||
+ gtkimmulticontext.h \
|
||||
+ gtkinfobar.h \
|
||||
+ gtkinvisible.h \
|
||||
+ gtklabel.h \
|
||||
+ gtklayout.h \
|
||||
+ gtklevelbar.h \
|
||||
+ gtklinkbutton.h \
|
||||
+ gtklistbox.h \
|
||||
+ gtkliststore.h \
|
||||
+ gtklockbutton.h \
|
||||
+ gtkmain.h \
|
||||
+ gtkmenu.h \
|
||||
+ gtkmenubar.h \
|
||||
+ gtkmenubutton.h \
|
||||
+ gtkmenuitem.h \
|
||||
+ gtkmenushell.h \
|
||||
+ gtkmenutoolbutton.h \
|
||||
+ gtkmessagedialog.h \
|
||||
+ gtkmodelbutton.h \
|
||||
+ gtkmodules.h \
|
||||
+ gtkmountoperation.h \
|
||||
+ gtknativedialog.h \
|
||||
+ gtknotebook.h \
|
||||
+ gtkoffscreenwindow.h \
|
||||
+ gtkorientable.h \
|
||||
+ gtkoverlay.h \
|
||||
+ gtkpadcontroller.h \
|
||||
+ gtkpagesetup.h \
|
||||
+ gtkpaned.h \
|
||||
+ gtkpapersize.h \
|
||||
+ gtkplacessidebar.h \
|
||||
+ gtkplug.h \
|
||||
+ gtkpopover.h \
|
||||
+ gtkpopovermenu.h \
|
||||
+ gtkprintcontext.h \
|
||||
+ gtkprintoperation.h \
|
||||
+ gtkprintoperationpreview.h \
|
||||
+ gtkprintsettings.h \
|
||||
+ gtkprogressbar.h \
|
||||
+ gtkradiobutton.h \
|
||||
+ gtkradiomenuitem.h \
|
||||
+ gtkradiotoolbutton.h \
|
||||
+ gtkrange.h \
|
||||
+ gtkrecentchooser.h \
|
||||
+ gtkrecentchooserdialog.h \
|
||||
+ gtkrecentchoosermenu.h \
|
||||
+ gtkrecentchooserwidget.h \
|
||||
+ gtkrecentfilter.h \
|
||||
+ gtkrecentmanager.h \
|
||||
+ gtkrender.h \
|
||||
+ gtkrevealer.h \
|
||||
+ gtkscale.h \
|
||||
+ gtkscalebutton.h \
|
||||
+ gtkscrollable.h \
|
||||
+ gtkscrollbar.h \
|
||||
+ gtkscrolledwindow.h \
|
||||
+ gtksearchbar.h \
|
||||
+ gtksearchentry.h \
|
||||
+ gtkselection.h \
|
||||
+ gtkseparator.h \
|
||||
+ gtkseparatormenuitem.h \
|
||||
+ gtkseparatortoolitem.h \
|
||||
+ gtksettings.h \
|
||||
+ gtkshortcutlabel.h \
|
||||
+ gtkshortcutsgroup.h \
|
||||
+ gtkshortcutssection.h \
|
||||
+ gtkshortcutsshortcut.h \
|
||||
+ gtkshortcutswindow.h \
|
||||
+ gtkshow.h \
|
||||
+ gtkstacksidebar.h \
|
||||
+ gtksizegroup.h \
|
||||
+ gtksizerequest.h \
|
||||
+ gtksocket.h \
|
||||
+ gtkspinbutton.h \
|
||||
+ gtkspinner.h \
|
||||
+ gtkstack.h \
|
||||
+ gtkstackswitcher.h \
|
||||
+ gtkstatusbar.h \
|
||||
+ gtkstylecontext.h \
|
||||
+ gtkstyleprovider.h \
|
||||
+ gtkswitch.h \
|
||||
+ gtktestutils.h \
|
||||
+ gtktextattributes.h \
|
||||
+ gtktextbuffer.h \
|
||||
+ gtktextbufferrichtext.h \
|
||||
+ gtktextchild.h \
|
||||
+ gtktextdisplay.h \
|
||||
+ gtktextiter.h \
|
||||
+ gtktextmark.h \
|
||||
+ gtktexttag.h \
|
||||
+ gtktexttagtable.h \
|
||||
+ gtktextview.h \
|
||||
+ gtktogglebutton.h \
|
||||
+ gtktoggletoolbutton.h \
|
||||
+ gtktoolbar.h \
|
||||
+ gtktoolbutton.h \
|
||||
+ gtktoolitem.h \
|
||||
+ gtktoolitemgroup.h \
|
||||
+ gtktoolpalette.h \
|
||||
+ gtktoolshell.h \
|
||||
+ gtktooltip.h \
|
||||
+ gtktreednd.h \
|
||||
+ gtktreemodel.h \
|
||||
+ gtktreemodelfilter.h \
|
||||
+ gtktreemodelsort.h \
|
||||
+ gtktreeselection.h \
|
||||
+ gtktreesortable.h \
|
||||
+ gtktreestore.h \
|
||||
+ gtktreeview.h \
|
||||
+ gtktreeviewcolumn.h \
|
||||
+ gtktypes.h \
|
||||
+ gtkviewport.h \
|
||||
+ gtkvolumebutton.h \
|
||||
+ gtkwidget.h \
|
||||
+ gtkwidgetpath.h \
|
||||
+ gtkwindow.h \
|
||||
+ gtkwindowgroup.h
|
||||
+
|
||||
+GTK_PRIVATE_TYPE_HDRS = \
|
||||
+ gtkcsstypesprivate.h \
|
||||
+ gtktexthandleprivate.h
|
||||
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
|
||||
index d19e3a4..02eada5 100644
|
||||
--- a/win32/create-lists-msvc.mak
|
||||
+++ b/win32/create-lists-msvc.mak
|
||||
@@ -65,7 +65,7 @@ NULL=
|
||||
!endif
|
||||
|
||||
# For GTK enumeration sources
|
||||
-!include ..\gtk\gtk-mkenums-headers.mak
|
||||
+!include ..\gtk\gtk-sources.inc
|
||||
!include ..\gtk\a11y\Makefile.inc
|
||||
!include ..\gtk\deprecated\Makefile.inc
|
||||
|
||||
58
debian/patches/gtk-sources.inc-Split-base-sources-in-two-parts.patch
vendored
Normal file
58
debian/patches/gtk-sources.inc-Split-base-sources-in-two-parts.patch
vendored
Normal file
@ -0,0 +1,58 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed, 18 May 2022 17:54:39 +0800
|
||||
Subject: gtk-sources.inc: Split base sources in two parts
|
||||
|
||||
Otherwise, NMake will choke when creating a filelist from it. This
|
||||
U1095 error is nasty! :|
|
||||
|
||||
Origin: upstream, 3.24.35, commit:574bd57f726cbd6a024fe13fe95283f7ba1b10ba
|
||||
---
|
||||
gtk/gtk-sources.inc | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc
|
||||
index 91e511b..a073ada 100644
|
||||
--- a/gtk/gtk-sources.inc
|
||||
+++ b/gtk/gtk-sources.inc
|
||||
@@ -485,8 +485,10 @@ gtk_base_private_h_sources = \
|
||||
language-names.h \
|
||||
script-names.h
|
||||
|
||||
-# GTK base sources
|
||||
-gtk_base_c_sources_base = \
|
||||
+# GTK base sources (had to split those in 2 parts to avoid U1095 error :|, order unchanged from before)
|
||||
+# gtk_base_c_sources_base_gtka_gtkh: sources from gtka* to gtkh*, mostly
|
||||
+# gtk_base_c_sources_base_gtki_gtkw: sources from gtki* to gtkw*, mostly
|
||||
+gtk_base_c_sources_base_gtka_gtkh = \
|
||||
gtkactionmuxer.c \
|
||||
gtkactionobserver.c \
|
||||
gtkactionobservable.c \
|
||||
@@ -684,7 +686,9 @@ gtk_base_c_sources_base = \
|
||||
gtkglarea.c \
|
||||
gtkgrid.c \
|
||||
gtkheaderbar.c \
|
||||
- gtkhsla.c \
|
||||
+ gtkhsla.c
|
||||
+
|
||||
+gtk_base_c_sources_base_gtki_gtkw = \
|
||||
gtkicon.c \
|
||||
gtkiconcache.c \
|
||||
gtkiconcachevalidator.c \
|
||||
@@ -698,7 +702,7 @@ gtk_base_c_sources_base = \
|
||||
gtkimmodule.c \
|
||||
gtkimmulticontext.c \
|
||||
gtkinfobar.c \
|
||||
- gtkinvisible.c \
|
||||
+ gtkinvisible.c \
|
||||
gtkkeyhash.c \
|
||||
gtkkineticscrolling.c \
|
||||
gtklabel.c \
|
||||
@@ -856,6 +860,8 @@ gtk_base_c_sources_base = \
|
||||
language-names.c \
|
||||
script-names.c
|
||||
|
||||
+gtk_base_c_sources_base = $(gtk_base_c_sources_base_gtka_gtkh) $(gtk_base_c_sources_base_gtki_gtkw)
|
||||
+
|
||||
# Clipboard/dnd platform-specific sources
|
||||
gtk_clipboard_dnd_c_sources_quartz = \
|
||||
gtkclipboard-quartz.c \
|
||||
36
debian/patches/gtkentry-Also-reset-IM-context-after-IM-surrounding-text-.patch
vendored
Normal file
36
debian/patches/gtkentry-Also-reset-IM-context-after-IM-surrounding-text-.patch
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 6 Sep 2022 21:53:25 +0200
|
||||
Subject: gtkentry: Also reset IM context after IM surrounding text deletion
|
||||
|
||||
When the IM commands the GtkText to delete text, the cursor position
|
||||
would change, and so would the surrounding text. Reset the IM context
|
||||
so that these updates are properly picked up by the IM.
|
||||
|
||||
Fixes backspace key behavior in the GNOME Shell OSK, since that relies
|
||||
on the surrounding text being properly updated for the next iteration.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:018083fab7fb588a5700540b1ee3ff3b5af6a0bd
|
||||
---
|
||||
gtk/gtkentry.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index f8050df..7da9f80 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -6137,9 +6137,12 @@ gtk_entry_delete_surrounding_cb (GtkIMContext *slave,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
|
||||
if (priv->editable)
|
||||
- gtk_editable_delete_text (GTK_EDITABLE (entry),
|
||||
- priv->current_pos + offset,
|
||||
- priv->current_pos + offset + n_chars);
|
||||
+ {
|
||||
+ gtk_editable_delete_text (GTK_EDITABLE (entry),
|
||||
+ priv->current_pos + offset,
|
||||
+ priv->current_pos + offset + n_chars);
|
||||
+ gtk_im_context_reset (slave);
|
||||
+ }
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
84
debian/patches/gtkentry-Avoid-early-IM-reset-on-updates-1.patch
vendored
Normal file
84
debian/patches/gtkentry-Avoid-early-IM-reset-on-updates-1.patch
vendored
Normal file
@ -0,0 +1,84 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 6 Sep 2022 21:43:14 +0200
|
||||
Subject: gtkentry: Avoid early IM reset on updates
|
||||
|
||||
Resetting the IM on IM updates is too eager and indeed the simple
|
||||
IM context doesn't like that this happens in the middle of dead
|
||||
key handling.
|
||||
|
||||
We however want to reset the IM after actual text buffer changes
|
||||
(say, a committed string) moved the cursor position, altered the
|
||||
surrounding text, etc. So that the IM implementation does know to
|
||||
update its state.
|
||||
|
||||
Since there is going to be an actual IM reset anyways, it does
|
||||
no longer make sense to try to preserve the old priv->need_im_reset
|
||||
status during commit handling.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:fa6aca2925eadb341b7d03d0cee22d452cb64951
|
||||
---
|
||||
gtk/gtkentry.c | 4 ----
|
||||
gtk/gtktextview.c | 9 +--------
|
||||
2 files changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index d26f4de..f8050df 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -6155,10 +6155,8 @@ gtk_entry_enter_text (GtkEntry *entry,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
GtkEditable *editable = GTK_EDITABLE (entry);
|
||||
gint tmp_pos;
|
||||
- gboolean old_need_im_reset;
|
||||
guint text_length;
|
||||
|
||||
- old_need_im_reset = priv->need_im_reset;
|
||||
priv->need_im_reset = FALSE;
|
||||
|
||||
if (gtk_editable_get_selection_bounds (editable, NULL, NULL))
|
||||
@@ -6176,8 +6174,6 @@ gtk_entry_enter_text (GtkEntry *entry,
|
||||
tmp_pos = priv->current_pos;
|
||||
gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos);
|
||||
gtk_editable_set_position (editable, tmp_pos);
|
||||
-
|
||||
- priv->need_im_reset = old_need_im_reset;
|
||||
}
|
||||
|
||||
/* All changes to priv->current_pos and priv->selection_bound
|
||||
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
||||
index 148f744..57dd199 100644
|
||||
--- a/gtk/gtktextview.c
|
||||
+++ b/gtk/gtktextview.c
|
||||
@@ -5491,9 +5491,6 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
|
||||
{
|
||||
GtkTextView *text_view;
|
||||
GtkTextViewPrivate *priv;
|
||||
- GtkTextMark *insert;
|
||||
- GtkTextIter iter;
|
||||
- gboolean can_insert;
|
||||
gboolean retval = FALSE;
|
||||
|
||||
text_view = GTK_TEXT_VIEW (widget);
|
||||
@@ -5507,14 +5504,9 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
|
||||
/* Make sure input method knows where it is */
|
||||
flush_update_im_spot_location (text_view);
|
||||
|
||||
- insert = gtk_text_buffer_get_insert (get_buffer (text_view));
|
||||
- gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, insert);
|
||||
- can_insert = gtk_text_iter_can_insert (&iter, priv->editable);
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
priv->need_im_reset = TRUE;
|
||||
- if (can_insert)
|
||||
- gtk_text_view_reset_im_context (text_view);
|
||||
retval = TRUE;
|
||||
}
|
||||
/* Binding set */
|
||||
@@ -9109,6 +9101,7 @@ gtk_text_view_commit_handler (GtkIMContext *context,
|
||||
GtkTextView *text_view)
|
||||
{
|
||||
gtk_text_view_commit_text (text_view, str);
|
||||
+ gtk_im_context_reset (context);
|
||||
}
|
||||
|
||||
static void
|
||||
52
debian/patches/gtkentry-Avoid-early-IM-reset-on-updates.patch
vendored
Normal file
52
debian/patches/gtkentry-Avoid-early-IM-reset-on-updates.patch
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 6 Sep 2022 21:38:35 +0200
|
||||
Subject: gtkentry: Avoid early IM reset on updates
|
||||
|
||||
Resetting the IM on IM updates is too eager and indeed the simple
|
||||
IM context doesn't like that this happens in the middle of dead
|
||||
key handling.
|
||||
|
||||
We however want to reset the IM after actual text buffer changes
|
||||
(say, a committed string) moved the cursor position, altered the
|
||||
surrounding text, etc. So that the IM implementation does know to
|
||||
update its state.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:7b1f9a3b083e170849bc94d4a5da01367ee27d0d
|
||||
---
|
||||
gtk/gtkentry.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index 12974d6..d26f4de 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -4897,7 +4897,7 @@ gtk_entry_key_press (GtkWidget *widget,
|
||||
{
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
- gtk_im_context_reset (priv->im_context);
|
||||
+ priv->need_im_reset = TRUE;
|
||||
retval = TRUE;
|
||||
goto out;
|
||||
}
|
||||
@@ -4939,7 +4939,7 @@ gtk_entry_key_release (GtkWidget *widget,
|
||||
{
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
- gtk_im_context_reset (priv->im_context);
|
||||
+ priv->need_im_reset = TRUE;
|
||||
retval = TRUE;
|
||||
goto out;
|
||||
}
|
||||
@@ -6082,7 +6082,10 @@ gtk_entry_commit_cb (GtkIMContext *context,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
|
||||
if (priv->editable)
|
||||
- gtk_entry_enter_text (entry, str);
|
||||
+ {
|
||||
+ gtk_entry_enter_text (entry, str);
|
||||
+ gtk_im_context_reset (context);
|
||||
+ }
|
||||
}
|
||||
|
||||
static void
|
||||
116
debian/patches/gtkentry-Shuffle-the-places-doing-IM-reset.patch
vendored
Normal file
116
debian/patches/gtkentry-Shuffle-the-places-doing-IM-reset.patch
vendored
Normal file
@ -0,0 +1,116 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 18 Aug 2022 00:55:30 +0200
|
||||
Subject: gtkentry: Shuffle the places doing IM reset
|
||||
|
||||
During entry widget manipulation (inserting or deleting text via keyboard)
|
||||
the IM context is reset somewhat early, before the actual change took place.
|
||||
This makes IM lag behind in terms of surrounding text and cursor position.
|
||||
|
||||
Shuffle these IM reset calls so that they happen after the changes, and
|
||||
ensure that the IM is actually reset, since that is currently toggled on
|
||||
a pretty narrow set of circumstances.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:b0c4196f98046eb8b235240d08505680aa0e1dfb
|
||||
---
|
||||
gtk/gtkentry.c | 25 +++++++++++++++++--------
|
||||
1 file changed, 17 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index 864c217..12974d6 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -4897,7 +4897,7 @@ gtk_entry_key_press (GtkWidget *widget,
|
||||
{
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
- priv->need_im_reset = TRUE;
|
||||
+ gtk_im_context_reset (priv->im_context);
|
||||
retval = TRUE;
|
||||
goto out;
|
||||
}
|
||||
@@ -4939,7 +4939,7 @@ gtk_entry_key_release (GtkWidget *widget,
|
||||
{
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
- priv->need_im_reset = TRUE;
|
||||
+ gtk_im_context_reset (priv->im_context);
|
||||
retval = TRUE;
|
||||
goto out;
|
||||
}
|
||||
@@ -5606,8 +5606,6 @@ gtk_entry_move_cursor (GtkEntry *entry,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
gint new_pos = priv->current_pos;
|
||||
|
||||
- gtk_entry_reset_im_context (entry);
|
||||
-
|
||||
if (priv->current_pos != priv->selection_bound && !extend_selection)
|
||||
{
|
||||
/* If we have a current selection and aren't extending it, move to the
|
||||
@@ -5732,6 +5730,9 @@ gtk_entry_move_cursor (GtkEntry *entry,
|
||||
gtk_editable_set_position (GTK_EDITABLE (entry), new_pos);
|
||||
|
||||
gtk_entry_pend_cursor_blink (entry);
|
||||
+
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_entry_reset_im_context (entry);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -5761,8 +5762,6 @@ gtk_entry_delete_from_cursor (GtkEntry *entry,
|
||||
gint end_pos = priv->current_pos;
|
||||
gint old_n_bytes = gtk_entry_buffer_get_bytes (get_buffer (entry));
|
||||
|
||||
- gtk_entry_reset_im_context (entry);
|
||||
-
|
||||
if (!priv->editable)
|
||||
{
|
||||
gtk_widget_error_bell (GTK_WIDGET (entry));
|
||||
@@ -5772,6 +5771,8 @@ gtk_entry_delete_from_cursor (GtkEntry *entry,
|
||||
if (priv->selection_bound != priv->current_pos)
|
||||
{
|
||||
gtk_editable_delete_selection (editable);
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_entry_reset_im_context (entry);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -5834,6 +5835,11 @@ gtk_entry_delete_from_cursor (GtkEntry *entry,
|
||||
|
||||
if (gtk_entry_buffer_get_bytes (get_buffer (entry)) == old_n_bytes)
|
||||
gtk_widget_error_bell (GTK_WIDGET (entry));
|
||||
+ else
|
||||
+ {
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_entry_reset_im_context (entry);
|
||||
+ }
|
||||
|
||||
gtk_entry_pend_cursor_blink (entry);
|
||||
}
|
||||
@@ -5845,8 +5851,6 @@ gtk_entry_backspace (GtkEntry *entry)
|
||||
GtkEditable *editable = GTK_EDITABLE (entry);
|
||||
gint prev_pos;
|
||||
|
||||
- gtk_entry_reset_im_context (entry);
|
||||
-
|
||||
if (!priv->editable)
|
||||
{
|
||||
gtk_widget_error_bell (GTK_WIDGET (entry));
|
||||
@@ -5856,6 +5860,8 @@ gtk_entry_backspace (GtkEntry *entry)
|
||||
if (priv->selection_bound != priv->current_pos)
|
||||
{
|
||||
gtk_editable_delete_selection (editable);
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_entry_reset_im_context (entry);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -5902,6 +5908,9 @@ gtk_entry_backspace (GtkEntry *entry)
|
||||
gtk_editable_delete_text (editable, prev_pos, priv->current_pos);
|
||||
}
|
||||
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_entry_reset_im_context (entry);
|
||||
+
|
||||
g_free (log_attrs);
|
||||
}
|
||||
else
|
||||
183
debian/patches/gtkimcontextwayland-Refactor-handling-of-client-updates.patch
vendored
Normal file
183
debian/patches/gtkimcontextwayland-Refactor-handling-of-client-updates.patch
vendored
Normal file
@ -0,0 +1,183 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 18 Aug 2022 00:58:38 +0200
|
||||
Subject: gtkimcontextwayland: Refactor handling of client updates
|
||||
|
||||
Currently, the wayland IM context sends zwp_text_input_v3.commit from
|
||||
a number of places, and some of them with partial data. In order to
|
||||
make client state updates "atomic" and complete, make the communication
|
||||
happen over an unified notify_im_change() function that happens on
|
||||
a narrower set of circumstances:
|
||||
|
||||
- The GtkIMContext is reset
|
||||
- The GtkIMContext is just focused
|
||||
- The gesture to invoke the OSK is triggered
|
||||
- The IM context is reacting to changes coming from the compositor
|
||||
|
||||
Notably, setting the cursor location or the surrounding text do not try
|
||||
to commit state on their own, and now will be flushed with the corresponding
|
||||
IM update or reset. But also, these requests won't be prevented from
|
||||
happening individually on serial mismatch, instead it will be the whole
|
||||
state commit which is held off.
|
||||
|
||||
With these changes in place, all client-side updates are notified
|
||||
atomically to the compositor under a single .commit request.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:a2f579eca8fe1d9a3e8b4922727fd94cd11c0116
|
||||
---
|
||||
modules/input/imwayland.c | 51 +++++++++++++++++++++++++++++------------------
|
||||
1 file changed, 32 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
|
||||
index 1e93123..facb9f2 100644
|
||||
--- a/modules/input/imwayland.c
|
||||
+++ b/modules/input/imwayland.c
|
||||
@@ -116,6 +116,11 @@ static const GtkIMContextInfo *info_list[] =
|
||||
|
||||
static void gtk_im_context_wayland_focus_out (GtkIMContext *context);
|
||||
|
||||
+static void commit_state (GtkIMContextWayland *context);
|
||||
+static void notify_surrounding_text (GtkIMContextWayland *context);
|
||||
+static void notify_cursor_location (GtkIMContextWayland *context);
|
||||
+static void notify_content_type (GtkIMContextWayland *context);
|
||||
+
|
||||
#define GTK_IM_CONTEXT_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), type_wayland, GtkIMContextWayland))
|
||||
|
||||
#ifndef INCLUDE_IM_wayland
|
||||
@@ -125,7 +130,8 @@ static void gtk_im_context_wayland_focus_out (GtkIMContext *context);
|
||||
#endif
|
||||
|
||||
static void
|
||||
-notify_external_change (GtkIMContextWayland *context)
|
||||
+notify_im_change (GtkIMContextWayland *context,
|
||||
+ enum zwp_text_input_v3_change_cause cause)
|
||||
{
|
||||
gboolean result;
|
||||
|
||||
@@ -135,8 +141,12 @@ notify_external_change (GtkIMContextWayland *context)
|
||||
if (!context->enabled)
|
||||
return;
|
||||
|
||||
- context->surrounding_change = ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_OTHER;
|
||||
+ context->surrounding_change = cause;
|
||||
g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
|
||||
+ notify_surrounding_text (context);
|
||||
+ notify_content_type (context);
|
||||
+ notify_cursor_location (context);
|
||||
+ commit_state (context);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -262,17 +272,25 @@ text_input_done (void *data,
|
||||
uint32_t serial)
|
||||
{
|
||||
GtkIMContextWaylandGlobal *global = data;
|
||||
- gboolean result;
|
||||
+ GtkIMContextWayland *context;
|
||||
+ gboolean update_im;
|
||||
|
||||
global->done_serial = serial;
|
||||
|
||||
if (!global->current)
|
||||
return;
|
||||
|
||||
+ context = GTK_IM_CONTEXT_WAYLAND (global->current);
|
||||
+ update_im = (context->pending_commit != NULL ||
|
||||
+ g_strcmp0 (context->pending_preedit.text,
|
||||
+ context->current_preedit.text) != 0);
|
||||
+
|
||||
text_input_delete_surrounding_text_apply (global);
|
||||
text_input_commit_apply (global);
|
||||
- g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
|
||||
text_input_preedit_apply (global);
|
||||
+
|
||||
+ if (update_im && global->serial == serial)
|
||||
+ notify_im_change (context, ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -289,8 +307,6 @@ notify_surrounding_text (GtkIMContextWayland *context)
|
||||
return;
|
||||
if (!context->enabled || !context->surrounding.text)
|
||||
return;
|
||||
- if (global->done_serial != global->serial)
|
||||
- return;
|
||||
|
||||
len = strlen (context->surrounding.text);
|
||||
cursor = context->surrounding.cursor_idx;
|
||||
@@ -366,8 +382,6 @@ notify_cursor_location (GtkIMContextWayland *context)
|
||||
return;
|
||||
if (!context->enabled || !context->window)
|
||||
return;
|
||||
- if (global->done_serial != global->serial)
|
||||
- return;
|
||||
|
||||
rect = context->cursor_rect;
|
||||
gdk_window_get_root_coords (context->window, rect.x, rect.y,
|
||||
@@ -450,8 +464,6 @@ notify_content_type (GtkIMContextWayland *context)
|
||||
|
||||
if (!context->enabled)
|
||||
return;
|
||||
- if (global->done_serial != global->serial)
|
||||
- return;
|
||||
|
||||
g_object_get (context,
|
||||
"input-hints", &hints,
|
||||
@@ -592,16 +604,13 @@ gtk_im_context_wayland_filter_keypress (GtkIMContext *context,
|
||||
static void
|
||||
enable (GtkIMContextWayland *context_wayland)
|
||||
{
|
||||
- gboolean result;
|
||||
/* Technically, text input isn't enabled until after the commit.
|
||||
* In reality, enable can't fail, and notify functions need to know
|
||||
* that they are free to send requests. */
|
||||
context_wayland->enabled = TRUE;
|
||||
zwp_text_input_v3_enable (global->text_input);
|
||||
- g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
|
||||
- notify_content_type (context_wayland);
|
||||
- notify_cursor_location (context_wayland);
|
||||
- commit_state (context_wayland);
|
||||
+ notify_im_change (context_wayland,
|
||||
+ ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_OTHER);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -611,6 +620,12 @@ disable (GtkIMContextWayland *context_wayland)
|
||||
commit_state (context_wayland);
|
||||
context_wayland->enabled = FALSE;
|
||||
|
||||
+ /* The commit above will still count in the .done event accounting,
|
||||
+ * we should account for it, lest the serial gets out of sync after
|
||||
+ * a future focus_in/enable.
|
||||
+ */
|
||||
+ global->done_serial++;
|
||||
+
|
||||
/* after disable, incoming state changes won't take effect anyway */
|
||||
if (context_wayland->current_preedit.text)
|
||||
{
|
||||
@@ -821,7 +836,8 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
|
||||
static void
|
||||
gtk_im_context_wayland_reset (GtkIMContext *context)
|
||||
{
|
||||
- notify_external_change (GTK_IM_CONTEXT_WAYLAND (context));
|
||||
+ notify_im_change (GTK_IM_CONTEXT_WAYLAND (context),
|
||||
+ ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_OTHER);
|
||||
|
||||
GTK_IM_CONTEXT_CLASS (parent_class)->reset (context);
|
||||
}
|
||||
@@ -856,8 +872,6 @@ gtk_im_context_wayland_set_cursor_location (GtkIMContext *context,
|
||||
gtk_event_controller_reset (GTK_EVENT_CONTROLLER (context_wayland->gesture));
|
||||
|
||||
context_wayland->cursor_rect = *rect;
|
||||
- notify_cursor_location (context_wayland);
|
||||
- commit_state (context_wayland);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -893,7 +907,6 @@ gtk_im_context_wayland_set_surrounding (GtkIMContext *context,
|
||||
context_wayland->surrounding.anchor_idx = cursor_index;
|
||||
|
||||
notify_surrounding_text (context_wayland);
|
||||
- commit_state (context_wayland);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
132
debian/patches/gtkimcontextwayland-Shuffle-full-resets-after-IM-changes.patch
vendored
Normal file
132
debian/patches/gtkimcontextwayland-Shuffle-full-resets-after-IM-changes.patch
vendored
Normal file
@ -0,0 +1,132 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Sat, 24 Sep 2022 11:45:18 +0200
|
||||
Subject: gtkimcontextwayland: Shuffle full resets after IM changes
|
||||
|
||||
Doing reset() on the text widgets after commit and delete_surrounding
|
||||
is still too eager for some IMs (e.g. those that expect being able
|
||||
to commit text while keeping a preedit buffer shown).
|
||||
|
||||
However, reset() is more of a "synchronize state" action on Wayland,
|
||||
and it is still desirable to do that after changes that do come from
|
||||
the IM (e.g. requesting the new surrounding text and cursor/anchor
|
||||
positions). Notably here, the text_input protocol may still come up
|
||||
with a preedit string after this state synchronization happens.
|
||||
|
||||
Shuffle the code so that the text widgets do not reset() the IM
|
||||
context after text is deleted or committed, but the Wayland IM does
|
||||
apply its practical effects after these actions happen. This keeps
|
||||
the Wayland IM fully up-to-date wrt text widget state, while not
|
||||
altering the ::commit and ::delete-surrounding-text behavior for
|
||||
other IM context implementations.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:92813e52cde864139f3b740992e8c267a7a6bd1d
|
||||
---
|
||||
gtk/gtkentry.c | 14 ++++----------
|
||||
gtk/gtktextview.c | 6 ++----
|
||||
modules/input/imwayland.c | 23 ++++++++++++++++++++---
|
||||
3 files changed, 26 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index 7da9f80..4078855 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -6082,10 +6082,7 @@ gtk_entry_commit_cb (GtkIMContext *context,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
|
||||
if (priv->editable)
|
||||
- {
|
||||
- gtk_entry_enter_text (entry, str);
|
||||
- gtk_im_context_reset (context);
|
||||
- }
|
||||
+ gtk_entry_enter_text (entry, str);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -6137,12 +6134,9 @@ gtk_entry_delete_surrounding_cb (GtkIMContext *slave,
|
||||
GtkEntryPrivate *priv = entry->priv;
|
||||
|
||||
if (priv->editable)
|
||||
- {
|
||||
- gtk_editable_delete_text (GTK_EDITABLE (entry),
|
||||
- priv->current_pos + offset,
|
||||
- priv->current_pos + offset + n_chars);
|
||||
- gtk_im_context_reset (slave);
|
||||
- }
|
||||
+ gtk_editable_delete_text (GTK_EDITABLE (entry),
|
||||
+ priv->current_pos + offset,
|
||||
+ priv->current_pos + offset + n_chars);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
||||
index e6b4d0a..8a1241e 100644
|
||||
--- a/gtk/gtktextview.c
|
||||
+++ b/gtk/gtktextview.c
|
||||
@@ -9101,7 +9101,6 @@ gtk_text_view_commit_handler (GtkIMContext *context,
|
||||
GtkTextView *text_view)
|
||||
{
|
||||
gtk_text_view_commit_text (text_view, str);
|
||||
- gtk_im_context_reset (context);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -9240,9 +9239,8 @@ gtk_text_view_delete_surrounding_handler (GtkIMContext *context,
|
||||
gtk_text_iter_forward_chars (&start, offset);
|
||||
gtk_text_iter_forward_chars (&end, offset + n_chars);
|
||||
|
||||
- if (gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
|
||||
- priv->editable))
|
||||
- gtk_im_context_reset (context);
|
||||
+ gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
|
||||
+ priv->editable);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
|
||||
index facb9f2..fb3e1e3 100644
|
||||
--- a/modules/input/imwayland.c
|
||||
+++ b/modules/input/imwayland.c
|
||||
@@ -260,9 +260,14 @@ text_input_delete_surrounding_text_apply (GtkIMContextWaylandGlobal *global)
|
||||
len = context->pending_surrounding_delete.after_length
|
||||
+ context->pending_surrounding_delete.before_length;
|
||||
if (len > 0)
|
||||
- g_signal_emit_by_name (global->current, "delete-surrounding",
|
||||
- -context->pending_surrounding_delete.before_length,
|
||||
- len, &retval);
|
||||
+ {
|
||||
+ g_signal_emit_by_name (global->current, "delete-surrounding",
|
||||
+ -context->pending_surrounding_delete.before_length,
|
||||
+ len, &retval);
|
||||
+ notify_im_change (GTK_IM_CONTEXT_WAYLAND (context),
|
||||
+ ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD);
|
||||
+ }
|
||||
+
|
||||
context->pending_surrounding_delete = defaults;
|
||||
}
|
||||
|
||||
@@ -926,6 +931,17 @@ gtk_im_context_wayland_get_surrounding (GtkIMContext *context,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+static void
|
||||
+gtk_im_context_wayland_commit (GtkIMContext *context,
|
||||
+ const gchar *str)
|
||||
+{
|
||||
+ if (GTK_IM_CONTEXT_CLASS (parent_class)->commit)
|
||||
+ GTK_IM_CONTEXT_CLASS (parent_class)->commit (context, str);
|
||||
+
|
||||
+ notify_im_change (GTK_IM_CONTEXT_WAYLAND (context),
|
||||
+ ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
gtk_im_context_wayland_class_init (GtkIMContextWaylandClass *klass)
|
||||
{
|
||||
@@ -944,6 +960,7 @@ gtk_im_context_wayland_class_init (GtkIMContextWaylandClass *klass)
|
||||
im_context_class->set_use_preedit = gtk_im_context_wayland_set_use_preedit;
|
||||
im_context_class->set_surrounding = gtk_im_context_wayland_set_surrounding;
|
||||
im_context_class->get_surrounding = gtk_im_context_wayland_get_surrounding;
|
||||
+ im_context_class->commit = gtk_im_context_wayland_commit;
|
||||
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
}
|
||||
39
debian/patches/gtkmodifierstyle.c-Release-symbolic-color-memory.patch
vendored
Normal file
39
debian/patches/gtkmodifierstyle.c-Release-symbolic-color-memory.patch
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
From: Xu Shaohua <shaohua@biofan.org>
|
||||
Date: Fri, 24 Jun 2022 10:04:25 +0800
|
||||
Subject: gtkmodifierstyle.c: Release symbolic color memory
|
||||
|
||||
Origin: upstream, 3.24.35, commit:13174cd70d75c849bfa408f0f7fbde7e05f768c6
|
||||
---
|
||||
gtk/gtkmodifierstyle.c | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkmodifierstyle.c b/gtk/gtkmodifierstyle.c
|
||||
index 1ea54d1..3092b6c 100644
|
||||
--- a/gtk/gtkmodifierstyle.c
|
||||
+++ b/gtk/gtkmodifierstyle.c
|
||||
@@ -226,16 +226,18 @@ _gtk_modifier_style_map_color (GtkModifierStyle *style,
|
||||
|
||||
g_return_if_fail (GTK_IS_MODIFIER_STYLE (style));
|
||||
g_return_if_fail (name != NULL);
|
||||
+ g_return_if_fail (color != NULL);
|
||||
|
||||
priv = style->priv;
|
||||
|
||||
- if (color)
|
||||
- symbolic_color = gtk_symbolic_color_new_literal (color);
|
||||
-
|
||||
- gtk_style_properties_map_color (priv->style,
|
||||
- name, symbolic_color);
|
||||
-
|
||||
- _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (style));
|
||||
+ symbolic_color = gtk_symbolic_color_new_literal (color);
|
||||
+ if (symbolic_color)
|
||||
+ {
|
||||
+ gtk_style_properties_map_color (priv->style,
|
||||
+ name, symbolic_color);
|
||||
+ gtk_symbolic_color_unref (symbolic_color);
|
||||
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (style));
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
33
debian/patches/gtktextview-Also-reset-IM-context-after-IM-surrounding-te.patch
vendored
Normal file
33
debian/patches/gtktextview-Also-reset-IM-context-after-IM-surrounding-te.patch
vendored
Normal file
@ -0,0 +1,33 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 6 Sep 2022 21:55:13 +0200
|
||||
Subject: gtktextview: Also reset IM context after IM surrounding text
|
||||
deletion
|
||||
|
||||
When the IM commands the GtkText to delete text, the cursor position
|
||||
would change, and so would the surrounding text. Reset the IM context
|
||||
so that these updates are properly picked up by the IM.
|
||||
|
||||
Fixes backspace key behavior in the GNOME Shell OSK, since that relies
|
||||
on the surrounding text being properly updated for the next iteration.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:a88e848306acba018e2bd1c5d9c74bcf6e33eb7f
|
||||
---
|
||||
gtk/gtktextview.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
||||
index 57dd199..e6b4d0a 100644
|
||||
--- a/gtk/gtktextview.c
|
||||
+++ b/gtk/gtktextview.c
|
||||
@@ -9240,8 +9240,9 @@ gtk_text_view_delete_surrounding_handler (GtkIMContext *context,
|
||||
gtk_text_iter_forward_chars (&start, offset);
|
||||
gtk_text_iter_forward_chars (&end, offset + n_chars);
|
||||
|
||||
- gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
|
||||
- priv->editable);
|
||||
+ if (gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
|
||||
+ priv->editable))
|
||||
+ gtk_im_context_reset (context);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
110
debian/patches/gtktextview-Shuffle-the-places-doing-IM-reset.patch
vendored
Normal file
110
debian/patches/gtktextview-Shuffle-the-places-doing-IM-reset.patch
vendored
Normal file
@ -0,0 +1,110 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 18 Aug 2022 00:58:14 +0200
|
||||
Subject: gtktextview: Shuffle the places doing IM reset
|
||||
|
||||
During text widget manipulation (inserting or deleting text via keyboard)
|
||||
the IM context is reset somewhat early, before the actual change took place.
|
||||
This makes IM lag behind in terms of surrounding text and cursor position.
|
||||
|
||||
Shuffle these IM reset calls so that they happen after the changes, and
|
||||
ensure that the IM is actually reset, since that is currently toggled on
|
||||
a pretty narrow set of circumstances.
|
||||
|
||||
Also, fix a bug during GtkEventControllerKey::im-update where the condition
|
||||
on cursor position editability to reset the IM context was inverted.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:0a8b0025e3102d2bd9977a011dfb884d36cfa1a5
|
||||
---
|
||||
gtk/gtktextview.c | 29 ++++++++++++++++++++---------
|
||||
1 file changed, 20 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
||||
index 9651c4a..148f744 100644
|
||||
--- a/gtk/gtktextview.c
|
||||
+++ b/gtk/gtktextview.c
|
||||
@@ -5513,7 +5513,7 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
|
||||
if (gtk_im_context_filter_keypress (priv->im_context, event))
|
||||
{
|
||||
priv->need_im_reset = TRUE;
|
||||
- if (!can_insert)
|
||||
+ if (can_insert)
|
||||
gtk_text_view_reset_im_context (text_view);
|
||||
retval = TRUE;
|
||||
}
|
||||
@@ -6564,8 +6564,6 @@ gtk_text_view_move_cursor (GtkTextView *text_view,
|
||||
return;
|
||||
}
|
||||
|
||||
- gtk_text_view_reset_im_context (text_view);
|
||||
-
|
||||
if (step == GTK_MOVEMENT_PAGES)
|
||||
{
|
||||
if (!gtk_text_view_scroll_pages (text_view, count, extend_selection))
|
||||
@@ -6749,6 +6747,9 @@ gtk_text_view_move_cursor (GtkTextView *text_view,
|
||||
|
||||
gtk_text_view_check_cursor_blink (text_view);
|
||||
gtk_text_view_pend_cursor_blink (text_view);
|
||||
+
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_text_view_reset_im_context (text_view);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -7039,14 +7040,16 @@ gtk_text_view_delete_from_cursor (GtkTextView *text_view,
|
||||
|
||||
priv = text_view->priv;
|
||||
|
||||
- gtk_text_view_reset_im_context (text_view);
|
||||
-
|
||||
if (type == GTK_DELETE_CHARS)
|
||||
{
|
||||
/* Char delete deletes the selection, if one exists */
|
||||
if (gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE,
|
||||
priv->editable))
|
||||
- return;
|
||||
+ {
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_text_view_reset_im_context (text_view);
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &insert,
|
||||
@@ -7173,6 +7176,9 @@ gtk_text_view_delete_from_cursor (GtkTextView *text_view,
|
||||
{
|
||||
gtk_widget_error_bell (GTK_WIDGET (text_view));
|
||||
}
|
||||
+
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_text_view_reset_im_context (text_view);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -7183,12 +7189,14 @@ gtk_text_view_backspace (GtkTextView *text_view)
|
||||
|
||||
priv = text_view->priv;
|
||||
|
||||
- gtk_text_view_reset_im_context (text_view);
|
||||
-
|
||||
/* Backspace deletes the selection, if one exists */
|
||||
if (gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE,
|
||||
priv->editable))
|
||||
- return;
|
||||
+ {
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_text_view_reset_im_context (text_view);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
|
||||
&insert,
|
||||
@@ -7201,6 +7209,9 @@ gtk_text_view_backspace (GtkTextView *text_view)
|
||||
DV(g_print (G_STRLOC": scrolling onscreen\n"));
|
||||
gtk_text_view_scroll_mark_onscreen (text_view,
|
||||
gtk_text_buffer_get_insert (get_buffer (text_view)));
|
||||
+
|
||||
+ priv->need_im_reset = TRUE;
|
||||
+ gtk_text_view_reset_im_context (text_view);
|
||||
}
|
||||
else
|
||||
{
|
||||
57
debian/patches/libgail-util-Split-out-sources-listings.patch
vendored
Normal file
57
debian/patches/libgail-util-Split-out-sources-listings.patch
vendored
Normal file
@ -0,0 +1,57 @@
|
||||
From: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Mon, 16 May 2022 12:06:00 +0800
|
||||
Subject: libgail-util: Split out sources listings
|
||||
|
||||
We want to share the listings with other non-autotools build systems.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:ea3b599d7fe1135ad9c9b32d11b73a6c73b3b848
|
||||
---
|
||||
libgail-util/Makefile.am | 10 +---------
|
||||
libgail-util/libgail-util-sources.inc | 10 ++++++++++
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
create mode 100644 libgail-util/libgail-util-sources.inc
|
||||
|
||||
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
|
||||
index cfeb366..aa2f93a 100644
|
||||
--- a/libgail-util/Makefile.am
|
||||
+++ b/libgail-util/Makefile.am
|
||||
@@ -1,4 +1,5 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
+include libgail-util-sources.inc
|
||||
|
||||
EXTRA_DIST += \
|
||||
gailutil.def \
|
||||
@@ -35,17 +36,8 @@ endif
|
||||
|
||||
lib_LTLIBRARIES = libgailutil-3.la
|
||||
|
||||
-util_c_sources = \
|
||||
- gailmisc.c \
|
||||
- gailtextutil.c
|
||||
-
|
||||
libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
|
||||
|
||||
-util_public_h_sources = \
|
||||
- gailmisc.h \
|
||||
- gailtextutil.h \
|
||||
- gail-util.h
|
||||
-
|
||||
libgailutil_3_la_SOURCES = \
|
||||
$(util_c_sources)
|
||||
|
||||
diff --git a/libgail-util/libgail-util-sources.inc b/libgail-util/libgail-util-sources.inc
|
||||
new file mode 100644
|
||||
index 0000000..4f71e1a
|
||||
--- /dev/null
|
||||
+++ b/libgail-util/libgail-util-sources.inc
|
||||
@@ -0,0 +1,10 @@
|
||||
+# Source listings for libgail-util
|
||||
+
|
||||
+util_c_sources = \
|
||||
+ gailmisc.c \
|
||||
+ gailtextutil.c
|
||||
+
|
||||
+util_public_h_sources = \
|
||||
+ gailmisc.h \
|
||||
+ gailtextutil.h \
|
||||
+ gail-util.h
|
||||
92
debian/patches/series
vendored
92
debian/patches/series
vendored
@ -1,7 +1,93 @@
|
||||
wayland-cursor-Sanity-check-cursor-image-size.patch
|
||||
gdk-Don-t-distribute-the-built-sources.patch
|
||||
gtk-Don-t-distribute-the-generated-sources.patch
|
||||
demos-Don-t-dist-the-generated-GResource-sources.patch
|
||||
gtk-Makefile.am-Fix-distcheck.patch
|
||||
demos-Fix-distcheck.patch
|
||||
gdk-broadway-Split-out-sources-listing.patch
|
||||
gtk-Rename-gtk-mkenums-headers.mak-to-gtk-sources.inc.patch
|
||||
gtk-Makefile.am-Split-out-more-items.patch
|
||||
libgail-util-Split-out-sources-listings.patch
|
||||
build-Drop-gtk3-install.-vsprops-props.patch
|
||||
gdk-Rename-gdk-pub-headers.h-to-gdk-sources.inc.patch
|
||||
gdk-Move-source-listings-to-gdk-sources.inc.patch
|
||||
gtk-sources.inc-Split-base-sources-in-two-parts.patch
|
||||
gtk-Build-Prefix-deprecated-source-listings.patch
|
||||
Update-Georgian-translation.patch
|
||||
Update-Catalan-translation.patch
|
||||
Adwaita-Hide-SSD-box-shadow-border-on-maximized-windows.patch
|
||||
Fix-coordinate-space-of-rect-in-gdk_x11_window_get_frame_.patch
|
||||
wayland-screen-Don-t-force-HighContrast-icon-theme.patch
|
||||
gtkmodifierstyle.c-Release-symbolic-color-memory.patch
|
||||
Update-Persian-translation.patch
|
||||
docs-improve-doc-of-gtk_style_context_get.patch
|
||||
Fix-annotation-of-serialize-and-deserialize-function.patch
|
||||
Remove-annotation-for-GError.patch
|
||||
Update-Occitan-translation.patch
|
||||
Update-Georgian-translation-1.patch
|
||||
Add-Abkhazian-translation.patch
|
||||
Update-Occitan-translation-1.patch
|
||||
Update-Abkhazian-translation.patch
|
||||
Update-Catalan-translation-1.patch
|
||||
gdk-broadway-Makefile.am-Correct-build-variable.patch
|
||||
gdk-wayland-Drop-motion-hint-mask-from-seat-grab-event-ma.patch
|
||||
Unblock-signal-on-update_relative_to-in-Gtk.Popover.patch
|
||||
Remove-unneeded-unblock.patch
|
||||
Update-Catalan-translation-2.patch
|
||||
Further-simplification.patch
|
||||
Avoid-repeated-g_log_set_writer_func-in-tests.patch
|
||||
gdk-Don-t-distribute-generated-files-in-tarballs.patch
|
||||
gtk-Really-don-t-distribute-built-files.patch
|
||||
demos-examples-tests-Don-t-distribute-built-files.patch
|
||||
Update-Abkhazian-translation-1.patch
|
||||
Fixes-to-Catalan-translation.patch
|
||||
Update-Croatian-translation.patch
|
||||
Update-Polish-translation.patch
|
||||
x11-Add-a-precondition.patch
|
||||
Update-Chinese-Taiwan-translation.patch
|
||||
Update-Catalan-translation-3.patch
|
||||
Fix-a-critical-in-GtkFontChooserWidget.patch
|
||||
Update-Hungarian-translation.patch
|
||||
Recognize-stylus-devices-as-GDK_SOURCE_PEN.patch
|
||||
Update-Turkish-translation.patch
|
||||
Update-Turkish-translation-1.patch
|
||||
gdk-wayland-Update-selection-s-offer-before-updating-dnd-.patch
|
||||
gdk_wayland_display_init_gl-use-GLES-API-if-required.patch
|
||||
Update-Croatian-translation-1.patch
|
||||
Update-Croatian-translation-2.patch
|
||||
Update-Abkhazian-translation-2.patch
|
||||
wayland-Add-support-for-gtk_surface1_titlebar_gesture.patch
|
||||
Update-Georgian-translation-2.patch
|
||||
Update-Croatian-translation-3.patch
|
||||
wayland-Translate-STRING-UTF8_STRING-selection-atoms-to-m.patch
|
||||
Update-Friulian-translation.patch
|
||||
gdk-Ensure-GdkFrameClock-flush-events-with-uncompressed-m.patch
|
||||
gtkimcontextwayland-Refactor-handling-of-client-updates.patch
|
||||
gtktextview-Shuffle-the-places-doing-IM-reset.patch
|
||||
gtkentry-Shuffle-the-places-doing-IM-reset.patch
|
||||
gtkentry-Avoid-early-IM-reset-on-updates.patch
|
||||
gtkentry-Avoid-early-IM-reset-on-updates-1.patch
|
||||
gtkentry-Also-reset-IM-context-after-IM-surrounding-text-.patch
|
||||
gtktextview-Also-reset-IM-context-after-IM-surrounding-te.patch
|
||||
gtkimcontextwayland-Shuffle-full-resets-after-IM-changes.patch
|
||||
Update-Bulgarian-translation.patch
|
||||
Fix-hotspot-positioning-with-scaled-surface.patch
|
||||
gdk-wayland-Support-the-xdg-activation-wayland-protocol.patch
|
||||
wayland-xdg-activation-Don-t-assume-there-s-a-focus-surfa.patch
|
||||
wayland-Keep-startup_notification_id-around-long-enough.patch
|
||||
wayland-Use-xdg-activation-for-non-startup-initiated-focu.patch
|
||||
gdk-wayland-Dispatch-GdkAppLaunchContext-activation-token.patch
|
||||
gdk-wayland-Check-the-GdkSurface-wl_surface-before-using-.patch
|
||||
gdk-wayland-Enable-xdg-activation-only-if-wayland-protoco.patch
|
||||
GtkTooltip-Scale-the-cursor-size-on-X11.patch
|
||||
Differentiate-keypad-keysyms-in-accelerators.patch
|
||||
Update-Slovenian-translation.patch
|
||||
Update-Ukrainian-translation.patch
|
||||
Update-Portuguese-translation.patch
|
||||
Update-Hungarian-translation-1.patch
|
||||
Update-Polish-translation-1.patch
|
||||
Update-Abkhazian-translation-3.patch
|
||||
Update-Russian-translation.patch
|
||||
Update-Dutch-translation.patch
|
||||
Update-Indonesian-translation.patch
|
||||
Update-Norwegian-Bokm-l-translation.patch
|
||||
016_no_offscreen_widgets_grabbing.patch
|
||||
017_no_offscreen_device_grabbing.patch
|
||||
060_ignore-random-icons.patch
|
||||
|
||||
300
debian/patches/wayland-Add-support-for-gtk_surface1_titlebar_gesture.patch
vendored
Normal file
300
debian/patches/wayland-Add-support-for-gtk_surface1_titlebar_gesture.patch
vendored
Normal file
@ -0,0 +1,300 @@
|
||||
From: =?utf-8?q?Jonas_=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Fri, 30 Sep 2022 22:38:03 +0200
|
||||
Subject: wayland: Add support for gtk_surface1_titlebar_gesture()
|
||||
|
||||
This adds a private GDK API that GTK calls using GDK_PRIVATE_CALL(). It
|
||||
is more or less a copy of the GdkSurface::titlebar_gesture() API, and
|
||||
achieves the same. If the backend or compositor doesn't support titlebar
|
||||
gestures, the existing path is used as a fallback.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:45ba6e9329798f9d24c9220d0583c1d01c2f8562
|
||||
---
|
||||
gdk/gdk-private.c | 3 +-
|
||||
gdk/gdk-private.h | 3 ++
|
||||
gdk/gdkinternals.h | 3 ++
|
||||
gdk/gdkwindow.c | 17 +++++++++++
|
||||
gdk/gdkwindowimpl.h | 10 +++++++
|
||||
gdk/wayland/gdkdisplay-wayland.c | 2 +-
|
||||
gdk/wayland/gdkwindow-wayland.c | 60 ++++++++++++++++++++++++++++++++++++++
|
||||
gdk/wayland/protocol/gtk-shell.xml | 21 +++++++++++--
|
||||
gtk/gtkwindow.c | 25 ++++++++++++++++
|
||||
9 files changed, 140 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk/gdk-private.c b/gdk/gdk-private.c
|
||||
index 750edcd..0a74381 100644
|
||||
--- a/gdk/gdk-private.c
|
||||
+++ b/gdk/gdk-private.c
|
||||
@@ -22,7 +22,8 @@ gdk__private__ (void)
|
||||
gdk_get_desktop_autostart_id,
|
||||
gdk_profiler_is_running,
|
||||
gdk_profiler_start,
|
||||
- gdk_profiler_stop
|
||||
+ gdk_profiler_stop,
|
||||
+ gdk_window_titlebar_gesture,
|
||||
};
|
||||
|
||||
return &table;
|
||||
diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
|
||||
index c71abe4..4b61637 100644
|
||||
--- a/gdk/gdk-private.h
|
||||
+++ b/gdk/gdk-private.h
|
||||
@@ -66,6 +66,9 @@ typedef struct {
|
||||
gboolean (* gdk_profiler_is_running) (void);
|
||||
void (* gdk_profiler_start) (int fd);
|
||||
void (* gdk_profiler_stop) (void);
|
||||
+
|
||||
+ gboolean (* gdk_window_titlebar_gesture) (GdkWindow *window,
|
||||
+ GdkTitlebarGesture gesture);
|
||||
} GdkPrivateVTable;
|
||||
|
||||
GDK_AVAILABLE_IN_ALL
|
||||
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
|
||||
index e2c1d10..468d328 100644
|
||||
--- a/gdk/gdkinternals.h
|
||||
+++ b/gdk/gdkinternals.h
|
||||
@@ -557,6 +557,9 @@ void _gdk_synthesize_crossing_events_for_geometry_change (GdkWindow *changed_win
|
||||
gboolean _gdk_window_has_impl (GdkWindow *window);
|
||||
GdkWindow * _gdk_window_get_impl_window (GdkWindow *window);
|
||||
|
||||
+gboolean gdk_window_titlebar_gesture (GdkWindow *window,
|
||||
+ GdkTitlebarGesture gesture);
|
||||
+
|
||||
/*****************************
|
||||
* offscreen window routines *
|
||||
*****************************/
|
||||
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
|
||||
index 2d0ed0f..727b0cf 100644
|
||||
--- a/gdk/gdkwindow.c
|
||||
+++ b/gdk/gdkwindow.c
|
||||
@@ -11998,3 +11998,20 @@ gdk_window_show_window_menu (GdkWindow *window,
|
||||
else
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+gboolean
|
||||
+gdk_window_titlebar_gesture (GdkWindow *window,
|
||||
+ GdkTitlebarGesture gesture)
|
||||
+{
|
||||
+ GdkWindowImplClass *impl_class;
|
||||
+
|
||||
+ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
+ g_return_val_if_fail (!GDK_WINDOW_DESTROYED (window), FALSE);
|
||||
+
|
||||
+ impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
|
||||
+
|
||||
+ if (impl_class->titlebar_gesture)
|
||||
+ return impl_class->titlebar_gesture (window, gesture);
|
||||
+ else
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
|
||||
index c724723..1993e12 100644
|
||||
--- a/gdk/gdkwindowimpl.h
|
||||
+++ b/gdk/gdkwindowimpl.h
|
||||
@@ -30,6 +30,13 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
+typedef enum
|
||||
+{
|
||||
+ GDK_TITLEBAR_GESTURE_DOUBLE_CLICK = 1,
|
||||
+ GDK_TITLEBAR_GESTURE_RIGHT_CLICK = 2,
|
||||
+ GDK_TITLEBAR_GESTURE_MIDDLE_CLICK = 3
|
||||
+} GdkTitlebarGesture;
|
||||
+
|
||||
#define GDK_TYPE_WINDOW_IMPL (gdk_window_impl_get_type ())
|
||||
#define GDK_WINDOW_IMPL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW_IMPL, GdkWindowImpl))
|
||||
#define GDK_WINDOW_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW_IMPL, GdkWindowImplClass))
|
||||
@@ -315,6 +322,9 @@ struct _GdkWindowImplClass
|
||||
const cairo_region_t *region);
|
||||
void (* destroy_draw_context) (GdkWindow *window,
|
||||
GdkDrawingContext *context);
|
||||
+
|
||||
+ gboolean (* titlebar_gesture) (GdkWindow *window,
|
||||
+ GdkTitlebarGesture gesture);
|
||||
};
|
||||
|
||||
/* Interface Functions */
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index 20f662d..e91490f 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
#define MIN_SYSTEM_BELL_DELAY_MS 20
|
||||
|
||||
-#define GTK_SHELL1_VERSION 4
|
||||
+#define GTK_SHELL1_VERSION 5
|
||||
|
||||
static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
|
||||
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index 1ae4a4d..30c0898 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -4795,6 +4795,65 @@ gdk_wayland_window_show_window_menu (GdkWindow *window,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+translate_gesture (GdkTitlebarGesture gesture,
|
||||
+ enum gtk_surface1_gesture *out_gesture)
|
||||
+{
|
||||
+ switch (gesture)
|
||||
+ {
|
||||
+ case GDK_TITLEBAR_GESTURE_DOUBLE_CLICK:
|
||||
+ *out_gesture = GTK_SURFACE1_GESTURE_DOUBLE_CLICK;
|
||||
+ break;
|
||||
+
|
||||
+ case GDK_TITLEBAR_GESTURE_RIGHT_CLICK:
|
||||
+ *out_gesture = GTK_SURFACE1_GESTURE_RIGHT_CLICK;
|
||||
+ break;
|
||||
+
|
||||
+ case GDK_TITLEBAR_GESTURE_MIDDLE_CLICK:
|
||||
+ *out_gesture = GTK_SURFACE1_GESTURE_MIDDLE_CLICK;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ g_warning ("Not handling unknown titlebar gesture %u", gesture);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+static gboolean
|
||||
+gdk_wayland_window_titlebar_gesture (GdkWindow *window,
|
||||
+ GdkTitlebarGesture gesture)
|
||||
+{
|
||||
+ GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
|
||||
+ struct gtk_surface1 *gtk_surface = impl->display_server.gtk_surface;
|
||||
+ enum gtk_surface1_gesture gtk_gesture;
|
||||
+ GdkSeat *seat;
|
||||
+ struct wl_seat *wl_seat;
|
||||
+ uint32_t serial;
|
||||
+
|
||||
+ if (!gtk_surface)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ if (gtk_surface1_get_version (gtk_surface) < GTK_SURFACE1_TITLEBAR_GESTURE_SINCE_VERSION)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ if (!translate_gesture (gesture, >k_gesture))
|
||||
+ return FALSE;
|
||||
+
|
||||
+ seat = gdk_display_get_default_seat (gdk_window_get_display (window));
|
||||
+ wl_seat = gdk_wayland_seat_get_wl_seat (seat);
|
||||
+
|
||||
+ serial = _gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL);
|
||||
+
|
||||
+ gtk_surface1_titlebar_gesture (impl->display_server.gtk_surface,
|
||||
+ serial,
|
||||
+ wl_seat,
|
||||
+ gtk_gesture);
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
_gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
|
||||
{
|
||||
@@ -4886,6 +4945,7 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
|
||||
impl_class->show_window_menu = gdk_wayland_window_show_window_menu;
|
||||
impl_class->create_gl_context = gdk_wayland_window_create_gl_context;
|
||||
impl_class->invalidate_for_new_frame = gdk_wayland_window_invalidate_for_new_frame;
|
||||
+ impl_class->titlebar_gesture = gdk_wayland_window_titlebar_gesture;
|
||||
|
||||
signals[COMMITTED] = g_signal_new ("committed",
|
||||
G_TYPE_FROM_CLASS (object_class),
|
||||
diff --git a/gdk/wayland/protocol/gtk-shell.xml b/gdk/wayland/protocol/gtk-shell.xml
|
||||
index 1aab593..a8d51c6 100644
|
||||
--- a/gdk/wayland/protocol/gtk-shell.xml
|
||||
+++ b/gdk/wayland/protocol/gtk-shell.xml
|
||||
@@ -1,6 +1,6 @@
|
||||
<protocol name="gtk">
|
||||
|
||||
- <interface name="gtk_shell1" version="4">
|
||||
+ <interface name="gtk_shell1" version="5">
|
||||
<description summary="gtk specific extensions">
|
||||
gtk_shell is a protocol extension providing additional features for
|
||||
clients implementing it.
|
||||
@@ -35,7 +35,7 @@
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
- <interface name="gtk_surface1" version="4">
|
||||
+ <interface name="gtk_surface1" version="5">
|
||||
<request name="set_dbus_properties">
|
||||
<arg name="application_id" type="string" allow-null="true"/>
|
||||
<arg name="app_menu_path" type="string" allow-null="true"/>
|
||||
@@ -85,6 +85,23 @@
|
||||
|
||||
<!-- Version 4 additions -->
|
||||
<request name="release" type="destructor" since="4"/>
|
||||
+
|
||||
+ <!-- Version 5 additions -->
|
||||
+ <enum name="gesture" since="5">
|
||||
+ <entry name="double_click" value="1"/>
|
||||
+ <entry name="right_click" value="2"/>
|
||||
+ <entry name="middle_click" value="3"/>
|
||||
+ </enum>
|
||||
+
|
||||
+ <enum name="error" since="5">
|
||||
+ <entry name="invalid_gesture" value="0"/>
|
||||
+ </enum>
|
||||
+
|
||||
+ <request name="titlebar_gesture" since="5">
|
||||
+ <arg name="serial" type="uint"/>
|
||||
+ <arg name="seat" type="object" interface="wl_seat"/>
|
||||
+ <arg name="gesture" type="uint" enum="gesture"/>
|
||||
+ </request>
|
||||
</interface>
|
||||
|
||||
</protocol>
|
||||
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
|
||||
index 8df1c8e..5478e89 100644
|
||||
--- a/gtk/gtkwindow.c
|
||||
+++ b/gtk/gtkwindow.c
|
||||
@@ -1383,10 +1383,34 @@ gtk_window_titlebar_action (GtkWindow *window,
|
||||
guint button,
|
||||
gint n_press)
|
||||
{
|
||||
+ GdkTitlebarGesture gesture = 0;
|
||||
+ GdkWindow *gdk_window;
|
||||
GtkSettings *settings;
|
||||
gchar *action = NULL;
|
||||
gboolean retval = TRUE;
|
||||
|
||||
+ switch (button)
|
||||
+ {
|
||||
+ case GDK_BUTTON_PRIMARY:
|
||||
+ if (n_press == 2)
|
||||
+ gesture = GDK_TITLEBAR_GESTURE_DOUBLE_CLICK;
|
||||
+ break;
|
||||
+ case GDK_BUTTON_MIDDLE:
|
||||
+ gesture = GDK_TITLEBAR_GESTURE_MIDDLE_CLICK;
|
||||
+ break;
|
||||
+ case GDK_BUTTON_SECONDARY:
|
||||
+ gesture = GDK_TITLEBAR_GESTURE_RIGHT_CLICK;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ gdk_window = _gtk_widget_get_window (GTK_WIDGET (window));
|
||||
+ if (gesture &&
|
||||
+ GDK_PRIVATE_CALL (gdk_window_titlebar_gesture (gdk_window, gesture)))
|
||||
+ {
|
||||
+ retval = TRUE;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
settings = gtk_widget_get_settings (GTK_WIDGET (window));
|
||||
switch (button)
|
||||
{
|
||||
@@ -1432,6 +1456,7 @@ gtk_window_titlebar_action (GtkWindow *window,
|
||||
|
||||
g_free (action);
|
||||
|
||||
+out:
|
||||
return retval;
|
||||
}
|
||||
|
||||
42
debian/patches/wayland-Keep-startup_notification_id-around-long-enough.patch
vendored
Normal file
42
debian/patches/wayland-Keep-startup_notification_id-around-long-enough.patch
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Wed, 25 Aug 2021 12:21:48 +0200
|
||||
Subject: wayland: Keep startup_notification_id around long enough
|
||||
|
||||
When using xdg_activation we need to keep the id around until we send
|
||||
the first activate to signal succesful startup.
|
||||
|
||||
Backport-of: 999509be619bfa0f50a549489b5ab5c890b574fa
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Origin: upstream, 3.24.35, commit:e80251e751f5fedb64ab262c45df39e945ddfe40
|
||||
---
|
||||
gdk/wayland/gdkdisplay-wayland.c | 4 ++++
|
||||
gdk/wayland/gdkwindow-wayland.c | 1 +
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index 7de55f7..e473996 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -945,6 +945,10 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
|
||||
{
|
||||
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
|
||||
|
||||
+ /* Will be signaled with focus activation */
|
||||
+ if (display_wayland->xdg_activation)
|
||||
+ return;
|
||||
+
|
||||
if (startup_id == NULL)
|
||||
{
|
||||
startup_id = display_wayland->startup_notification_id;
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index ed49dd6..53790e0 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -3832,6 +3832,7 @@ gdk_wayland_window_focus (GdkWindow *window,
|
||||
xdg_activation_v1_activate (display_wayland->xdg_activation,
|
||||
display_wayland->startup_notification_id,
|
||||
impl->display_server.wl_surface);
|
||||
+ gdk_wayland_display_set_startup_notification_id (GDK_DISPLAY (display_wayland), NULL);
|
||||
}
|
||||
else if (display_wayland->gtk_shell_version >= 3)
|
||||
{
|
||||
60
debian/patches/wayland-Translate-STRING-UTF8_STRING-selection-atoms-to-m.patch
vendored
Normal file
60
debian/patches/wayland-Translate-STRING-UTF8_STRING-selection-atoms-to-m.patch
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Mon, 3 Oct 2022 10:35:48 +0200
|
||||
Subject: wayland: Translate STRING/UTF8_STRING selection atoms to mimetypes
|
||||
|
||||
Since the GDK API layer in 3.x is considerably tied to X11 details,
|
||||
it makes sense to provide this bit of translation in case the app
|
||||
uses these exclusively and does not use actual mimetype strings.
|
||||
Provide this bit of translation of X11 selection atoms to mimetypes.
|
||||
|
||||
While at it, use the right zwp_primary_selection_source_v1 API with
|
||||
primary selection data sources. From the looks of it, this just
|
||||
happened to work.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5217
|
||||
Origin: upstream, 3.24.35, commit:0c1ea9221976b838101d2593754b658808fdc542
|
||||
---
|
||||
gdk/wayland/gdkselection-wayland.c | 23 ++++++++++++++++++++++-
|
||||
1 file changed, 22 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
|
||||
index d7f3332..6fbdb5e 100644
|
||||
--- a/gdk/wayland/gdkselection-wayland.c
|
||||
+++ b/gdk/wayland/gdkselection-wayland.c
|
||||
@@ -34,6 +34,9 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
+#define STRING_MIMETYPE "text/plain"
|
||||
+#define UTF8_STRING_MIMETYPE "text/plain;charset=utf-8"
|
||||
+
|
||||
typedef struct _SelectionBuffer SelectionBuffer;
|
||||
typedef struct _SelectionData SelectionData;
|
||||
typedef struct _StoredSelection StoredSelection;
|
||||
@@ -1783,7 +1786,25 @@ gdk_wayland_selection_add_targets (GdkWindow *window,
|
||||
{
|
||||
gchar *mimetype = gdk_atom_name (targets[i]);
|
||||
|
||||
- wl_data_source_offer (data_source, mimetype);
|
||||
+ if (selection == atoms[ATOM_PRIMARY])
|
||||
+ {
|
||||
+ if (g_strcmp0 (mimetype, "STRING") == 0)
|
||||
+ zwp_primary_selection_source_v1_offer (data_source, STRING_MIMETYPE);
|
||||
+ else if (g_strcmp0 (mimetype, "UTF8_STRING") == 0)
|
||||
+ zwp_primary_selection_source_v1_offer (data_source, UTF8_STRING_MIMETYPE);
|
||||
+
|
||||
+ zwp_primary_selection_source_v1_offer (data_source, mimetype);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (g_strcmp0 (mimetype, "STRING") == 0)
|
||||
+ wl_data_source_offer (data_source, STRING_MIMETYPE);
|
||||
+ else if (g_strcmp0 (mimetype, "UTF8_STRING") == 0)
|
||||
+ wl_data_source_offer (data_source, UTF8_STRING_MIMETYPE);
|
||||
+
|
||||
+ wl_data_source_offer (data_source, mimetype);
|
||||
+ }
|
||||
+
|
||||
g_free (mimetype);
|
||||
}
|
||||
|
||||
135
debian/patches/wayland-Use-xdg-activation-for-non-startup-initiated-focu.patch
vendored
Normal file
135
debian/patches/wayland-Use-xdg-activation-for-non-startup-initiated-focu.patch
vendored
Normal file
@ -0,0 +1,135 @@
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Mon, 28 Feb 2022 18:31:40 +0100
|
||||
Subject: wayland: Use xdg-activation for non-startup initiated focus requests
|
||||
|
||||
Currently, we have all the plumbing in place so that GTK consumes the
|
||||
startup notification ID when focusing a window through the xdg-activation
|
||||
protocol.
|
||||
|
||||
This however misses the case that a window might be requested to be
|
||||
focused with no startup ID (i.e. via interaction with the application,
|
||||
not through GApplication or other application launching logic).
|
||||
|
||||
In this case, we let the application create a token that will be
|
||||
consumed by itself. The serial used is that from the last
|
||||
interaction, so the compositor will still be able to do focus prevention
|
||||
logic if it applies.
|
||||
|
||||
Since we already do have a last serial at hand, prefer xdg-activation
|
||||
all the way over the now stale gtk-shell focusing support. The timestamp
|
||||
argument becomes unused, but that is a weak argument to prefer the
|
||||
private protocol over the standard one. The gtk-shell protocol support
|
||||
is so far left for interaction with older Mutter.
|
||||
|
||||
Backport-of: 4dcacff3120d5c1cef888061dbc42f5fbe093a58
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Origin: upstream, 3.24.35, commit:45f0b5d052eced18f978707b8aed7a8cbe367557
|
||||
---
|
||||
gdk/wayland/gdkwindow-wayland.c | 81 ++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 60 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index 53790e0..e3f97cf 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -3811,40 +3811,79 @@ gdk_wayland_window_get_input_shape (GdkWindow *window)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+static void
|
||||
+token_done (gpointer data,
|
||||
+ struct xdg_activation_token_v1 *provider,
|
||||
+ const char *token)
|
||||
+{
|
||||
+ char **token_out = data;
|
||||
+
|
||||
+ *token_out = g_strdup (token);
|
||||
+}
|
||||
+
|
||||
+static const struct xdg_activation_token_v1_listener token_listener = {
|
||||
+ token_done,
|
||||
+};
|
||||
+
|
||||
static void
|
||||
gdk_wayland_window_focus (GdkWindow *window,
|
||||
guint32 timestamp)
|
||||
{
|
||||
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
|
||||
+ GdkDisplay *display = gdk_window_get_display (window);
|
||||
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
|
||||
+ gchar *startup_id = NULL;
|
||||
|
||||
- if (!impl->display_server.gtk_surface)
|
||||
- return;
|
||||
+ startup_id = g_steal_pointer (&display_wayland->startup_notification_id);
|
||||
|
||||
- if (timestamp == GDK_CURRENT_TIME)
|
||||
+ if (display_wayland->xdg_activation)
|
||||
{
|
||||
- GdkWaylandDisplay *display_wayland =
|
||||
- GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
|
||||
+ GdkSeat *seat = gdk_display_get_default_seat (display);
|
||||
|
||||
- if (display_wayland->startup_notification_id)
|
||||
+ /* If the focus request does not have a startup ID associated, get a
|
||||
+ * new token to activate the window.
|
||||
+ */
|
||||
+ if (!startup_id)
|
||||
{
|
||||
- if (display_wayland->xdg_activation)
|
||||
- {
|
||||
- xdg_activation_v1_activate (display_wayland->xdg_activation,
|
||||
- display_wayland->startup_notification_id,
|
||||
- impl->display_server.wl_surface);
|
||||
- gdk_wayland_display_set_startup_notification_id (GDK_DISPLAY (display_wayland), NULL);
|
||||
- }
|
||||
- else if (display_wayland->gtk_shell_version >= 3)
|
||||
- {
|
||||
- gtk_surface1_request_focus (impl->display_server.gtk_surface,
|
||||
- display_wayland->startup_notification_id);
|
||||
- }
|
||||
+ struct xdg_activation_token_v1 *token;
|
||||
+ struct wl_event_queue *event_queue;
|
||||
+
|
||||
+ event_queue = wl_display_create_queue (display_wayland->wl_display);
|
||||
+
|
||||
+ token = xdg_activation_v1_get_activation_token (display_wayland->xdg_activation);
|
||||
+ wl_proxy_set_queue ((struct wl_proxy *) token, event_queue);
|
||||
+
|
||||
+ xdg_activation_token_v1_add_listener (token,
|
||||
+ &token_listener,
|
||||
+ &startup_id);
|
||||
+ xdg_activation_token_v1_set_serial (token,
|
||||
+ _gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL),
|
||||
+ gdk_wayland_seat_get_wl_seat (seat));
|
||||
+ xdg_activation_token_v1_set_surface (token,
|
||||
+ gdk_wayland_window_get_wl_surface (window));
|
||||
+ xdg_activation_token_v1_commit (token);
|
||||
+
|
||||
+ while (startup_id == NULL)
|
||||
+ wl_display_dispatch_queue (display_wayland->wl_display, event_queue);
|
||||
|
||||
- g_clear_pointer (&display_wayland->startup_notification_id, g_free);
|
||||
+ xdg_activation_token_v1_destroy (token);
|
||||
+ wl_event_queue_destroy (event_queue);
|
||||
}
|
||||
+
|
||||
+ xdg_activation_v1_activate (display_wayland->xdg_activation,
|
||||
+ startup_id,
|
||||
+ impl->display_server.wl_surface);
|
||||
}
|
||||
- else
|
||||
- gtk_surface1_present (impl->display_server.gtk_surface, timestamp);
|
||||
+ else if (impl->display_server.gtk_surface)
|
||||
+ {
|
||||
+ if (timestamp != GDK_CURRENT_TIME)
|
||||
+ gtk_surface1_present (impl->display_server.gtk_surface, timestamp);
|
||||
+ else if (startup_id && display_wayland->gtk_shell_version >= 3)
|
||||
+ gtk_surface1_request_focus (impl->display_server.gtk_surface,
|
||||
+ startup_id);
|
||||
+ }
|
||||
+
|
||||
+ g_free (startup_id);
|
||||
}
|
||||
|
||||
static void
|
||||
58
debian/patches/wayland-cursor-Sanity-check-cursor-image-size.patch
vendored
Normal file
58
debian/patches/wayland-cursor-Sanity-check-cursor-image-size.patch
vendored
Normal file
@ -0,0 +1,58 @@
|
||||
From: Robert Mader <robert.mader@posteo.de>
|
||||
Date: Fri, 14 Jan 2022 20:28:52 +0100
|
||||
Subject: wayland/cursor: Sanity check cursor image size
|
||||
|
||||
On Wayland it is a protocol violation to upload buffers with
|
||||
dimensions that are not an integer multiple of the buffer scale.
|
||||
|
||||
Until recently, Mutter did not enforce this. When it started
|
||||
doing so, some users started seeing crashes in GTK apps because the
|
||||
cursor theme ended up with e.g. a 15x16 pixel image at scale of 2.
|
||||
|
||||
Add a small sanity check for this case.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:da4066774b926880631af099469d308714b5606c
|
||||
---
|
||||
gdk/wayland/gdkcursor-wayland.c | 21 ++++++++++++++++-----
|
||||
1 file changed, 16 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
|
||||
index a976c48..f5aa468 100644
|
||||
--- a/gdk/wayland/gdkcursor-wayland.c
|
||||
+++ b/gdk/wayland/gdkcursor-wayland.c
|
||||
@@ -223,6 +223,7 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
|
||||
if (wayland_cursor->wl_cursor)
|
||||
{
|
||||
struct wl_cursor_image *image;
|
||||
+ int cursor_scale;
|
||||
|
||||
if (image_index >= wayland_cursor->wl_cursor->image_count)
|
||||
{
|
||||
@@ -234,12 +235,22 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
|
||||
|
||||
image = wayland_cursor->wl_cursor->images[image_index];
|
||||
|
||||
- *hotspot_x = image->hotspot_x / wayland_cursor->scale;
|
||||
- *hotspot_y = image->hotspot_y / wayland_cursor->scale;
|
||||
+ cursor_scale = wayland_cursor->scale;
|
||||
+ if ((image->width % cursor_scale != 0) ||
|
||||
+ (image->height % cursor_scale != 0))
|
||||
+ {
|
||||
+ g_warning (G_STRLOC " cursor image size (%dx%d) not an integer"
|
||||
+ "multiple of scale (%d)", image->width, image->height,
|
||||
+ cursor_scale);
|
||||
+ cursor_scale = 1;
|
||||
+ }
|
||||
+
|
||||
+ *hotspot_x = image->hotspot_x / cursor_scale;
|
||||
+ *hotspot_y = image->hotspot_y / cursor_scale;
|
||||
|
||||
- *w = image->width / wayland_cursor->scale;
|
||||
- *h = image->height / wayland_cursor->scale;
|
||||
- *scale = wayland_cursor->scale;
|
||||
+ *w = image->width / cursor_scale;
|
||||
+ *h = image->height / cursor_scale;
|
||||
+ *scale = cursor_scale;
|
||||
|
||||
return wl_cursor_image_get_buffer (image);
|
||||
}
|
||||
26
debian/patches/wayland-screen-Don-t-force-HighContrast-icon-theme.patch
vendored
Normal file
26
debian/patches/wayland-screen-Don-t-force-HighContrast-icon-theme.patch
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Tue, 7 Jun 2022 19:37:31 +0200
|
||||
Subject: wayland/screen: Don't force HighContrast icon theme
|
||||
|
||||
The theme is considered deprecated in favor of symbolic icons from
|
||||
the regular theme.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:b19269c9c1b6dad0b1924f4ec57684ce849305bb
|
||||
---
|
||||
gdk/wayland/gdkscreen-wayland.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
|
||||
index 90c12d8..43ab210 100644
|
||||
--- a/gdk/wayland/gdkscreen-wayland.c
|
||||
+++ b/gdk/wayland/gdkscreen-wayland.c
|
||||
@@ -1068,8 +1068,7 @@ gdk_wayland_screen_get_setting (GdkScreen *screen,
|
||||
{
|
||||
if (strcmp (name, "gtk-decoration-layout") == 0)
|
||||
set_decoration_layout_from_entry (screen, entry, value);
|
||||
- else if (strcmp (name, "gtk-theme-name") == 0 ||
|
||||
- strcmp (name, "gtk-icon-theme-name") == 0)
|
||||
+ else if (strcmp (name, "gtk-theme-name") == 0)
|
||||
set_theme_from_entry (screen, entry, value);
|
||||
else
|
||||
set_value_from_entry (screen, entry, value);
|
||||
39
debian/patches/wayland-xdg-activation-Don-t-assume-there-s-a-focus-surfa.patch
vendored
Normal file
39
debian/patches/wayland-xdg-activation-Don-t-assume-there-s-a-focus-surfa.patch
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Tue, 11 Jan 2022 20:21:55 +0100
|
||||
Subject: wayland: xdg-activation: Don't assume there's a focus surface
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Tools like gtk4-launch can't set surface on the activation token so
|
||||
don't require it. If the compositor requires it we can't do anything
|
||||
about it anyway. This avoids a critical:
|
||||
|
||||
(gtk4-launch:23497): Gdk-CRITICAL **: 17:07:24.704: gdk_wayland_surface_get_wl_surface: assertion 'GDK_IS_WAYLAND_SURFACE (surface)' failed
|
||||
|
||||
Fixes: be4216e051 ("gdk/wayland: Support the xdg-activation wayland protocol")
|
||||
|
||||
Signed-off-by: Guido Günther <agx@sigxcpu.org>
|
||||
Backport-of: 4d741bac98f906796d61eebfb4f74f5b1cecb2b6
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Origin: upstream, 3.24.35, commit:54348c52701e5535949e4f7212fa48024aa588c1
|
||||
---
|
||||
gdk/wayland/gdkapplaunchcontext-wayland.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
index 004a390..03f0058 100644
|
||||
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
|
||||
@@ -75,8 +75,9 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
xdg_activation_token_v1_set_serial (token,
|
||||
_gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL),
|
||||
gdk_wayland_seat_get_wl_seat (seat));
|
||||
- xdg_activation_token_v1_set_surface (token,
|
||||
- gdk_wayland_window_get_wl_surface (focus_window));
|
||||
+ if (focus_window)
|
||||
+ xdg_activation_token_v1_set_surface (token,
|
||||
+ gdk_wayland_window_get_wl_surface (focus_window));
|
||||
xdg_activation_token_v1_commit (token);
|
||||
|
||||
while (app_launch_data.token == NULL)
|
||||
24
debian/patches/x11-Add-a-precondition.patch
vendored
Normal file
24
debian/patches/x11-Add-a-precondition.patch
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 9 Sep 2022 14:50:08 -0400
|
||||
Subject: x11: Add a precondition
|
||||
|
||||
Trying to be helpful.
|
||||
|
||||
Origin: upstream, 3.24.35, commit:9baae419f6eb6089dc4d03edbb26b814d937543d
|
||||
---
|
||||
gdk/x11/gdkwindow-x11.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
|
||||
index eb822e0..194bc82 100644
|
||||
--- a/gdk/x11/gdkwindow-x11.c
|
||||
+++ b/gdk/x11/gdkwindow-x11.c
|
||||
@@ -5641,6 +5641,8 @@ gdk_x11_get_server_time (GdkWindow *window)
|
||||
XID
|
||||
gdk_x11_window_get_xid (GdkWindow *window)
|
||||
{
|
||||
+ g_return_val_if_fail (GDK_IS_X11_WINDOW (window), None);
|
||||
+
|
||||
/* Try to ensure the window has a native window */
|
||||
if (!_gdk_window_has_impl (window))
|
||||
{
|
||||
Reference in New Issue
Block a user