diff options
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 207 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 16 | ||||
| -rw-r--r-- | gtk/gtkcolorchooserwidget.c | 80 | ||||
| -rw-r--r-- | modules/printbackends/lpr/gtkprintbackendlpr.c | 10 | ||||
| -rw-r--r-- | po/uk.po | 373 |
5 files changed, 328 insertions, 358 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 327d288bc7..72339f736e 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1863,202 +1863,6 @@ generate_button_event (GdkEventType type, _gdk_win32_append_event (event); } -/* - * Used by the stacking functions to see if a window - * should be always on top. - * Restacking is only done if both windows are either ontop - * or not ontop. - */ -static gboolean -should_window_be_always_on_top (GdkWindow *window) -{ - DWORD exstyle; - - if ((GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP) || - (window->state & GDK_WINDOW_STATE_ABOVE)) - return TRUE; - - exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE); - - if (exstyle & WS_EX_TOPMOST) - return TRUE; - - return FALSE; -} - -static void -ensure_stacking_on_unminimize (MSG *msg) -{ - HWND rover; - HWND lowest_transient = NULL; - GdkWindow *msg_window; - gboolean window_ontop = FALSE; - - msg_window = gdk_win32_handle_table_lookup (msg->hwnd); - - if (msg_window) - window_ontop = should_window_be_always_on_top (msg_window); - - for (rover = GetNextWindow (msg->hwnd, GW_HWNDNEXT); - rover; - rover = GetNextWindow (rover, GW_HWNDNEXT)) - { - GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover); - GdkWindowImplWin32 *rover_impl; - gboolean rover_ontop; - - /* Checking window group not implemented yet */ - if (rover_gdkw == NULL) - continue; - - rover_ontop = should_window_be_always_on_top (rover_gdkw); - rover_impl = GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl); - - if (GDK_WINDOW_IS_MAPPED (rover_gdkw) && - (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY || - rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG || - rover_impl->transient_owner != NULL) && - ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop))) - { - lowest_transient = rover; - } - } - - if (lowest_transient != NULL) - { - GDK_NOTE (EVENTS, - g_print (" restacking %p above %p", - msg->hwnd, lowest_transient)); - SetWindowPos (msg->hwnd, lowest_transient, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); - } -} - -static gboolean -ensure_stacking_on_window_pos_changing (MSG *msg, - GdkWindow *window) -{ - GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl); - WINDOWPOS *windowpos = (WINDOWPOS *) msg->lParam; - HWND rover; - gboolean restacking; - gboolean window_ontop; - - if (GetActiveWindow () != msg->hwnd || - impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY || - impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG || - impl->transient_owner != NULL) - return FALSE; - - /* Make sure the window stays behind any transient-type windows - * of the same window group. - * - * If the window is not active and being activated, we let - * Windows bring it to the top and rely on the WM_ACTIVATEAPP - * handling to bring any utility windows on top of it. - */ - - window_ontop = should_window_be_always_on_top (window); - - for (rover = windowpos->hwndInsertAfter, restacking = FALSE; - rover; - rover = GetNextWindow (rover, GW_HWNDNEXT)) - { - GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover); - GdkWindowImplWin32 *rover_impl; - gboolean rover_ontop; - - /* Checking window group not implemented yet */ - - if (rover_gdkw == NULL) - continue; - - rover_ontop = should_window_be_always_on_top (rover_gdkw); - rover_impl = GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl); - - if (GDK_WINDOW_IS_MAPPED (rover_gdkw) && - (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY || - rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG || - rover_impl->transient_owner != NULL) && - ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop))) - { - restacking = TRUE; - windowpos->hwndInsertAfter = rover; - } - } - - if (restacking) - { - GDK_NOTE (EVENTS, - g_print (" letting Windows restack %p above %p", - msg->hwnd, windowpos->hwndInsertAfter)); - return TRUE; - } - - return FALSE; -} - -static void -ensure_stacking_on_activate_app (MSG *msg, - GdkWindow *window) -{ - GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl); - HWND rover; - gboolean window_ontop; - - if (impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY || - impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG || - impl->transient_owner != NULL) - { - SetWindowPos (msg->hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); - return; - } - - if (!IsWindowVisible (msg->hwnd) || - msg->hwnd != GetActiveWindow ()) - return; - - - /* This window is not a transient-type window and it is the - * activated window. Make sure this window is as visible as - * possible, just below the lowest transient-type window of this - * app. - */ - - window_ontop = should_window_be_always_on_top (window); - - for (rover = GetNextWindow (msg->hwnd, GW_HWNDPREV); - rover; - rover = GetNextWindow (rover, GW_HWNDPREV)) - { - GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover); - GdkWindowImplWin32 *rover_impl; - gboolean rover_ontop; - - /* Checking window group not implemented yet */ - if (rover_gdkw == NULL) - continue; - - rover_ontop = should_window_be_always_on_top (rover_gdkw); - rover_impl = GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl); - - if (GDK_WINDOW_IS_MAPPED (rover_gdkw) && - (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY || - rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG || - rover_impl->transient_owner != NULL) && - ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop))) - { - GDK_NOTE (EVENTS, - g_print (" restacking %p above %p", - msg->hwnd, rover)); - SetWindowPos (msg->hwnd, rover, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER); - break; - } - } -} - static gboolean handle_wm_sysmenu (GdkWindow *window, MSG *msg, gint *ret_valp) { @@ -3367,8 +3171,6 @@ gdk_event_translate (MSG *msg, if (GDK_WINDOW_IS_MAPPED (window)) { - return_val = ensure_stacking_on_window_pos_changing (msg, window); - impl = GDK_WINDOW_IMPL_WIN32 (window->impl); if (impl->maximizing) @@ -3458,13 +3260,6 @@ gdk_event_translate (MSG *msg, if ((old_state & GDK_WINDOW_STATE_ICONIFIED) != (new_state & GDK_WINDOW_STATE_ICONIFIED)) do_show_window (window, (new_state & GDK_WINDOW_STATE_ICONIFIED)); - - - /* When un-minimizing, make sure we're stacked under any - transient-type windows. */ - if (!(old_state & GDK_WINDOW_STATE_ICONIFIED) && - (new_state & GDK_WINDOW_STATE_ICONIFIED)) - ensure_stacking_on_unminimize (msg); } /* Show, New size or position => configure event */ @@ -3946,8 +3741,6 @@ gdk_event_translate (MSG *msg, GDK_NOTE (EVENTS, g_print (" %s thread: %" G_GINT64_FORMAT, msg->wParam ? "YES" : "NO", (gint64) msg->lParam)); - if (msg->wParam && GDK_WINDOW_IS_MAPPED (window)) - ensure_stacking_on_activate_app (msg, window); break; case WM_NCHITTEST: /* TODO: pass all messages to DwmDefWindowProc() first! */ diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 85e1daf557..27e5355cf7 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1474,7 +1474,7 @@ show_window_internal (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), (window->state & GDK_WINDOW_STATE_ABOVE)?HWND_TOPMOST:HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } } @@ -1834,7 +1834,7 @@ gdk_win32_window_raise (GdkWindow *window) else API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER)); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)); } } @@ -1851,7 +1851,7 @@ gdk_win32_window_lower (GdkWindow *window) API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER)); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE)); } } @@ -2910,7 +2910,7 @@ _gdk_win32_window_update_style_bits (GdkWindow *window) rect.right += after.right - before.right; rect.bottom += after.bottom - before.bottom; - flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOOWNERZORDER; + flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION; if (will_be_topmost && !was_topmost) { @@ -5372,7 +5372,7 @@ gdk_win32_window_fullscreen (GdkWindow *window) y - workaround_padding, width + (workaround_padding * 2), height + (workaround_padding * 2), - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); } } @@ -5396,7 +5396,7 @@ gdk_win32_window_unfullscreen (GdkWindow *window) API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_NOTOPMOST, fi->r.left, fi->r.top, fi->r.right - fi->r.left, fi->r.bottom - fi->r.top, - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL); g_free (fi); @@ -5422,7 +5422,7 @@ gdk_win32_window_set_keep_above (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), setting ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } gdk_synthesize_window_state (window, @@ -5448,7 +5448,7 @@ gdk_win32_window_set_keep_below (GdkWindow *window, API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), setting ? HWND_BOTTOM : HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } gdk_synthesize_window_state (window, diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index bf3ea15d06..9fca31de80 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -443,55 +443,51 @@ add_default_palette (GtkColorChooserWidget *cc) { "#77767b", "#5e5c64", "#3d3846", "#241f31", "#000000" } /* Dark */ }; const gchar *color_names[] = { + NC_("Color name", "Very Light Blue"), + NC_("Color name", "Light Blue"), NC_("Color name", "Blue"), - NC_("Color name", "Blue"), - NC_("Color name", "Blue"), - NC_("Color name", "Blue"), - NC_("Color name", "Blue"), - NC_("Color name", "Blue"), - NC_("Color name", "Green"), - NC_("Color name", "Green"), - NC_("Color name", "Green"), + NC_("Color name", "Dark Blue"), + NC_("Color name", "Very Dark Blue"), + NC_("Color name", "Very Light Green"), + NC_("Color name", "Light Green"), NC_("Color name", "Green"), - NC_("Color name", "Green"), - NC_("Color name", "Green"), - NC_("Color name", "Yellow"), - NC_("Color name", "Yellow"), + NC_("Color name", "Dark Green"), + NC_("Color name", "Very Dark Green"), + NC_("Color name", "Very Light Yellow"), + NC_("Color name", "Light Yellow"), NC_("Color name", "Yellow"), - NC_("Color name", "Yellow"), - NC_("Color name", "Yellow"), - NC_("Color name", "Yellow"), - NC_("Color name", "Orange"), + NC_("Color name", "Dark Yellow"), + NC_("Color name", "Very Dark Yellow"), + NC_("Color name", "Very Light Orange"), + NC_("Color name", "Light Orange"), NC_("Color name", "Orange"), - NC_("Color name", "Orange"), - NC_("Color name", "Orange"), - NC_("Color name", "Orange"), - NC_("Color name", "Orange"), - NC_("Color name", "Red"), - NC_("Color name", "Red"), - NC_("Color name", "Red"), - NC_("Color name", "Red"), + NC_("Color name", "Dark Orange"), + NC_("Color name", "Very Dark Orange"), + NC_("Color name", "Very Light Red"), + NC_("Color name", "Light Red"), NC_("Color name", "Red"), + NC_("Color name", "Dark Red"), + NC_("Color name", "Very Dark Red"), + NC_("Color name", "Very Light Purple"), + NC_("Color name", "Light Purple"), NC_("Color name", "Purple"), - NC_("Color name", "Purple"), - NC_("Color name", "Purple"), - NC_("Color name", "Purple"), - NC_("Color name", "Purple"), - NC_("Color name", "Brown"), - NC_("Color name", "Brown"), - NC_("Color name", "Brown"), - NC_("Color name", "Brown"), + NC_("Color name", "Dark Purple"), + NC_("Color name", "Very Dark Purple"), + NC_("Color name", "Very Light Brown"), + NC_("Color name", "Light Brown"), NC_("Color name", "Brown"), - NC_("Color name", "Light"), - NC_("Color name", "Light"), - NC_("Color name", "Light"), - NC_("Color name", "Light"), - NC_("Color name", "Light"), - NC_("Color name", "Dark"), - NC_("Color name", "Dark"), - NC_("Color name", "Dark"), - NC_("Color name", "Dark"), - NC_("Color name", "Dark"), + NC_("Color name", "Dark Brown"), + NC_("Color name", "Very Dark Brown"), + NC_("Color name", "White"), + NC_("Color name", "Light Gray 1"), + NC_("Color name", "Light Gray 2"), + NC_("Color name", "Light Gray 3"), + NC_("Color name", "Light Gray 4"), + NC_("Color name", "Dark Gray 1"), + NC_("Color name", "Dark Gray 2"), + NC_("Color name", "Dark Gray 3"), + NC_("Color name", "Dark Gray 4"), + NC_("Color name", "Black"), }; GdkRGBA colors[9*5]; gint i, j; diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c index 4257771dbf..e4286536ab 100644 --- a/modules/printbackends/lpr/gtkprintbackendlpr.c +++ b/modules/printbackends/lpr/gtkprintbackendlpr.c @@ -390,9 +390,13 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend) { GtkPrinter *printer; - printer = gtk_printer_new (_("Print to LPR"), - GTK_PRINT_BACKEND (backend), - TRUE); + printer = g_object_new (GTK_TYPE_PRINTER, + "name", _("Print to LPR"), + "backend", backend, + "is-virtual", FALSE, + "accepts-pdf", TRUE, + "accepts-ps", TRUE, + NULL); gtk_printer_set_has_details (printer, TRUE); gtk_printer_set_icon_name (printer, "printer"); gtk_printer_set_is_active (printer, TRUE); @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: gtk+\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-17 13:25+0000\n" -"PO-Revision-Date: 2020-09-17 16:32+0300\n" +"POT-Creation-Date: 2020-10-08 05:17+0000\n" +"PO-Revision-Date: 2020-10-08 09:17+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n" "Language: uk\n" @@ -1935,90 +1935,313 @@ msgstr "Червоний %d%%, Зелений %d%%, Синій %d%%" msgid "Color: %s" msgstr "Колір: %s" -#: gtk/gtkcolorchooserwidget.c:446 gtk/gtkcolorchooserwidget.c:447 -#: gtk/gtkcolorchooserwidget.c:448 gtk/gtkcolorchooserwidget.c:449 -#: gtk/gtkcolorchooserwidget.c:450 gtk/gtkcolorchooserwidget.c:451 -#| msgid "_Blue:" +#: gtk/gtkcolorchooserwidget.c:446 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Blue" +msgstr "Дуже світло-синій" + +#: gtk/gtkcolorchooserwidget.c:447 +#| msgctxt "Color name" +#| msgid "Light Sky Blue" +msgctxt "Color name" +msgid "Light Blue" +msgstr "Світло-синій" + +#: gtk/gtkcolorchooserwidget.c:448 msgctxt "Color name" msgid "Blue" msgstr "Синій" -#: gtk/gtkcolorchooserwidget.c:452 gtk/gtkcolorchooserwidget.c:453 -#: gtk/gtkcolorchooserwidget.c:454 gtk/gtkcolorchooserwidget.c:455 -#: gtk/gtkcolorchooserwidget.c:456 gtk/gtkcolorchooserwidget.c:457 -#| msgid "_Green:" +#: gtk/gtkcolorchooserwidget.c:449 +#| msgctxt "Color name" +#| msgid "Dark Sky Blue" +msgctxt "Color name" +msgid "Dark Blue" +msgstr "Темно-синій" + +#: gtk/gtkcolorchooserwidget.c:450 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Blue" +msgstr "Дуже темно-синій" + +#: gtk/gtkcolorchooserwidget.c:451 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Green" +msgstr "Дуже світло-зелений" + +#: gtk/gtkcolorchooserwidget.c:452 +#| msgctxt "Color name" +#| msgid "Light Gray" +msgctxt "Color name" +msgid "Light Green" +msgstr "Світло-зелений" + +#: gtk/gtkcolorchooserwidget.c:453 msgctxt "Color name" msgid "Green" msgstr "Зелений" -#: gtk/gtkcolorchooserwidget.c:458 gtk/gtkcolorchooserwidget.c:459 -#: gtk/gtkcolorchooserwidget.c:460 gtk/gtkcolorchooserwidget.c:461 -#: gtk/gtkcolorchooserwidget.c:462 gtk/gtkcolorchooserwidget.c:463 +#: gtk/gtkcolorchooserwidget.c:454 +#| msgctxt "Color name" +#| msgid "Dark Gray" +msgctxt "Color name" +msgid "Dark Green" +msgstr "Темно-зелений" + +#: gtk/gtkcolorchooserwidget.c:455 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Green" +msgstr "Дуже темно-зелений" + +#: gtk/gtkcolorchooserwidget.c:456 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Yellow" +msgstr "Дуже світло-жовтий" + +#: gtk/gtkcolorchooserwidget.c:457 +#| msgctxt "Color name" +#| msgid "Yellow" +msgctxt "Color name" +msgid "Light Yellow" +msgstr "Світло-жовтий" + +#: gtk/gtkcolorchooserwidget.c:458 msgctxt "Color name" msgid "Yellow" msgstr "Жовтий" -#: gtk/gtkcolorchooserwidget.c:464 gtk/gtkcolorchooserwidget.c:465 -#: gtk/gtkcolorchooserwidget.c:466 gtk/gtkcolorchooserwidget.c:467 -#: gtk/gtkcolorchooserwidget.c:468 gtk/gtkcolorchooserwidget.c:469 +#: gtk/gtkcolorchooserwidget.c:459 +#| msgctxt "Color name" +#| msgid "Yellow" +msgctxt "Color name" +msgid "Dark Yellow" +msgstr "Темно-жовтий" + +#: gtk/gtkcolorchooserwidget.c:460 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Yellow" +msgstr "Дуже темно-жовтий" + +#: gtk/gtkcolorchooserwidget.c:461 +#| msgctxt "Color name" +#| msgid "Light Orange" +msgctxt "Color name" +msgid "Very Light Orange" +msgstr "Дуже світло-жовтогарячий" + +#: gtk/gtkcolorchooserwidget.c:462 +msgctxt "Color name" +msgid "Light Orange" +msgstr "Світло-жовтогарячий" + +#: gtk/gtkcolorchooserwidget.c:463 msgctxt "Color name" msgid "Orange" msgstr "Жовтогарячий" -#: gtk/gtkcolorchooserwidget.c:470 gtk/gtkcolorchooserwidget.c:471 -#: gtk/gtkcolorchooserwidget.c:472 gtk/gtkcolorchooserwidget.c:473 -#: gtk/gtkcolorchooserwidget.c:474 -#| msgid "_Red:" +#: gtk/gtkcolorchooserwidget.c:464 +msgctxt "Color name" +msgid "Dark Orange" +msgstr "Темно-жовтогарячий" + +#: gtk/gtkcolorchooserwidget.c:465 +#| msgctxt "Color name" +#| msgid "Dark Orange" +msgctxt "Color name" +msgid "Very Dark Orange" +msgstr "Дуже темно-жовтогарячий" + +#: gtk/gtkcolorchooserwidget.c:466 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Red" +msgstr "Дуже світло-червоний" + +#: gtk/gtkcolorchooserwidget.c:467 +#| msgctxt "Color name" +#| msgid "Light" +msgctxt "Color name" +msgid "Light Red" +msgstr "Світло-червоний" + +#: gtk/gtkcolorchooserwidget.c:468 msgctxt "Color name" msgid "Red" msgstr "Червоний" -#: gtk/gtkcolorchooserwidget.c:475 gtk/gtkcolorchooserwidget.c:476 -#: gtk/gtkcolorchooserwidget.c:477 gtk/gtkcolorchooserwidget.c:478 -#: gtk/gtkcolorchooserwidget.c:479 +#: gtk/gtkcolorchooserwidget.c:469 +#| msgctxt "Color name" +#| msgid "Dark Scarlet Red" +msgctxt "Color name" +msgid "Dark Red" +msgstr "Темно-червоний" + +#: gtk/gtkcolorchooserwidget.c:470 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Red" +msgstr "Дуже темно-червоний" + +#: gtk/gtkcolorchooserwidget.c:471 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Purple" +msgstr "Дуже світло-пурпуровий" + +#: gtk/gtkcolorchooserwidget.c:472 +#| msgctxt "Color name" +#| msgid "Light Plum" +msgctxt "Color name" +msgid "Light Purple" +msgstr "Світло-пурпуровий" + +#: gtk/gtkcolorchooserwidget.c:473 msgctxt "Color name" msgid "Purple" msgstr "Пурпуровий" -#: gtk/gtkcolorchooserwidget.c:480 gtk/gtkcolorchooserwidget.c:481 -#: gtk/gtkcolorchooserwidget.c:482 gtk/gtkcolorchooserwidget.c:483 -#: gtk/gtkcolorchooserwidget.c:484 +#: gtk/gtkcolorchooserwidget.c:474 +#| msgctxt "Color name" +#| msgid "Purple" +msgctxt "Color name" +msgid "Dark Purple" +msgstr "Темно-пурпуровий" + +#: gtk/gtkcolorchooserwidget.c:475 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Purple" +msgstr "Дуже темно-пурпуровий" + +#: gtk/gtkcolorchooserwidget.c:476 +#| msgctxt "Color name" +#| msgid "Very Light Gray" +msgctxt "Color name" +msgid "Very Light Brown" +msgstr "Дуже світло-коричневий" + +#: gtk/gtkcolorchooserwidget.c:477 +#| msgctxt "output-bin" +#| msgid "Right Bin" +msgctxt "Color name" +msgid "Light Brown" +msgstr "Світло-коричневий" + +#: gtk/gtkcolorchooserwidget.c:478 msgctxt "Color name" msgid "Brown" msgstr "Коричневий" -#: gtk/gtkcolorchooserwidget.c:485 gtk/gtkcolorchooserwidget.c:486 -#: gtk/gtkcolorchooserwidget.c:487 gtk/gtkcolorchooserwidget.c:488 -#: gtk/gtkcolorchooserwidget.c:489 -#| msgctxt "keyboard label" -#| msgid "Right" +#: gtk/gtkcolorchooserwidget.c:479 +#| msgctxt "Color name" +#| msgid "Dark Butter" +msgctxt "Color name" +msgid "Dark Brown" +msgstr "Темно-коричневий" + +#: gtk/gtkcolorchooserwidget.c:480 +#| msgctxt "Color name" +#| msgid "Very Dark Gray" +msgctxt "Color name" +msgid "Very Dark Brown" +msgstr "Дуже темно-коричневий" + +#: gtk/gtkcolorchooserwidget.c:481 +msgctxt "Color name" +msgid "White" +msgstr "Білий" + +#: gtk/gtkcolorchooserwidget.c:482 +#| msgctxt "Color name" +#| msgid "Light Gray" +msgctxt "Color name" +msgid "Light Gray 1" +msgstr "Світло-сірий 1" + +#: gtk/gtkcolorchooserwidget.c:483 +#| msgctxt "Color name" +#| msgid "Light Gray" +msgctxt "Color name" +msgid "Light Gray 2" +msgstr "Світло-сірий 2" + +#: gtk/gtkcolorchooserwidget.c:484 +#| msgctxt "Color name" +#| msgid "Light Gray" +msgctxt "Color name" +msgid "Light Gray 3" +msgstr "Світло-сірий 3" + +#: gtk/gtkcolorchooserwidget.c:485 +#| msgctxt "Color name" +#| msgid "Light Gray" +msgctxt "Color name" +msgid "Light Gray 4" +msgstr "Світло-сірий 4" + +#: gtk/gtkcolorchooserwidget.c:486 +#| msgctxt "Color name" +#| msgid "Dark Gray" +msgctxt "Color name" +msgid "Dark Gray 1" +msgstr "Темно-сірий 1" + +#: gtk/gtkcolorchooserwidget.c:487 +#| msgctxt "Color name" +#| msgid "Dark Gray" msgctxt "Color name" -msgid "Light" -msgstr "Світлий" +msgid "Dark Gray 2" +msgstr "Темно-сірий 2" -#: gtk/gtkcolorchooserwidget.c:490 gtk/gtkcolorchooserwidget.c:491 -#: gtk/gtkcolorchooserwidget.c:492 gtk/gtkcolorchooserwidget.c:493 -#: gtk/gtkcolorchooserwidget.c:494 +#: gtk/gtkcolorchooserwidget.c:488 +#| msgctxt "Color name" +#| msgid "Dark Gray" +msgctxt "Color name" +msgid "Dark Gray 3" +msgstr "Темно-сірий 3" + +#: gtk/gtkcolorchooserwidget.c:489 #| msgctxt "Color name" -#| msgid "Dark Plum" +#| msgid "Dark Gray" msgctxt "Color name" -msgid "Dark" -msgstr "Темний" +msgid "Dark Gray 4" +msgstr "Темно-сірий 4" + +#: gtk/gtkcolorchooserwidget.c:490 +msgctxt "Color name" +msgid "Black" +msgstr "Чорний" #. translators: label for the custom section in the color chooser -#: gtk/gtkcolorchooserwidget.c:538 +#: gtk/gtkcolorchooserwidget.c:534 msgid "Custom" msgstr "Власний" -#: gtk/gtkcolorchooserwidget.c:545 +#: gtk/gtkcolorchooserwidget.c:541 msgid "Custom color" msgstr "Власний колір" -#: gtk/gtkcolorchooserwidget.c:546 +#: gtk/gtkcolorchooserwidget.c:542 msgid "Create a custom color" msgstr "Створити власний колір" -#: gtk/gtkcolorchooserwidget.c:565 +#: gtk/gtkcolorchooserwidget.c:561 #, c-format msgid "Custom color %d: %s" msgstr "Власний колір %d: %s" @@ -8176,15 +8399,15 @@ msgstr "Файл" msgid "_Output format" msgstr "Формат _виводу" -#: modules/printbackends/lpr/gtkprintbackendlpr.c:393 +#: modules/printbackends/lpr/gtkprintbackendlpr.c:394 msgid "Print to LPR" msgstr "Друкувати в LPR" -#: modules/printbackends/lpr/gtkprintbackendlpr.c:419 +#: modules/printbackends/lpr/gtkprintbackendlpr.c:423 msgid "Pages Per Sheet" msgstr "Сторінок на аркуш" -#: modules/printbackends/lpr/gtkprintbackendlpr.c:426 +#: modules/printbackends/lpr/gtkprintbackendlpr.c:430 msgid "Command Line" msgstr "Командний рядок" @@ -8223,6 +8446,12 @@ msgstr "тест-друку.%s" msgid "Print to Test Printer" msgstr "Друкувати для випробування принтера" +#~| msgctxt "Color name" +#~| msgid "Dark Plum" +#~ msgctxt "Color name" +#~ msgid "Dark" +#~ msgstr "Темний" + #~ msgctxt "Color name" #~ msgid "Light Scarlet Red" #~ msgstr "Світло яскраво-червоний" @@ -8232,18 +8461,6 @@ msgstr "Друкувати для випробування принтера" #~ msgstr "Яскраво-червоний" #~ msgctxt "Color name" -#~ msgid "Dark Scarlet Red" -#~ msgstr "Темний яскраво-червоний" - -#~ msgctxt "Color name" -#~ msgid "Light Orange" -#~ msgstr "Світло-жовтогарячий" - -#~ msgctxt "Color name" -#~ msgid "Dark Orange" -#~ msgstr "Темно-жовтогарячий" - -#~ msgctxt "Color name" #~ msgid "Light Butter" #~ msgstr "Світло-масляний" @@ -8252,10 +8469,6 @@ msgstr "Друкувати для випробування принтера" #~ msgstr "Масляний" #~ msgctxt "Color name" -#~ msgid "Dark Butter" -#~ msgstr "Темно-масляний" - -#~ msgctxt "Color name" #~ msgid "Light Chameleon" #~ msgstr "Світло-хамелеоновий" @@ -8268,22 +8481,10 @@ msgstr "Друкувати для випробування принтера" #~ msgstr "Темно-хамелеоновий" #~ msgctxt "Color name" -#~ msgid "Light Sky Blue" -#~ msgstr "Світло-блакитний" - -#~ msgctxt "Color name" #~ msgid "Sky Blue" #~ msgstr "Блакитний" #~ msgctxt "Color name" -#~ msgid "Dark Sky Blue" -#~ msgstr "Темно-блакитний" - -#~ msgctxt "Color name" -#~ msgid "Light Plum" -#~ msgstr "Світло-сливовий" - -#~ msgctxt "Color name" #~ msgid "Plum" #~ msgstr "Сливовий" @@ -8324,37 +8525,13 @@ msgstr "Друкувати для випробування принтера" #~ msgstr "Темно-алюмінієвий 2" #~ msgctxt "Color name" -#~ msgid "Black" -#~ msgstr "Чорний" - -#~ msgctxt "Color name" -#~ msgid "Very Dark Gray" -#~ msgstr "Дуже темно-сірий" - -#~ msgctxt "Color name" #~ msgid "Darker Gray" #~ msgstr "Претемний сірий" #~ msgctxt "Color name" -#~ msgid "Dark Gray" -#~ msgstr "Темно-сірий" - -#~ msgctxt "Color name" #~ msgid "Medium Gray" #~ msgstr "Сірий" #~ msgctxt "Color name" -#~ msgid "Light Gray" -#~ msgstr "Світло-сірий" - -#~ msgctxt "Color name" #~ msgid "Lighter Gray" #~ msgstr "Пресвітло-сірий" - -#~ msgctxt "Color name" -#~ msgid "Very Light Gray" -#~ msgstr "Дуже світло-сірий" - -#~ msgctxt "Color name" -#~ msgid "White" -#~ msgstr "Білий" |