AUTHORS

@@ -1,6 +1,6 @@
  -- This file is generated from authors.xml, do not edit it directly. --
 
-GIMP was originally written by:
+PIKA was originally written by:
 
  Spencer Kimball
  Peter Mattis
@@ -12,7 +12,7 @@ The current maintainers are:
  Jehan
 
 
-The following people have contributed code to GIMP:
+The following people have contributed code to PIKA:
 
  Lauri Alanko
  Fredrik Alströmer
@@ -339,7 +339,7 @@ The following people have contributed code to GIMP:
  Robert Ögren
 
 
-The following people have contributed art to GIMP:
+The following people have contributed art to PIKA:
 
  Lapo Calamandrei
  Paul Davey
@@ -359,7 +359,7 @@ The following people have contributed art to GIMP:
  William Szilveszter
 
 
-The following people have helped to document GIMP:
+The following people have helped to document PIKA:
 
  Ignacio AntI
  Žygimantas Beručka

NEWS

@@ -27,24 +27,7 @@ Core:
     external data. This will be used to serialize data objects hence easily
     retrieve the proper data even when some data may have duplicate names.
   - New "FG to Transparent (Hardedge)" gradient.
-  - New palette import supports:
+  - New Adobe Swatch Exchange palette import support.
-    * Adobe Swatch Exchange
-    * SwatchBooker
-    * Adobe Color Book (ACB)
-  - More robust support for ASE palette loading, by stripping space paddings and
-    being more warry of maliciously built files with invalid string data.
-  - Artifically set PANGOCAIRO_BACKEND=fc when running on Windows to use the
-    fontconfig backend, which enables anti-aliasing on Windows, unlike the
-    default pangocairo backend.
-  - XCF:
-    * Font information are more accurately stored (not only the font name, but
-      also storing various other attributes and even a file hash in the ideal
-      case where the exact same font file is available), allowing to find the
-      right font (if installed) on load with less errors.
-    * As a consequence of the previous point, new files with text layers will be
-      saved as a bumped XCF 19 version.
-    * Older XCF versions with text layers can still be saved using older XCF
-      versions as long as the text layers are untouched in an edit session.
 
 Graphical User Interface:
 
@@ -76,8 +59,6 @@ Graphical User Interface:
     and gimp-tool-dodge in Color theme.
   - Help menu rearranged to be better organized and also to move "About GIMP" as
     the last item, which is its more conventional position.
-  - Many fixes to the default themes (including several cases of CSS rules
-    leaking from system themes).
 
 Tools:
 
@@ -112,13 +93,6 @@ Plug-ins:
   - New gimp-help-main script to link to the "Table of Contents" of the manual,
     added to the "Help > User Manual" submenu.
   - PSP: added support to load PSP ICC Profile data.
-  - Image Map: two new fields to the HTML Link tab and one new field to the
-    Javascript tab for area properties:
-    * accesskey: The same as the mnemonic key shortcuts in GTK, to activate an
-      area of the image map. Depending on the OS, you either hold ALT or
-      ALT+SHIFT and this key.
-    * tabindex: What order to select the area when the user presses Tab.
-    * onClick: Run a Javascript function when the user clicks on the area.
 
 Translations:
 
@@ -143,11 +117,6 @@ Build:
     Windows. This bump happens because of end-of-support by Microsoft itself,
     and also by MSYS2 project which is our base for the official installers.
   - CI now generates babl and GEGL API reference HTML as artifact tarballs.
-  - New meson options -Dfits and -Dopenmp to enable/disable respectively FITS or
-    OpenMP support more explicitly (allowing to bypass auto-detection).
-  - Pango 1.50 or higher is now required as a result of using
-    pango_attribute_as_font_desc(). Also pango, pangocairo and pangoft2 now use
-    the same minimum version requirement.
 
 
 Overview of Changes from GIMP 2.99.14 to GIMP 2.99.16

app/actions/view-actions.c

@@ -371,86 +371,66 @@ static const PikaEnumActionEntry view_zoom_actions[] =
     PIKA_HELP_VIEW_ZOOM_IN }
 };
 
-static const PikaEnumActionEntry view_zoom_explicit_actions[] =
+static const PikaRadioActionEntry view_zoom_explicit_actions[] =
 {
   { "view-zoom-16-1", NULL,
-    NC_("view-zoom-action", "Zoom 16:1 (1600%)"),
+    NC_("view-zoom-action", "1_6:1  (1600%)"), NULL, { "5", "KP_5", NULL },
-    NC_("view-zoom-action", "1_6:1  (1600%)"),
-    { "5", "KP_5", NULL },
     NC_("view-zoom-action", "Zoom 16:1"),
-    160000, FALSE,
+    160000,
     PIKA_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-8-1", NULL,
-    NC_("view-zoom-action", "Zoom 8:1 (800%)"),
+    NC_("view-zoom-action", "_8:1  (800%)"), NULL, { "4", "KP_4", NULL },
-    NC_("view-zoom-action", "_8:1  (800%)"),
-    { "4", "KP_4", NULL },
     NC_("view-zoom-action", "Zoom 8:1"),
-    80000, FALSE,
+    80000,
     PIKA_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-4-1", NULL,
-    NC_("view-zoom-action", "Zoom 4:1 (400%)"),
+    NC_("view-zoom-action", "_4:1  (400%)"), NULL, { "3", "KP_3", NULL },
-    NC_("view-zoom-action", "_4:1  (400%)"),
-    { "3", "KP_3", NULL },
     NC_("view-zoom-action", "Zoom 4:1"),
-    40000, FALSE,
+    40000,
     PIKA_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-2-1", NULL,
-    NC_("view-zoom-action", "Zoom 2:1 (200%)"),
+    NC_("view-zoom-action", "_2:1  (200%)"), NULL, { "2", "KP_2", NULL },
-    NC_("view-zoom-action", "_2:1  (200%)"),
-    { "2", "KP_2", NULL },
     NC_("view-zoom-action", "Zoom 2:1"),
-    20000, FALSE,
+    20000,
     PIKA_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-1-1", PIKA_ICON_ZOOM_ORIGINAL,
-    NC_("view-zoom-action", "Zoom 1:1 (100%)"),
+    NC_("view-zoom-action", "_1:1  (100%)"), NULL, { "1", "KP_1", NULL },
-    NC_("view-zoom-action", "_1:1  (100%)"),
-    { "1", "KP_1", NULL },
     NC_("view-zoom-action", "Zoom 1:1"),
-    10000, FALSE,
+    10000,
     PIKA_HELP_VIEW_ZOOM_100 },
 
   { "view-zoom-1-2", NULL,
-    NC_("view-zoom-action", "Zoom 1:2 (50%)"),
+    NC_("view-zoom-action", "1:_2  (50%)"), NULL, { "<shift>2", "<shift>KP_2", NULL },
-    NC_("view-zoom-action", "1:_2  (50%)"),
-    { "<shift>2", "<shift>KP_2", NULL },
     NC_("view-zoom-action", "Zoom 1:2"),
-    5000, FALSE,
+    5000,
     PIKA_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-4", NULL,
-    NC_("view-zoom-action", "Zoom 1:4 (25%)"),
+    NC_("view-zoom-action", "1:_4  (25%)"), NULL, { "<shift>3", "<shift>KP_3", NULL },
-    NC_("view-zoom-action", "1:_4  (25%)"),
-    { "<shift>3", "<shift>KP_3", NULL },
     NC_("view-zoom-action", "Zoom 1:4"),
-    2500, FALSE,
+    2500,
     PIKA_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-8", NULL,
-    NC_("view-zoom-action", "Zoom 1:8 (12.5%)"),
+    NC_("view-zoom-action", "1:_8  (12.5%)"), NULL, { "<shift>4", "<shift>KP_4", NULL },
-    NC_("view-zoom-action", "1:_8  (12.5%)"),
-    { "<shift>4", "<shift>KP_4", NULL },
     NC_("view-zoom-action", "Zoom 1:8"),
-    1250, FALSE,
+    1250,
     PIKA_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-16", NULL,
-    NC_("view-zoom-action", "Zoom 1:16 (6.25%)"),
+    NC_("view-zoom-action", "1:1_6  (6.25%)"), NULL, { "<shift>5", "<shift>KP_5", NULL },
-    NC_("view-zoom-action", "1:1_6  (6.25%)"),
-    { "<shift>5", "<shift>KP_5", NULL },
     NC_("view-zoom-action", "Zoom 1:16"),
-    625, FALSE,
+    625,
     PIKA_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-other", NULL,
+    NC_("view-zoom-action", "Othe_r zoom factor..."), NULL, { NULL },
     NC_("view-zoom-action", "Set a custom zoom factor"),
-    NC_("view-zoom-action", "Othe_r zoom factor..."),
+    0,
-    { NULL },
-    NC_("view-zoom-action", "Set a custom zoom factor"),
-    0, TRUE,
     PIKA_HELP_VIEW_ZOOM_OTHER }
 };
 
@@ -672,6 +652,8 @@ static const PikaEnumActionEntry view_scroll_vertical_actions[] =
 void
 view_actions_setup (PikaActionGroup *group)
 {
+  PikaAction *action;
+
   pika_action_group_add_actions (group, "view-action",
                                  view_actions,
                                  G_N_ELEMENTS (view_actions));
@@ -685,10 +667,12 @@ view_actions_setup (PikaActionGroup *group)
                                       G_N_ELEMENTS (view_zoom_actions),
                                       view_zoom_cmd_callback);
 
-  pika_action_group_add_enum_actions (group, "view-zoom-action",
+  pika_action_group_add_radio_actions (group, "view-zoom-action",
-                                      view_zoom_explicit_actions,
+                                       view_zoom_explicit_actions,
-                                      G_N_ELEMENTS (view_zoom_explicit_actions),
+                                       G_N_ELEMENTS (view_zoom_explicit_actions),
-                                      view_zoom_explicit_cmd_callback);
+                                       NULL,
+                                       10000,
+                                       view_zoom_explicit_cmd_callback);
 
   pika_action_group_add_toggle_actions (group, "view-action",
                                         view_flip_actions,
@@ -730,6 +714,15 @@ view_actions_setup (PikaActionGroup *group)
                                       G_N_ELEMENTS (view_scroll_vertical_actions),
                                       view_scroll_vertical_cmd_callback);
 
+  /*  connect "activate" of view-zoom-other manually so it can be
+   *  selected even if it's the active item of the radio group
+   */
+  action = pika_action_group_get_action (group, "view-zoom-other");
+
+  g_signal_connect (action, "activate",
+                    G_CALLBACK (view_zoom_other_cmd_callback),
+                    group->user_data);
+
   g_signal_connect_object (group->pika->config, "notify::check-type",
                            G_CALLBACK (view_actions_check_type_notify),
                            group, 0);
@@ -994,20 +987,55 @@ static void
 view_actions_set_zoom (PikaActionGroup  *group,
                        PikaDisplayShell *shell)
 {
+  const gchar     *action = NULL;
   PikaImageWindow *window;
   PikaMenuModel   *model;
   gchar           *str;
   gchar           *label;
+  guint            scale;
 
   g_object_get (shell->zoom,
                 "percentage", &str,
                 NULL);
 
+  scale = ROUND (pika_zoom_model_get_factor (shell->zoom) * 1000);
+
+  switch (scale)
+    {
+    case 16000:  action = "view-zoom-16-1";  break;
+    case  8000:  action = "view-zoom-8-1";   break;
+    case  4000:  action = "view-zoom-4-1";   break;
+    case  2000:  action = "view-zoom-2-1";   break;
+    case  1000:  action = "view-zoom-1-1";   break;
+    case   500:  action = "view-zoom-1-2";   break;
+    case   250:  action = "view-zoom-1-4";   break;
+    case   125:  action = "view-zoom-1-8";   break;
+    case    63:
+    case    62:  action = "view-zoom-1-16";  break;
+    }
+
+  if (! action)
+    {
+      action = "view-zoom-other";
+
+      label = g_strdup_printf (_("Othe_r (%s)..."), str);
+      pika_action_group_set_action_label (group, action, label);
+      g_free (label);
+
+      shell->other_scale = pika_zoom_model_get_factor (shell->zoom);
+    }
+
+  pika_action_group_set_action_active (group, action, TRUE);
+
   window = pika_display_shell_get_window (shell);
   model  = pika_image_window_get_menubar_model (window);
   label  = g_strdup_printf (_("_Zoom (%s)"), str);
   pika_menu_model_set_title (model, "/View/Zoom", label);
   g_free (label);
+
+  /* flag as dirty */
+  shell->other_scale = - fabs (shell->other_scale);
+
   g_free (str);
 }
 

app/actions/view-commands.c

@@ -288,7 +288,22 @@ view_zoom_explicit_cmd_callback (PikaAction *action,
                                   (gdouble) factor / 10000,
                                   PIKA_ZOOM_FOCUS_RETAIN_CENTERING_ELSE_BEST_GUESS);
     }
-  else
+}
+
+/* not a PikaActionCallback */
+void
+view_zoom_other_cmd_callback (PikaAction *action,
+                              gpointer    data)
+{
+  PikaDisplayShell *shell;
+  return_if_no_shell (shell, data);
+
+  /* check if we are activated by the user or from
+   * view_actions_set_zoom(), also this is really a GtkToggleAction
+   * NOT a PikaToggleAction
+   */
+  if (pika_toggle_action_get_active (PIKA_TOGGLE_ACTION (action)) &&
+      shell->other_scale != pika_zoom_model_get_factor (shell->zoom))
     {
       pika_display_shell_scale_dialog (shell);
     }

app/actions/view-commands.h

@@ -53,6 +53,10 @@ void   view_zoom_explicit_cmd_callback              (PikaAction *action,
                                                      GVariant   *value,
                                                      gpointer    data);
 
+/* not a PikaActionCallback */
+void   view_zoom_other_cmd_callback                 (PikaAction *action,
+                                                     gpointer    data);
+
 void   view_show_all_cmd_callback                   (PikaAction *action,
                                                      GVariant   *value,
                                                      gpointer    data);

app/config/pikaguiconfig.c

@@ -80,7 +80,6 @@ enum
   PROP_ICON_THEME_PATH,
   PROP_ICON_THEME,
   PROP_PREFER_SYMBOLIC_ICONS,
-  PROP_FONT_RELATIVE_SIZE,
   PROP_USE_HELP,
   PROP_SHOW_HELP_BUTTON,
   PROP_HELP_LOCALES,
@@ -363,13 +362,6 @@ pika_gui_config_class_init (PikaGuiConfigClass *klass)
                             TRUE,
                             PIKA_PARAM_STATIC_STRINGS);
 
-  PIKA_CONFIG_PROP_DOUBLE (object_class, PROP_FONT_RELATIVE_SIZE,
-                           "font-relative-size",
-                           "Tweak font-size from the theme",
-                           FONT_SIZE_BLURB,
-                           0.5, 2.0, 1.0,
-                           PIKA_PARAM_STATIC_STRINGS);
-
   PIKA_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_HELP,
                             "use-help",
                             "Use help",
@@ -707,9 +699,6 @@ pika_gui_config_set_property (GObject      *object,
     case PROP_PREFER_SYMBOLIC_ICONS:
       gui_config->prefer_symbolic_icons = g_value_get_boolean (value);
       break;
-    case PROP_FONT_RELATIVE_SIZE:
-      gui_config->font_relative_size = g_value_get_double (value);
-      break;
     case PROP_USE_HELP:
       gui_config->use_help = g_value_get_boolean (value);
       break;
@@ -887,9 +876,6 @@ pika_gui_config_get_property (GObject    *object,
     case PROP_PREFER_SYMBOLIC_ICONS:
       g_value_set_boolean (value, gui_config->prefer_symbolic_icons);
       break;
-    case PROP_FONT_RELATIVE_SIZE:
-      g_value_set_double (value, gui_config->font_relative_size);
-      break;
     case PROP_USE_HELP:
       g_value_set_boolean (value, gui_config->use_help);
       break;

app/config/pikaguiconfig.h

@@ -72,7 +72,6 @@ struct _PikaGuiConfig
   gchar               *icon_theme_path;
   gchar               *icon_theme;
   gboolean             prefer_symbolic_icons;
-  gdouble              font_relative_size;
   gboolean             override_icon_size;
   PikaIconSize         custom_icon_size;
   gboolean             use_help;

app/config/pikarc-blurbs.h

@@ -561,9 +561,6 @@ _("When enabled, symbolic icons will be preferred if available.")
 #define ICON_THEME_PATH_BLURB \
 "Sets the icon theme search path."
 
-#define FONT_SIZE_BLURB \
-_("Tweak font size of the graphical interface.")
-
 #define IMAGE_CONVERT_PROFILE_INTENT_BLURB \
 _("Sets the default rendering intent for the 'Convert to Color Profile' dialog.")
 

app/core/pika-utils.c

@@ -734,7 +734,7 @@ pika_file_is_executable (GFile *file)
 
   if (info)
     {
-      GFileType    file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+      GFileType    file_type = g_file_info_get_file_type (info);
       const gchar *filename  = g_file_info_get_name (info);
 
       if (file_type == G_FILE_TYPE_REGULAR &&

app/core/pikadataloaderfactory.c

@@ -386,13 +386,13 @@ pika_data_loader_factory_load_directory (PikaDataFactory *factory,
           GFileType  file_type;
           GFile     *child;
 
-          if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+          if (g_file_info_get_is_hidden (info))
             {
               g_object_unref (info);
               continue;
             }
 
-          file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+          file_type = g_file_info_get_file_type (info);
           child     = g_file_enumerator_get_child (enumerator, info);
 
           if (file_type == G_FILE_TYPE_DIRECTORY)

app/core/pikaextensionmanager.c

@@ -1022,7 +1022,7 @@ pika_extension_manager_search_directory (PikaExtensionManager *manager,
         {
           GFile *subdir;
 
-          if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+          if (g_file_info_get_is_hidden (info))
             {
               g_object_unref (info);
               continue;

app/core/pikaimagefile.c

@@ -456,7 +456,7 @@ pika_imagefile_create_thumbnail (PikaImagefile  *imagefile,
                                          G_FILE_QUERY_INFO_NONE,
                                          NULL, NULL);
 
-          regular  = (g_file_info_get_attribute_uint32 (file_info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR);
+          regular  = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR);
           readable = g_file_info_get_attribute_boolean (file_info,
                                                         G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
 
@@ -719,7 +719,7 @@ pika_imagefile_icon_callback (GObject      *source_object,
 
   if (file_info)
     {
-      private->icon = g_object_ref (G_ICON (g_file_info_get_attribute_object (file_info, G_FILE_ATTRIBUTE_STANDARD_ICON)));
+      private->icon = g_object_ref (g_file_info_get_icon (file_info));
       g_object_unref (file_info);
     }
 

app/core/pikapalette-load.c

@@ -1736,7 +1736,7 @@ pika_palette_load_detect_format (GFile        *file,
 
       if (info)
         {
-          goffset size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+          goffset size = g_file_info_get_size (info);
 
           if (size == 768)
             format = PIKA_PALETTE_FILE_FORMAT_ACT;

app/dialogs/about-dialog.c

@@ -2,7 +2,7 @@
  * a rebranding of The GNU Image Manipulation Program (created with heckimp)
  * A derived work which may be trivial. However, any changes may be (C)2023 by Aldercone Studio
  *
- * Original copyright, applying to most contents (license remains unchanged):
+ * Original copyright, applying to most contents (license remains unchanged): 
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
  * This program is free software: you can redistribute it and/or modify
@@ -45,6 +45,13 @@
 #include "pika-intl.h"
 
 
+/* The first authors are the creators and maintainers, don't shuffle
+ * them
+ */
+#define START_INDEX (G_N_ELEMENTS (creators)    - 1 /*NULL*/ + \
+                     G_N_ELEMENTS (maintainers) - 1 /*NULL*/)
+
+
 typedef struct
 {
   GtkWidget   *dialog;
@@ -55,6 +62,9 @@ typedef struct
   GtkWidget   *anim_area;
   PangoLayout *layout;
 
+  gint         n_authors;
+  gint         shuffle[G_N_ELEMENTS (authors) - 1];  /* NULL terminated */
+
   guint        timer;
 
   gint         index;
@@ -106,6 +116,7 @@ about_dialog_create (PikaCoreConfig *config)
       gchar     *copyright;
       gchar     *version;
 
+      dialog.n_authors = G_N_ELEMENTS (authors) - 1;
       dialog.config    = config;
 
       pixbuf = about_dialog_load_logo ();
@@ -134,6 +145,9 @@ about_dialog_create (PikaCoreConfig *config)
                              "logo",               pixbuf,
                              "website",            "https://heckin.technology/AlderconeStudio/PIKApp/",
                              "website-label",      _("Visit the PIKA website"),
+                             "authors",            authors,
+                             "artists",            artists,
+                             "documenters",        documenters,
                              /* Translators: insert your names here,
                                 separated by newline */
                              "translator-credits", _("translator-credits"),
@@ -466,6 +480,27 @@ about_dialog_add_update (PikaAboutDialog *dialog,
 static void
 about_dialog_reshuffle (PikaAboutDialog *dialog)
 {
+  GRand *gr = g_rand_new ();
+  gint   i;
+
+  for (i = 0; i < dialog->n_authors; i++)
+    dialog->shuffle[i] = i;
+
+  for (i = START_INDEX; i < dialog->n_authors; i++)
+    {
+      gint j = g_rand_int_range (gr, START_INDEX, dialog->n_authors);
+
+      if (i != j)
+        {
+          gint t;
+
+          t = dialog->shuffle[j];
+          dialog->shuffle[j] = dialog->shuffle[i];
+          dialog->shuffle[i] = t;
+        }
+    }
+
+  g_rand_free (gr);
 }
 
 static gboolean
@@ -642,11 +677,17 @@ about_dialog_timer (gpointer data)
           return FALSE;
 
         case 1:
-          text = insert_spacers (_("PIKA is brought to you by Aldercone Studio"));
+          text = insert_spacers (_("PIKA is brought to you by"));
+          dialog->state += 1;
           break;
 
         case 2:
-          return FALSE;
+          if (! (dialog->index < dialog->n_authors))
+            dialog->index = 0;
+
+          text = insert_spacers (authors[dialog->shuffle[dialog->index]]);
+          dialog->index += 1;
+          break;
 
         default:
           g_return_val_if_reached (TRUE);

app/dialogs/preferences-dialog.c

@@ -159,11 +159,6 @@ static void   prefs_gui_config_notify_icon_size    (GObject       *config,
                                                     GtkRange      *range);
 static void   prefs_icon_size_value_changed        (GtkRange      *range,
                                                     PikaGuiConfig *config);
-static void   prefs_gui_config_notify_font_size    (GObject       *config,
-                                                    GParamSpec    *pspec,
-                                                    GtkRange      *range);
-static void   prefs_font_size_value_changed        (GtkRange      *range,
-                                                    PikaGuiConfig *config);
 
 
 /*  private variables  */
@@ -980,38 +975,6 @@ prefs_gui_config_notify_icon_size (GObject    *config,
                                      config);
 }
 
-static void
-prefs_font_size_value_changed (GtkRange      *range,
-                               PikaGuiConfig *config)
-{
-  gdouble value = gtk_range_get_value (range);
-
-  g_signal_handlers_block_by_func (config,
-                                   G_CALLBACK (prefs_gui_config_notify_font_size),
-                                   range);
-  g_object_set (G_OBJECT (config),
-                "font-relative-size", value / 100.0,
-                NULL);
-  g_signal_handlers_unblock_by_func (config,
-                                     G_CALLBACK (prefs_gui_config_notify_font_size),
-                                     range);
-}
-
-static void
-prefs_gui_config_notify_font_size (GObject    *config,
-                                   GParamSpec *pspec,
-                                   GtkRange   *range)
-{
-  g_signal_handlers_block_by_func (range,
-                                   G_CALLBACK (prefs_font_size_value_changed),
-                                   config);
-  gtk_range_set_value (range,
-                       PIKA_GUI_CONFIG (config)->font_relative_size * 100.0);
-  g_signal_handlers_unblock_by_func (range,
-                                     G_CALLBACK (prefs_font_size_value_changed),
-                                     config);
-}
-
 static void
 prefs_format_string_select_callback (GtkListBox    *listbox,
                                      GtkListBoxRow *row,
@@ -2153,31 +2116,6 @@ prefs_dialog_new (Pika       *pika,
     gtk_box_pack_start (GTK_BOX (vbox3), scale, FALSE, FALSE, 0);
     gtk_widget_show (scale);
 
-    /* Font sizes. */
-    vbox3 = prefs_frame_new (_("Font Scaling"), GTK_CONTAINER (vbox2), FALSE);
-    pika_help_set_help_data (vbox3,
-                             _("Font scaling will not work with themes using absolute sizes."),
-                             NULL);
-    scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
-                                      50, 200, 10);
-    gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_BOTTOM);
-    gtk_scale_add_mark (GTK_SCALE (scale), 50.0, GTK_POS_BOTTOM,
-                        _("50%"));
-    gtk_scale_add_mark (GTK_SCALE (scale), 100.0, GTK_POS_BOTTOM,
-                        _("100%"));
-    gtk_scale_add_mark (GTK_SCALE (scale), 200.0, GTK_POS_BOTTOM,
-                        _("200%"));
-    gtk_range_set_value (GTK_RANGE (scale),
-                         (gdouble) PIKA_GUI_CONFIG (object)->font_relative_size * 100.0);
-    g_signal_connect (G_OBJECT (scale), "value-changed",
-                      G_CALLBACK (prefs_font_size_value_changed),
-                      PIKA_GUI_CONFIG (object));
-    g_signal_connect (G_OBJECT (object), "notify::font-relative-size",
-                      G_CALLBACK (prefs_gui_config_notify_font_size),
-                      scale);
-    gtk_box_pack_start (GTK_BOX (vbox3), scale, FALSE, FALSE, 0);
-    gtk_widget_show (scale);
-
     /* Reload Current Theme button */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);

app/display/pikadisplayshell-scale-dialog.c

@@ -32,7 +32,6 @@
 #include "core/pika.h"
 #include "core/pikaviewable.h"
 
-#include "widgets/pikaaction.h"
 #include "widgets/pikahelp-ids.h"
 #include "widgets/pikaviewabledialog.h"
 
@@ -55,9 +54,6 @@ typedef struct
   GtkAdjustment    *scale_adj;
   GtkAdjustment    *num_adj;
   GtkAdjustment    *denom_adj;
-
-  gdouble           prev_scale;
-  gdouble          *other_scale;
 } ScaleDialogData;
 
 
@@ -85,8 +81,6 @@ static void  update_zoom_values                       (GtkAdjustment    *adj,
 void
 pika_display_shell_scale_dialog (PikaDisplayShell *shell)
 {
-  /*  scale factor entered in Zoom->Other*/
-  static gdouble   other_scale = 0.0;
   ScaleDialogData *data;
   PikaImage       *image;
   GtkWidget       *toplevel;
@@ -104,21 +98,19 @@ pika_display_shell_scale_dialog (PikaDisplayShell *shell)
       return;
     }
 
-  data = g_slice_new (ScaleDialogData);
+  if (SCALE_EQUALS (shell->other_scale, 0.0))
-  data->prev_scale  = other_scale;
-  data->other_scale = &other_scale;
-
-  if (SCALE_EQUALS (other_scale, 0.0))
     {
       /* other_scale not yet initialized */
-      other_scale = pika_zoom_model_get_factor (shell->zoom);
+      shell->other_scale = pika_zoom_model_get_factor (shell->zoom);
     }
 
   image = pika_display_get_image (shell->display);
 
+  data = g_slice_new (ScaleDialogData);
+
   data->shell = shell;
   data->model = g_object_new (PIKA_TYPE_ZOOM_MODEL,
-                              "value", fabs (other_scale),
+                              "value", fabs (shell->other_scale),
                               NULL);
 
   g_set_weak_pointer
@@ -197,7 +189,7 @@ pika_display_shell_scale_dialog (PikaDisplayShell *shell)
                             _("Zoom:"), 0.0, 0.5,
                             hbox, 1);
 
-  data->scale_adj = gtk_adjustment_new (other_scale * 100,
+  data->scale_adj = gtk_adjustment_new (fabs (shell->other_scale) * 100,
                                         100.0 / 256.0, 25600.0,
                                         10, 50, 0);
   spin = pika_spin_button_new (data->scale_adj, 1.0, 2);
@@ -227,10 +219,7 @@ pika_display_shell_scale_dialog_response (GtkWidget       *widget,
 {
   if (response_id == GTK_RESPONSE_OK)
     {
-      GAction *action;
+      gdouble scale;
-      gchar   *label;
-      gchar   *zoom_str;
-      gdouble  scale;
 
       scale = gtk_adjustment_get_value (dialog->scale_adj);
 
@@ -238,33 +227,15 @@ pika_display_shell_scale_dialog_response (GtkWidget       *widget,
                                 PIKA_ZOOM_TO,
                                 scale / 100.0,
                                 PIKA_ZOOM_FOCUS_BEST_GUESS);
-
-      g_object_get (dialog->shell->zoom,
-                    "percentage", &zoom_str,
-                    NULL);
-
-      /* Change the "view-zoom-other" label. */
-      action = g_action_map_lookup_action (G_ACTION_MAP (dialog->shell->display->pika->app),
-                                           "view-zoom-other");
-
-      label = g_strdup_printf (_("Othe_r (%s)..."), zoom_str);
-      pika_action_set_short_label (PIKA_ACTION (action), label);
-      g_free (label);
-
-      label = g_strdup_printf (_("Custom Zoom (%s)..."), zoom_str);
-      pika_action_set_label (PIKA_ACTION (action), label);
-      g_free (label);
-
-      g_free (zoom_str);
     }
   else
     {
       /*  need to emit "scaled" to get the menu updated  */
       pika_display_shell_scaled (dialog->shell);
-
-      *(dialog->other_scale) = dialog->prev_scale;
     }
 
+  dialog->shell->other_scale = - fabs (dialog->shell->other_scale);
+
   gtk_widget_destroy (dialog->shell->scale_dialog);
 }
 
@@ -300,8 +271,6 @@ update_zoom_values (GtkAdjustment   *adj,
 
       gtk_adjustment_set_value (dialog->num_adj, num);
       gtk_adjustment_set_value (dialog->denom_adj, denom);
-
-      *(dialog->other_scale) = scale / 100.0;
     }
   else /* fraction adjustments */
     {
@@ -309,8 +278,6 @@ update_zoom_values (GtkAdjustment   *adj,
                gtk_adjustment_get_value (dialog->denom_adj));
 
       gtk_adjustment_set_value (dialog->scale_adj, scale * 100);
-
-      *(dialog->other_scale) = scale;
     }
 
   g_signal_handlers_unblock_by_func (dialog->scale_adj,

app/display/pikadisplayshell.h

@@ -87,6 +87,8 @@ struct _PikaDisplayShell
   gint               last_offset_x;    /*  offsets used when reverting zoom   */
   gint               last_offset_y;
 
+  gdouble            other_scale;      /*  scale factor entered in Zoom->Other*/
+
   gint               disp_width;       /*  width of drawing area              */
   gint               disp_height;      /*  height of drawing area             */
 

app/display/pikatoolrectangle.c

@@ -4210,12 +4210,11 @@ void
 pika_tool_rectangle_frame_item (PikaToolRectangle *rectangle,
                                 PikaItem          *item)
 {
-  PikaDisplayShell      *shell;
+  PikaDisplayShell *shell;
-  gint                   offset_x;
+  gint              offset_x;
-  gint                   offset_y;
+  gint              offset_y;
-  gint                   width;
+  gint              width;
-  gint                   height;
+  gint              height;
-  PikaRectangleFunction  old_function;
 
   g_return_if_fail (PIKA_IS_TOOL_RECTANGLE (rectangle));
   g_return_if_fail (PIKA_IS_ITEM (item));
@@ -4231,7 +4230,6 @@ pika_tool_rectangle_frame_item (PikaToolRectangle *rectangle,
 
   pika_item_get_offset (item, &offset_x, &offset_y);
 
-  old_function = rectangle->private->function;
   pika_tool_rectangle_set_function (rectangle, PIKA_TOOL_RECTANGLE_CREATING);
 
   g_object_set (rectangle,
@@ -4245,7 +4243,6 @@ pika_tool_rectangle_frame_item (PikaToolRectangle *rectangle,
    * if this function is ever moved out of the text tool code.
    */
   pika_tool_rectangle_set_constraint (rectangle, PIKA_RECTANGLE_CONSTRAIN_NONE);
-  pika_tool_rectangle_set_function (rectangle, old_function);
 }
 
 void

app/file/file-open.c

@@ -134,7 +134,7 @@ file_open_image (Pika                *pika,
       if (! info)
         return NULL;
 
-      if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) != G_FILE_TYPE_REGULAR)
+      if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
         {
           g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                                _("Not a regular file"));

app/file/file-save.c

@@ -138,7 +138,7 @@ file_save (Pika                *pika,
           goto out;
         }
 
-      if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) != G_FILE_TYPE_REGULAR)
+      if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
         {
           g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                                _("Not a regular file"));

app/gui/icon-themes.c

@@ -100,8 +100,8 @@ icon_themes_init (Pika *pika)
               while ((info = g_file_enumerator_next_file (enumerator,
                                                           NULL, NULL)))
                 {
-                  if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
+                  if (! g_file_info_get_is_hidden (info) &&
-                      g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
+                      g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
                     {
                       GFile *file;
                       GFile *index_theme;

app/gui/splash.c

@@ -599,7 +599,7 @@ splash_image_load_from_file (GFile    *file,
     {
       const gchar *content_type;
 
-      content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+      content_type = g_file_info_get_content_type (info);
       if (content_type)
         {
           gchar *mime_type;

app/gui/themes.c

@@ -104,9 +104,6 @@ themes_init (Pika *pika)
   g_signal_connect (config, "notify::custom-icon-size",
                     G_CALLBACK (themes_theme_change_notify),
                     pika);
-  g_signal_connect (config, "notify::font-relative-size",
-                    G_CALLBACK (themes_theme_change_notify),
-                    pika);
 
   themes_theme_change_notify (config, NULL, pika);
 }
@@ -380,12 +377,6 @@ themes_apply_theme (Pika          *pika,
             button_icon_size);
         }
 
-      if (! error && config->font_relative_size != 1.0)
-        g_output_stream_printf (output, NULL, NULL, &error,
-                                "\n"
-                                "* { font-size: %frem; }",
-                                config->font_relative_size);
-
       if (! error)
         {
           g_output_stream_printf (
@@ -524,8 +515,8 @@ themes_theme_paths_notify (PikaExtensionManager *manager,
               while ((info = g_file_enumerator_next_file (enumerator,
                                                           NULL, NULL)))
                 {
-                  if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
+                  if (! g_file_info_get_is_hidden (info) &&
-                      g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
+                      g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
                     {
                       GFile       *file;
                       const gchar *name;

app/menus/shortcuts-rc.c

@@ -273,20 +273,9 @@ shortcuts_action_deserialize (GScanner       *scanner,
   builder = g_strv_builder_new ();
   while (pika_scanner_parse_string (scanner, &accel))
     {
-      gchar           **dup_actions;
+      gchar    **dup_actions;
-      gboolean          add_accel = TRUE;
+      gboolean   add_accel = TRUE;
-      guint             accelerator_key  = 0;
-      GdkModifierType   accelerator_mods = 0;
 
-      gtk_accelerator_parse (accel, &accelerator_key, &accelerator_mods);
-      if (accelerator_key == 0 && accelerator_mods == 0)
-        {
-          g_printerr ("INFO: invalid accelerator '%s' on '%s'.\n"
-                      "      Removing this accelerator.\n",
-                      accel, action_name);
-          g_free (accel);
-          continue;
-        }
       dup_actions = gtk_application_get_actions_for_accel (application, accel);
 
       for (gint i = 0; dup_actions[i] != NULL; i++)

app/pdb/image-cmds.c

@@ -5042,7 +5042,7 @@ register_image_procs (PikaPDB *pdb)
                                "pika-image-get-imported-file");
   pika_procedure_set_static_help (procedure,
                                   "Returns the imported file for the specified image.",
-                                  "This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Gimp format, this procedure returns %NULL.",
+                                  "This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Pika format, this procedure returns %NULL.",
                                   NULL);
   pika_procedure_set_static_attribution (procedure,
                                          "Eric Grivel <pika@lumenssolutions.com>",

app/plug-in/pikaenvirontable.c

@@ -174,8 +174,8 @@ pika_environ_table_load (PikaEnvironTable *environ_table,
           while ((info = g_file_enumerator_next_file (enumerator,
                                                       NULL, NULL)))
             {
-              if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
+              if (! g_file_info_get_is_hidden (info) &&
-                  g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR)
+                  g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR)
                 {
                   GFile *file = g_file_enumerator_get_child (enumerator, info);
 

app/plug-in/pikainterpreterdb.c

@@ -167,8 +167,8 @@ pika_interpreter_db_load (PikaInterpreterDB *db,
           while ((info = g_file_enumerator_next_file (enumerator,
                                                       NULL, NULL)))
             {
-              if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
+              if (! g_file_info_get_is_hidden (info) &&
-                  g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR)
+                  g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR)
                 {
                   GFile *file = g_file_enumerator_get_child (enumerator, info);
 

app/plug-in/pikapluginmanager-file.c

@@ -687,7 +687,7 @@ file_check_single_magic (const gchar  *offset,
           if (! info)
             return FILE_MATCH_NONE;
 
-          fileval = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+          fileval = g_file_info_get_size (info);
           g_object_unref (info);
         }
       else if (offs >= 0 &&

app/plug-in/pikapluginmanager-restore.c

@@ -273,7 +273,7 @@ pika_plug_in_manager_search_directory (PikaPlugInManager *manager,
         {
           GFile *child;
 
-          if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+          if (g_file_info_get_is_hidden (info))
             {
               g_object_unref (info);
               continue;
@@ -309,7 +309,7 @@ pika_plug_in_manager_search_directory (PikaPlugInManager *manager,
                       gchar *file_name;
                       char  *ext;
 
-                      if (g_file_info_get_attribute_boolean (info2, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+                      if (g_file_info_get_is_hidden (info2))
                         {
                           g_object_unref (info2);
                           continue;

app/text/pikafont.c

@@ -63,20 +63,6 @@
 
 #define DEBUGPRINT(x) /* g_print x */
 
-enum
-{
-  PIKA_FONT_SYMBOL_FONTHASH,
-  PIKA_FONT_SYMBOL_FULLNAME,
-  PIKA_FONT_SYMBOL_FAMILY,
-  PIKA_FONT_SYMBOL_STYLE,
-  PIKA_FONT_SYMBOL_PSNAME,
-  PIKA_FONT_SYMBOL_INDEX,
-  PIKA_FONT_SYMBOL_WEIGHT,
-  PIKA_FONT_SYMBOL_SLANT,
-  PIKA_FONT_SYMBOL_WIDTH,
-  PIKA_FONT_SYMBOL_FONTVERSION
-};
-
 enum
 {
   PROP_0,
@@ -245,21 +231,18 @@ pika_font_deserialize_create (GType     type,
   gint           most_similar_font_index = -1;
   gint           font_count              = pika_container_get_n_children (fonts_container);
   gint           largest_similarity      = 0;
-  GList         *similar_fonts           = NULL;
+  gint           similar_fonts           = 0;
-  GList         *iter;
   gint           i;
-  gchar         *fonthash                = NULL;
+  gchar         *fonthash;
-  gchar         *fullname                = NULL;
+  gchar         *fullname;
-  gchar         *family                  = NULL;
+  gchar         *family;
-  gchar         *psname                  = NULL;
+  gchar         *psname;
-  gchar         *style                   = NULL;
+  gchar         *style;
-  gint           index                   = -1;
+  gint           index;
-  gint           weight                  = -1;
+  gint           weight;
-  gint           slant                   = -1;
+  gint           slant;
-  gint           width                   = -1;
+  gint           width;
-  gint           fontversion             = -1;
+  gint           fontversion;
-  guint          scope_id;
-  guint          old_scope_id;
 
   /* This is for backward compatibility with older xcf files.
    * The font used to be serialized as a string containing
@@ -267,7 +250,7 @@ pika_font_deserialize_create (GType     type,
    */
   if (g_scanner_peek_next_token (scanner) == G_TOKEN_STRING)
     {
-      gchar* font_name = NULL;
+      gchar* font_name;
 
       pika_scanner_parse_string (scanner, &font_name);
 
@@ -286,119 +269,61 @@ pika_font_deserialize_create (GType     type,
       else
         g_object_ref (font);
 
-      g_free (font_name);
-
       return PIKA_CONFIG (PIKA_FONT (font));
     }
 
   if (g_scanner_peek_next_token (scanner) == G_TOKEN_RIGHT_PAREN)
     return PIKA_CONFIG (PIKA_FONT (pika_font_get_standard ()));
 
-  scope_id = g_type_qname (type);
+  g_scanner_get_next_token  (scanner); /* ( */
-  old_scope_id = g_scanner_set_scope (scanner, scope_id);
+  g_scanner_get_next_token  (scanner); /* "fonthash" */
+  pika_scanner_parse_string (scanner, &fonthash);
+  g_scanner_get_next_token  (scanner); /* ) */
 
-  g_scanner_scope_add_symbol (scanner, scope_id, "fonthash",
+  g_scanner_get_next_token  (scanner); /* ( */
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_FONTHASH));
+  g_scanner_get_next_token  (scanner); /* "fullname" */
-  g_scanner_scope_add_symbol (scanner, scope_id, "fullname",
+  pika_scanner_parse_string (scanner, &fullname);
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_FULLNAME));
+  g_scanner_get_next_token  (scanner); /* ) */
-  g_scanner_scope_add_symbol (scanner, scope_id, "family",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_FAMILY));
-  g_scanner_scope_add_symbol (scanner, scope_id, "style",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_STYLE));
-  g_scanner_scope_add_symbol (scanner, scope_id, "psname",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_PSNAME));
-  g_scanner_scope_add_symbol (scanner, scope_id, "index",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_INDEX));
-  g_scanner_scope_add_symbol (scanner, scope_id, "weight",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_WEIGHT));
-  g_scanner_scope_add_symbol (scanner, scope_id, "slant",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_SLANT));
-  g_scanner_scope_add_symbol (scanner, scope_id, "width",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_WIDTH));
-  g_scanner_scope_add_symbol (scanner, scope_id, "fontversion",
-                              GINT_TO_POINTER (PIKA_FONT_SYMBOL_FONTVERSION));
 
-  while (g_scanner_peek_next_token (scanner) == G_TOKEN_LEFT_PAREN)
+  g_scanner_get_next_token  (scanner); /* ( */
-    {
+  g_scanner_get_next_token  (scanner); /* "family" */
-      GTokenType token;
+  pika_scanner_parse_string (scanner, &family);
+  g_scanner_get_next_token  (scanner); /* ) */
 
-      g_scanner_get_next_token  (scanner); /* ( */
+  g_scanner_get_next_token  (scanner); /* ( */
+  g_scanner_get_next_token  (scanner); /* "style" */
+  pika_scanner_parse_string (scanner, &style);
+  g_scanner_get_next_token  (scanner); /* ) */
 
-      token = g_scanner_get_next_token (scanner);
+  g_scanner_get_next_token  (scanner); /* ( */
+  g_scanner_get_next_token  (scanner); /* "psname" */
+  pika_scanner_parse_string (scanner, &psname);
+  g_scanner_get_next_token  (scanner); /* ( */
 
-      if (token != G_TOKEN_SYMBOL)
+  g_scanner_get_next_token  (scanner); /* ( */
-        {
+  g_scanner_get_next_token  (scanner); /* "font index" */
-          /* When encountering an unknown symbol, we simply ignore its contents
+  pika_scanner_parse_int    (scanner, &index);
-           * (up to the next closing parenthese). This would allow us to load
+  g_scanner_get_next_token  (scanner); /* ) */
-           * future XCF files in case we add new fields to recognize fonts
-           * without having to bump the XCF version (just ignoring unknown
-           * fields). We still output a small message on stderr.
-           */
-          if (token == G_TOKEN_IDENTIFIER)
-            g_printerr ("%s: ignoring unknown symbol '%s'.\n", G_STRFUNC, scanner->value.v_string);
-          else
-            g_printerr ("%s: ignoring unknown token %d.\n", G_STRFUNC, token);
 
-          while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF)
+  g_scanner_get_next_token (scanner); /* ( */
-            {
+  g_scanner_get_next_token (scanner); /* "weight" */
-              if (token == G_TOKEN_RIGHT_PAREN)
+  pika_scanner_parse_int   (scanner, &weight);
-                break;
+  g_scanner_get_next_token (scanner); /* ) */
-            }
 
-          continue;
+  g_scanner_get_next_token (scanner); /* ( */
-        }
+  g_scanner_get_next_token (scanner); /* "slant" */
+  pika_scanner_parse_int   (scanner, &slant);
+  g_scanner_get_next_token (scanner); /* ) */
 
-      switch (GPOINTER_TO_INT (scanner->value.v_symbol))
+  g_scanner_get_next_token (scanner); /* ( */
-        {
+  g_scanner_get_next_token (scanner); /* "width" */
-        case PIKA_FONT_SYMBOL_FONTHASH:
+  pika_scanner_parse_int   (scanner, &width);
-          pika_scanner_parse_string (scanner, &fonthash);
+  g_scanner_get_next_token (scanner); /* ) */
-          break;
-        case PIKA_FONT_SYMBOL_FULLNAME:
-          pika_scanner_parse_string (scanner, &fullname);
-          break;
-        case PIKA_FONT_SYMBOL_FAMILY:
-          pika_scanner_parse_string (scanner, &family);
-          break;
-        case PIKA_FONT_SYMBOL_STYLE:
-          pika_scanner_parse_string (scanner, &style);
-          break;
-        case PIKA_FONT_SYMBOL_PSNAME:
-          pika_scanner_parse_string (scanner, &psname);
-          break;
-        case PIKA_FONT_SYMBOL_INDEX:
-          pika_scanner_parse_int (scanner, &index);
-          break;
-        case PIKA_FONT_SYMBOL_WEIGHT:
-          pika_scanner_parse_int (scanner, &weight);
-          break;
-        case PIKA_FONT_SYMBOL_SLANT:
-          pika_scanner_parse_int (scanner, &slant);
-          break;
-        case PIKA_FONT_SYMBOL_WIDTH:
-          pika_scanner_parse_int (scanner, &width);
-          break;
-        case PIKA_FONT_SYMBOL_FONTVERSION:
-          pika_scanner_parse_int (scanner, &fontversion);
-          break;
-        default:
-          break;
-        }
 
-      if (g_scanner_get_next_token (scanner) != G_TOKEN_RIGHT_PAREN)
+  g_scanner_get_next_token (scanner); /* ( */
-        break;
+  g_scanner_get_next_token (scanner); /* "fontversion" */
-    }
+  pika_scanner_parse_int   (scanner, &fontversion);
-
+  g_scanner_get_next_token (scanner); /* ) */
-  g_scanner_scope_remove_symbol (scanner, scope_id, "fonthash");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "fullname");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "family");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "style");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "psname");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "index");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "weight");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "slant");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "width");
-  g_scanner_scope_remove_symbol (scanner, scope_id, "fontversion");
-  g_scanner_set_scope (scanner, old_scope_id);
 
   for (i = 0; i < font_count; i++)
     {
@@ -406,10 +331,10 @@ pika_font_deserialize_create (GType     type,
 
       font = PIKA_FONT (pika_container_get_child_by_index (fonts_container, i));
 
-      if (fonthash != NULL && font->hash != NULL && !g_strcmp0 (font->hash, fonthash))
+      if (font->hash != NULL && !g_strcmp0 (font->hash, fonthash))
         {
           most_similar_font_index = i;
-          g_clear_pointer (&similar_fonts, g_list_free);
+          similar_fonts           = 1;
           break;
         }
 
@@ -417,19 +342,19 @@ pika_font_deserialize_create (GType     type,
        * hence their higher importance in measuring similarity.
        */
 
-      if (fullname != NULL && !g_strcmp0 (font->fullname, fullname))
+      if (!g_strcmp0 (font->fullname, fullname))
         current_font_similarity += 5;
 
-      if (family != NULL && !g_strcmp0 (font->family, family))
+      if (!g_strcmp0 (font->family, family))
         current_font_similarity += 5;
 
-      if (psname != NULL && font->psname != NULL && !g_strcmp0 (font->psname, psname))
+      if (font->psname != NULL && !g_strcmp0 (font->psname, psname))
         current_font_similarity += 5;
 
       if (current_font_similarity < 5)
         continue;
 
-      if (style != NULL && font->style != NULL && !g_strcmp0 (font->style, style))
+      if (font->style != NULL && !g_strcmp0 (font->style, style))
         current_font_similarity++;
 
       if (font->weight != -1 && font->weight == weight)
@@ -451,31 +376,63 @@ pika_font_deserialize_create (GType     type,
         {
           largest_similarity      = current_font_similarity;
           most_similar_font_index = i;
-          g_clear_pointer (&similar_fonts, g_list_free);
+          similar_fonts           = 1;
-          similar_fonts = g_list_prepend (similar_fonts, GINT_TO_POINTER (i));
         }
       else if (current_font_similarity == largest_similarity)
         {
-          similar_fonts = g_list_prepend (similar_fonts, GINT_TO_POINTER (i));
+          similar_fonts++;
         }
     }
 
-  /* In case there are multiple font with identical info,
+    /* In case there are multiple font with identical info,
-   * the font file hash should be used for comparison.
+     * the font file hash should be used for comparison.
-   */
+     */
-  if (g_list_length (similar_fonts) == 1)
+    if (similar_fonts > 1)
-    g_clear_pointer (&similar_fonts, g_list_free);
+      for (i = 0; i < font_count && similar_fonts > 0; i++)
-  for (iter = similar_fonts; iter; iter = iter->next)
-    {
-      i    = GPOINTER_TO_INT (iter->data);
-      font = PIKA_FONT (pika_container_get_child_by_index (fonts_container, i));
-
-      if (g_strcmp0 (pika_font_get_hash (font), fonthash) == 0)
         {
-          most_similar_font_index = i;
+          gint current_font_similarity = 0;
-          break;
+          font = PIKA_FONT (pika_container_get_child_by_index (fonts_container, i));
+
+          if (!g_strcmp0 (font->fullname, fullname))
+            current_font_similarity += 5;
+
+          if (!g_strcmp0 (font->family, family))
+            current_font_similarity += 5;
+
+          if (font->psname != NULL && !g_strcmp0 (font->psname, psname))
+            current_font_similarity += 5;
+
+          if (current_font_similarity < 5)
+            continue;
+
+          if (font->style != NULL && !g_strcmp0 (font->style, style))
+            current_font_similarity++;
+
+          if (font->weight != -1 && font->weight == weight)
+            current_font_similarity++;
+
+          if (font->width != -1 && font->width == width)
+            current_font_similarity++;
+
+          if (font->slant != -1 && font->slant == slant)
+            current_font_similarity++;
+
+          if (font->index != -1 && font->index == index)
+            current_font_similarity++;
+
+          if (font->fontversion != -1 && font->fontversion == fontversion)
+            current_font_similarity++;
+
+          if (current_font_similarity == largest_similarity)
+            {
+              if (g_strcmp0 (pika_font_get_hash (font), fonthash) == 0)
+                {
+                  most_similar_font_index = i;
+                  break;
+                }
+              similar_fonts--;
+            }
         }
-    }
 
   if (most_similar_font_index > -1)
     {
@@ -487,7 +444,6 @@ pika_font_deserialize_create (GType     type,
       font = PIKA_FONT (pika_font_get_standard ());
     }
 
-  g_list_free (similar_fonts);
   g_free (fonthash);
   g_free (fullname);
   g_free (family);

app/text/pikafontfactory.c

@@ -424,13 +424,13 @@ pika_font_factory_recursive_add_fontdir (FcConfig  *config,
           GFileType  file_type;
           GFile     *child;
 
-          if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+          if (g_file_info_get_is_hidden (info))
             {
               g_object_unref (info);
               continue;
             }
 
-          file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+          file_type = g_file_info_get_file_type (info);
           child     = g_file_enumerator_get_child (enumerator, info);
 
           if (file_type == G_FILE_TYPE_DIRECTORY)
@@ -896,4 +896,4 @@ pika_font_factory_load_names (PikaContainer *container,
   FcFontSetDestroy (fontset);
 
   pika_font_class_set_font_factory (container);
-}
+}

app/text/pikatext.c

@@ -927,7 +927,7 @@ pika_text_deserialize_property (PikaConfig *object,
     }
   else if (property_id == PROP_MARKUP)
     {
-      gchar    *markup       = NULL;
+      gchar    *markup;
       GString  *markup_str;
       PikaFont *dummy_object = g_object_new (PIKA_TYPE_FONT, NULL);
 
@@ -940,7 +940,7 @@ pika_text_deserialize_property (PikaConfig *object,
         {
           while (g_scanner_peek_next_token (scanner) == G_TOKEN_STRING)
             {
-              gchar    *markup_fontname = NULL;
+              gchar    *markup_fontname;
               gchar    *replaced_markup;
               gchar    *new_markup;
               PikaFont *font;
@@ -973,7 +973,7 @@ pika_text_deserialize_property (PikaConfig *object,
         {
           while (g_scanner_peek_next_token (scanner) == G_TOKEN_LEFT_PAREN)
             {
-              gchar    *lookupname = NULL;
+              gchar    *lookupname;
               gchar    *replaced_markup;
               gchar    *new_markup;
               PikaFont *font;
@@ -1007,7 +1007,6 @@ pika_text_deserialize_property (PikaConfig *object,
 
       g_object_unref (dummy_object);
       g_string_free  (markup_str, TRUE);
-      g_free (markup);
 
       return TRUE;
     }

app/widgets/pikahelp.c

@@ -261,7 +261,7 @@ pika_help_get_installed_languages (void)
           while ((info = g_file_enumerator_next_file (enumerator,
                                                       NULL, NULL)))
             {
-              if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
+              if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
                 {
                   GFile *locale_dir;
                   GFile *file;

app/widgets/pikaimagepropview.c

@@ -342,7 +342,7 @@ pika_image_prop_view_label_set_filesize (GtkWidget *label,
 
       if (info)
         {
-          goffset  size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+          goffset  size = g_file_info_get_size (info);
           gchar   *str  = g_format_size (size);
 
           gtk_label_set_text (GTK_LABEL (label), str);

authors.dtd

@@ -1,7 +1,7 @@
-<!-- simple DTD for GIMP authors -->
+<!-- simple DTD for PIKA authors -->
 
-<!ELEMENT gimp-authors (creator+, maintainer+, contributor+)>
+<!ELEMENT pika-authors (creator+, maintainer+, contributor+)>
-<!ATTLIST gimp-authors xmlns CDATA #FIXED "http://purl.org/dc/elements/1.1/">
+<!ATTLIST pika-authors xmlns CDATA #FIXED "http://purl.org/dc/elements/1.1/">
 
 <!ELEMENT creator (#PCDATA)>
 <!ATTLIST creator role CDATA #REQUIRED>

authors.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE gimp-authors SYSTEM "authors.dtd">
+<!DOCTYPE pika-authors SYSTEM "authors.dtd">
 
-<!-- This file is supposed to list all GIMP authors and contributors.       -->
+<!-- This file is supposed to list all PIKA authors and contributors.       -->
 <!-- It's in XML format so that it can easily be used for the About dialog. -->
 
 <!-- When changing this file, please keep the alphabetical order.           -->
 
-<gimp-authors xmlns="http://purl.org/dc/elements/1.1/">
+<pika-authors xmlns="http://purl.org/dc/elements/1.1/">
 
   <creator role="author" last-active="2.2">Spencer Kimball</creator>
   <creator role="author" last-active="1.0">Peter Mattis</creator>
@@ -367,4 +367,4 @@
   <contributor role="author" last-active="2.8">Simon Zilliken</contributor>
   <contributor role="author" last-active="2.8">Przemyslaw Zych</contributor>
   <contributor role="author" last-active="2.4">Robert Ögren</contributor>
-</gimp-authors>
+</pika-authors>

authors.xsl

@@ -13,10 +13,10 @@
     <xsl:apply-templates select="dc:contributor[contains(@role, $role)]" />
   </xsl:template>
 
-  <xsl:template match="/dc:gimp-authors">
+  <xsl:template match="/dc:pika-authors">
     <xsl:text> -- This file is generated from authors.xml, do not edit it directly. --
 
-GIMP was originally written by:
+PIKA was originally written by:
 
 </xsl:text>
     <xsl:apply-templates select="dc:creator" />
@@ -28,7 +28,7 @@ The current maintainers are:
     <xsl:apply-templates select="dc:maintainer" />
     <xsl:text>
 
-The following people have contributed code to GIMP:
+The following people have contributed code to PIKA:
 
 </xsl:text>
     <xsl:call-template name="contributor">
@@ -36,7 +36,7 @@ The following people have contributed code to GIMP:
     </xsl:call-template>
     <xsl:text>
 
-The following people have contributed art to GIMP:
+The following people have contributed art to PIKA:
 
 </xsl:text>
     <xsl:call-template name="contributor">
@@ -44,7 +44,7 @@ The following people have contributed art to GIMP:
     </xsl:call-template>
     <xsl:text>
 
-The following people have helped to document GIMP:
+The following people have helped to document PIKA:
 
 </xsl:text>
     <xsl:call-template name="contributor">

authors4pika-web.xsl

@@ -14,13 +14,13 @@
     <xsl:apply-templates select="dc:contributor[contains(@role, $role)]" />
   </xsl:template>
 
-  <xsl:template match="/dc:gimp-authors">
+  <xsl:template match="/dc:pika-authors">
     <xsl:text>Title: Authors: The People That Made it Happen
 Date: </xsl:text><xsl:value-of select="$today"/><xsl:text>
 Modified: </xsl:text><xsl:value-of select="$today"/><xsl:text>
 Author: generated from authors.xml.
 
-## GIMP was originally written by:
+## PIKA was originally written by:
 
 </xsl:text>
     <xsl:apply-templates select="dc:creator" />
@@ -30,7 +30,7 @@ Author: generated from authors.xml.
 </xsl:text>
     <xsl:apply-templates select="dc:maintainer" />
     <xsl:text>
-## The following people have contributed code to GIMP:
+## The following people have contributed code to PIKA:
 
 *Contributing patches, fixes, plugins, extensions, scripts and other [improvements to the code](/develop/).*
 
@@ -40,7 +40,7 @@ Author: generated from authors.xml.
     </xsl:call-template>
     <xsl:text>
 
-## The following people have contributed art to GIMP:
+## The following people have contributed art to PIKA:
 
 *Contributing icons, cursors, brushes, gradients, patterns, etc.*
 
@@ -50,7 +50,7 @@ Author: generated from authors.xml.
     </xsl:call-template>
     <xsl:text>
 
-## The following people have helped to document GIMP:
+## The following people have helped to document PIKA:
 
 *Contributing [documentation](/docs/).*
 

libpika/pika_pdb_headers.h

@@ -46,6 +46,7 @@
 #include <libpika/pikafont_pdb.h>
 #include <libpika/pikafonts_pdb.h>
 #include <libpika/pikafontselect_pdb.h>
+#include <libpika/pikapikarc_pdb.h>
 #include <libpika/pikagradient_pdb.h>
 #include <libpika/pikagradients_pdb.h>
 #include <libpika/pikagradientselect_pdb.h>
@@ -70,7 +71,6 @@
 #include <libpika/pikapattern_pdb.h>
 #include <libpika/pikapatterns_pdb.h>
 #include <libpika/pikapatternselect_pdb.h>
-#include <libpika/pikapikarc_pdb.h>
 #include <libpika/pikaprogress_pdb.h>
 #include <libpika/pikaresource_pdb.h>
 #include <libpika/pikaselection_pdb.h>

libpikacolor/pikacolorprofile.c

@@ -216,7 +216,7 @@ pika_color_profile_new_from_file (GFile   *file,
         {
           GInputStream *input;
 
-          length = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+          length = g_file_info_get_size (info);
           data   = g_malloc (length);
 
           g_object_unref (info);

libpikamodule/pikamoduledb.c

@@ -381,10 +381,10 @@ pika_module_db_load_directory (PikaModuleDB *db,
 
       while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
         {
-          GFileType file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+          GFileType file_type = g_file_info_get_file_type (info);
 
          if (file_type == G_FILE_TYPE_REGULAR &&
-             ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+             ! g_file_info_get_is_hidden (info))
             {
               GFile *child = g_file_enumerator_get_child (enumerator, info);
 

libpikathumb/pikathumb-utils.c

@@ -556,7 +556,7 @@ pika_thumb_file_test (const gchar *filename,
                                             G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
       if (size)
-        *size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+        *size = g_file_info_get_size (info);
 
       if (err_no)
         *err_no = 0;

plug-ins/common/file-compressor.c

@@ -1031,7 +1031,7 @@ get_file_info (GFile *file)
 
   if (info)
     {
-      size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+      size = g_file_info_get_size (info);
 
       g_object_unref (info);
     }

plug-ins/common/file-heif.c

@@ -659,7 +659,7 @@ get_file_size (GFile   *file,
                             NULL, error);
   if (info)
     {
-      size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+      size = g_file_info_get_size (info);
 
       g_object_unref (info);
     }

plug-ins/common/file-pix.c

@@ -110,8 +110,6 @@ static PikaValueArray * pix_save             (PikaProcedure        *procedure,
 
 static PikaImage      * load_image           (GFile                *file,
                                               GError              **error);
-static PikaImage      * load_esm_image       (GInputStream          *input,
-                                              GError               **error);
 static gboolean         save_image           (GFile                *file,
                                               PikaImage            *image,
                                               PikaDrawable         *drawable,
@@ -176,9 +174,9 @@ pix_create_procedure (PikaPlugIn  *plug_in,
 
       pika_procedure_set_documentation (procedure,
                                         "Loads files of the Alias|Wavefront "
-                                        "or Esm Software Pix file format",
+                                        "Pix file format",
                                         "Loads files of the Alias|Wavefront "
-                                        "or Esm Software Pix file format",
+                                        "Pix file format",
                                         name);
       pika_procedure_set_attribution (procedure,
                                       "Michael Taylor",
@@ -187,10 +185,6 @@ pix_create_procedure (PikaPlugIn  *plug_in,
 
       pika_file_procedure_set_extensions (PIKA_FILE_PROCEDURE (procedure),
                                           "pix,matte,mask,alpha,als");
-      /* Magic Number for Esm Software PIX files */
-      pika_file_procedure_set_magics (PIKA_FILE_PROCEDURE (procedure),
-                                      "0,string,Esm Software PIX file");
-
     }
   else if (! strcmp (name, SAVE_PROC))
     {
@@ -381,7 +375,7 @@ load_image (GFile   *file,
   PikaImageType      gdtype;
   guchar            *dest;
   guchar            *dest_base;
-  PikaImage         *image = NULL;
+  PikaImage         *image;
   PikaLayer         *layer;
   gushort            width, height, depth;
   gint               i, j, tile_height, row;
@@ -423,28 +417,6 @@ load_image (GFile   *file,
     }
   else
     {
-      /* Check if this is Esm Software PIX file format */
-      gchar esm_header[22];
-      gsize bytes_read;
-
-      g_seekable_seek (G_SEEKABLE (input), 0, G_SEEK_SET, NULL, NULL);
-      if (g_input_stream_read_all (input, &esm_header, sizeof (esm_header),
-                                   &bytes_read, NULL, NULL))
-        {
-          esm_header[21] = '\0';
-
-          if (g_str_has_prefix (esm_header, "Esm Software PIX file"))
-            image = load_esm_image (input, error);
-
-          if (image)
-            {
-              g_object_unref (input);
-              pika_progress_update (1.0);
-
-              return image;
-            }
-        }
-
       /* Header is invalid */
       g_object_unref (input);
       return NULL;
@@ -562,73 +534,6 @@ load_image (GFile   *file,
   return image;
 }
 
-static PikaImage *
-load_esm_image (GInputStream  *input,
-                GError       **error)
-{
-  PikaImage      *image       = NULL;
-  PikaValueArray *return_vals = NULL;
-  GFile          *temp_file   = NULL;
-  FILE           *fp;
-  goffset         file_size;
-
-  g_seekable_seek (G_SEEKABLE (input), 0, G_SEEK_END, NULL, error);
-  file_size = g_seekable_tell (G_SEEKABLE (input));
-  g_seekable_seek (G_SEEKABLE (input), 21, G_SEEK_SET, NULL, error);
-
-  /* Esm Software PIX format is just a JPEG with an extra 21 byte header */
-  temp_file = pika_temp_file ("jpeg");
-  fp = g_fopen (g_file_peek_path (temp_file), "wb");
-
-  if (! fp)
-    {
-      g_file_delete (temp_file, NULL, NULL);
-      g_object_unref (temp_file);
-
-      g_message (_("Error trying to open temporary JPEG file '%s' "
-                   "for Esm Software pix loading: %s"),
-                 pika_file_get_utf8_name (temp_file),
-                 g_strerror (errno));
-      return NULL;
-    }
-  else
-    {
-      guchar buffer[file_size - 21];
-
-      if (! g_input_stream_read_all (input, buffer, sizeof (buffer),
-                                     NULL, NULL, error))
-        {
-          g_file_delete (temp_file, NULL, NULL);
-          g_object_unref (temp_file);
-
-          g_printerr (_("Invalid Esm Software PIX file"));
-          return NULL;
-        }
-
-      fwrite (buffer, sizeof (guchar), file_size, fp);
-      fclose (fp);
-
-      return_vals =
-        pika_pdb_run_procedure (pika_get_pdb (),
-                                "file-jpeg-load",
-                                PIKA_TYPE_RUN_MODE, PIKA_RUN_NONINTERACTIVE,
-                                G_TYPE_FILE,        temp_file,
-                                G_TYPE_NONE);
-
-      if (return_vals)
-        {
-          image = g_value_get_object (pika_value_array_index (return_vals, 1));
-
-          pika_value_array_unref (return_vals);
-        }
-
-      g_file_delete (temp_file, NULL, NULL);
-      g_object_unref (temp_file);
-    }
-
-  return image;
-}
-
 /*
  *  Description:
  *      save the given file out as an alias pix or matte file

plug-ins/common/file-psp.c

@@ -1279,17 +1279,8 @@ read_color_block (FILE      *f,
     }
 
   color_palette_entries = GUINT32_FROM_LE (entry_count);
-  /* TODO: PIKA currently only supports a maximum of 256 colors
-   * in an indexed image. If this changes, we can change this check */
-  if (color_palette_entries > 256)
-    {
-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                   _("Error: Unsupported palette size"));
-      return -1;
-    }
-
   /* psp color palette entries are stored as RGBA so 4 bytes per entry
-   * where the fourth bytes is always zero */
+     where the fourth bytes is always zero */
   pal_size = color_palette_entries * 4;
   color_palette = g_malloc (pal_size);
   if (fread (color_palette, pal_size, 1, f) < 1)
@@ -1658,7 +1649,7 @@ read_channel_data (FILE        *f,
         else
           endq = q + line_width * height;
 
-        buf = g_malloc (128);
+        buf = g_malloc (127);
         while (q < endq)
           {
             fread (&runcount, 1, 1, f);

plug-ins/common/file-raw-data.c

@@ -706,7 +706,7 @@ get_file_info (GFile *file)
 
   if (info)
     {
-      size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+      size = g_file_info_get_size (info);
 
       g_object_unref (info);
     }

plug-ins/common/mail.c

@@ -396,7 +396,7 @@ send_image (GObject       *config,
       while ((info = g_file_enumerator_next_file (enumerator,
                                                   NULL, NULL)))
         {
-          if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR)
+          if (g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR)
             {
               GFile *file = g_file_enumerator_get_child (enumerator, info);
               g_file_delete (file, NULL, NULL);

plug-ins/file-jpeg/jpeg-save.c

@@ -136,7 +136,7 @@ background_jpeg_save (PreviewPersistent *pp)
 
           if (info)
             {
-              goffset  size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+              goffset  size = g_file_info_get_size (info);
               gchar   *size_text;
 
               size_text = g_format_size (size);

plug-ins/file-tiff/file-tiff-io.c

@@ -571,7 +571,7 @@ tiff_io_get_file_size (thandle_t handle)
     }
   else
     {
-      size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+      size = g_file_info_get_size (info);
       g_object_unref (info);
     }
 

plug-ins/fractal-explorer/fractal-explorer.c

@@ -1110,10 +1110,10 @@ fractalexplorer_list_load_all (const gchar *explorer_path)
 
           while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
             {
-              GFileType file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+              GFileType file_type = g_file_info_get_file_type (info);
 
               if (file_type == G_FILE_TYPE_REGULAR &&
-                  ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+                  ! g_file_info_get_is_hidden (info))
                 {
                   fractalexplorerOBJ *fractalexplorer;
                   GFile              *child;

plug-ins/gradient-flare/gradient-flare.c

@@ -1776,10 +1776,10 @@ gflares_list_load_all (void)
 
           while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
             {
-              GFileType file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+              GFileType file_type = g_file_info_get_file_type (info);
 
               if (file_type == G_FILE_TYPE_REGULAR &&
-                  ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+                  ! g_file_info_get_is_hidden (info))
                 {
                   GFlare *gflare;
                   GFile  *child;

plug-ins/help/pikahelplocale.c

@@ -262,7 +262,7 @@ pika_help_locale_parse (PikaHelpLocale    *locale,
           return FALSE;
         }
 
-      size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+      size = g_file_info_get_size (info);
 
       g_object_unref (info);
     }

plug-ins/script-fu/libscriptfu/script-fu-scripts.c

@@ -320,11 +320,11 @@ script_fu_load_directory (GFile *directory)
 
       while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)))
         {
-          GFileType file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+          GFileType file_type = g_file_info_get_file_type (info);
 
           if ((file_type == G_FILE_TYPE_REGULAR ||
                file_type == G_FILE_TYPE_DIRECTORY) &&
-              ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
+              ! g_file_info_get_is_hidden (info))
             {
               GFile *child = g_file_enumerator_get_child (enumerator, info);
 

po-plug-ins/ka.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-24 21:54+0000\n"
+"POT-Creation-Date: 2023-08-25 20:56+0000\n"
-"PO-Revision-Date: 2023-09-25 05:50+0200\n"
+"PO-Revision-Date: 2023-08-26 05:46+0200\n"
 "Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n"
 "Language-Team: Georgian <(nothing)>\n"
 "Language: ka\n"
@@ -629,7 +629,7 @@ msgstr "ვერტიკალური"
 #: plug-ins/common/file-gif-load.c:1097 plug-ins/common/file-iff.c:343
 #: plug-ins/common/file-jp2-load.c:1317 plug-ins/common/file-pcx.c:742
 #: plug-ins/common/file-pcx.c:750 plug-ins/common/file-pcx.c:758
-#: plug-ins/common/file-pix.c:450 plug-ins/common/file-png.c:950
+#: plug-ins/common/file-pix.c:422 plug-ins/common/file-png.c:950
 #: plug-ins/common/file-pnm.c:869 plug-ins/common/file-qoi.c:321
 #: plug-ins/common/file-raw-data.c:1836 plug-ins/common/file-sunras.c:1083
 #: plug-ins/common/file-tga.c:1117 plug-ins/common/file-wbmp.c:270
@@ -1224,8 +1224,8 @@ msgstr ""
 #: plug-ins/common/file-iff.c:227 plug-ins/common/file-mng.c:1407
 #: plug-ins/common/file-pcx.c:523 plug-ins/common/file-pcx.c:566
 #: plug-ins/common/file-png.c:673 plug-ins/common/file-ps.c:1126
-#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2445
+#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2436
-#: plug-ins/common/file-psp.c:2495 plug-ins/common/file-qoi.c:300
+#: plug-ins/common/file-psp.c:2486 plug-ins/common/file-qoi.c:300
 #: plug-ins/common/file-raw-data.c:514 plug-ins/common/file-raw-data.c:1673
 #: plug-ins/common/file-sunras.c:458 plug-ins/common/file-svg.c:365
 #: plug-ins/common/file-svg.c:825 plug-ins/common/file-tga.c:448
@@ -2206,7 +2206,7 @@ msgstr ""
 #: plug-ins/common/file-gegl.c:352 plug-ins/common/file-gif-load.c:402
 #: plug-ins/common/file-heif.c:877 plug-ins/common/file-jp2-load.c:1091
 #: plug-ins/common/file-pcx.c:515 plug-ins/common/file-pcx.c:558
-#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:387
+#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:381
 #: plug-ins/common/file-png.c:665 plug-ins/common/file-pnm.c:714
 #: plug-ins/common/file-ps.c:1116 plug-ins/common/file-raw-data.c:1665
 #: plug-ins/common/file-sunras.c:450 plug-ins/common/file-tga.c:440
@@ -2287,7 +2287,7 @@ msgstr ""
 #: plug-ins/common/file-cel.c:840 plug-ins/common/file-farbfeld.c:373
 #: plug-ins/common/file-gif-save.c:917 plug-ins/common/file-html-table.c:364
 #: plug-ins/common/file-jpegxl.c:1383 plug-ins/common/file-pcx.c:1114
-#: plug-ins/common/file-pix.c:655 plug-ins/common/file-png.c:1494
+#: plug-ins/common/file-pix.c:560 plug-ins/common/file-png.c:1494
 #: plug-ins/common/file-pnm.c:1635 plug-ins/common/file-ps.c:1338
 #: plug-ins/common/file-qoi.c:375 plug-ins/common/file-sunras.c:629
 #: plug-ins/common/file-tga.c:1230 plug-ins/common/file-xbm.c:1051
@@ -4004,25 +4004,14 @@ msgstr ""
 msgid "Cannot handle the size (either width or height) of the image."
 msgstr ""
 
-#: plug-ins/common/file-pix.c:171 plug-ins/common/file-pix.c:202
+#: plug-ins/common/file-pix.c:169 plug-ins/common/file-pix.c:196
 msgid "Alias Pix image"
 msgstr ""
 
-#: plug-ins/common/file-pix.c:291
+#: plug-ins/common/file-pix.c:285
 msgid "PIX format does not support multiple layers."
 msgstr ""
 
-#: plug-ins/common/file-pix.c:584
-#, c-format
-msgid ""
-"Error trying to open temporary JPEG file '%s' for Esm Software pix loading: "
-"%s"
-msgstr ""
-
-#: plug-ins/common/file-pix.c:600
-msgid "Invalid Esm Software PIX file"
-msgstr ""
-
 #: plug-ins/common/file-png.c:180 plug-ins/common/file-png.c:210
 msgid "PNG image"
 msgstr "PNG გამოსახულება"
@@ -4720,94 +4709,90 @@ msgstr ""
 msgid "Error reading color block"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:1287
+#: plug-ins/common/file-psp.c:1289
-msgid "Error: Unsupported palette size"
-msgstr "შეცდომა: მხარდაუჭერელი პალიტრის ზომა"
-
-#: plug-ins/common/file-psp.c:1298
 msgid "Error reading color palette"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:1724 plug-ins/common/file-psp.c:1738
+#: plug-ins/common/file-psp.c:1715 plug-ins/common/file-psp.c:1729
 msgid "zlib error"
 msgstr "zlib-ის შეცდომა"
 
-#: plug-ins/common/file-psp.c:1801 plug-ins/common/file-psp.c:1835
+#: plug-ins/common/file-psp.c:1792 plug-ins/common/file-psp.c:1826
-#: plug-ins/common/file-psp.c:1845
+#: plug-ins/common/file-psp.c:1836
 msgid "Error reading layer extension information"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:1822
+#: plug-ins/common/file-psp.c:1813
 msgid "Error reading block information"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:1902
+#: plug-ins/common/file-psp.c:1893
 #, c-format
 msgid "Invalid layer sub-block %s, should be LAYER"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:1933 plug-ins/common/file-psp.c:1990
+#: plug-ins/common/file-psp.c:1924 plug-ins/common/file-psp.c:1981
 msgid "Error reading layer information chunk"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2032
+#: plug-ins/common/file-psp.c:2023
 #, c-format
 msgid "Invalid layer dimensions: %dx%d"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2093
+#: plug-ins/common/file-psp.c:2084
 msgid "Error creating layer"
 msgstr "ფენის შექმნის სეცდომა"
 
-#: plug-ins/common/file-psp.c:2138
+#: plug-ins/common/file-psp.c:2129
 #, c-format
 msgid "Invalid layer sub-block %s, should be CHANNEL"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2154
+#: plug-ins/common/file-psp.c:2145
 msgid "Error reading channel information chunk"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2177
+#: plug-ins/common/file-psp.c:2168
 #, c-format
 msgid "Invalid channel type %d in channel information chunk"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2281 plug-ins/common/file-psp.c:2298
+#: plug-ins/common/file-psp.c:2272 plug-ins/common/file-psp.c:2289
 msgid "Error reading tube data chunk"
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2380 plug-ins/common/file-psp.c:2392
+#: plug-ins/common/file-psp.c:2371 plug-ins/common/file-psp.c:2383
-#: plug-ins/common/file-psp.c:2403
+#: plug-ins/common/file-psp.c:2394
 msgid "Error reading colorprofile chunk"
 msgstr "ფერის პროფილის ნაწილის წაკითხვა შეუძლებელია"
 
-#: plug-ins/common/file-psp.c:2456
+#: plug-ins/common/file-psp.c:2447
 msgid "Error reading file header."
 msgstr "ფაილის თავსართის წაკითხვის შეცდომა."
 
-#: plug-ins/common/file-psp.c:2463
+#: plug-ins/common/file-psp.c:2454
 msgid "Incorrect file signature."
 msgstr "არასწორი ფაილის ხელმოწერა."
 
-#: plug-ins/common/file-psp.c:2477
+#: plug-ins/common/file-psp.c:2468
 #, c-format
 msgid "Unsupported PSP file format version %d.%d."
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2497
+#: plug-ins/common/file-psp.c:2488
 msgid "invalid block size"
 msgstr "ბლოკის არასწორი ზომა"
 
-#: plug-ins/common/file-psp.c:2506
+#: plug-ins/common/file-psp.c:2497
 msgid "Duplicate General Image Attributes block."
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2534
+#: plug-ins/common/file-psp.c:2525
 msgid "Missing General Image Attributes block."
 msgstr ""
 
-#: plug-ins/common/file-psp.c:2653
+#: plug-ins/common/file-psp.c:2644
 msgid "Exporting not implemented yet."
 msgstr ""
 
@@ -8918,7 +8903,7 @@ msgstr ""
 #: plug-ins/file-sgi/sgi.c:655
 #, c-format
 msgid "Could not open '%s' for writing."
-msgstr "'%s'-ის ჩასაწერად გახსნის შეცდომა."
+msgstr ""
 
 #: plug-ins/file-sgi/sgi.c:745
 msgid "No compression"
@@ -11975,91 +11960,83 @@ msgstr "მონიშვნის მოხსნა"
 msgid "Unselect All"
 msgstr "მონიშვნის ყველაფერზე მოხსნა"
 
-#: plug-ins/imagemap/imap_edit_area_info.c:219
+#: plug-ins/imagemap/imap_edit_area_info.c:216
 msgid "Link Type"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:228
+#: plug-ins/imagemap/imap_edit_area_info.c:225
 msgid "_Web Site"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:234
+#: plug-ins/imagemap/imap_edit_area_info.c:231
-msgid "_FTP Site"
+msgid "_Ftp Site"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:240
+#: plug-ins/imagemap/imap_edit_area_info.c:237
 msgid "_Gopher"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:246
+#: plug-ins/imagemap/imap_edit_area_info.c:243
 msgid "Ot_her"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:252
+#: plug-ins/imagemap/imap_edit_area_info.c:249
 msgid "F_ile"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:258
+#: plug-ins/imagemap/imap_edit_area_info.c:255
 msgid "WAI_S"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:264
+#: plug-ins/imagemap/imap_edit_area_info.c:261
 msgid "Tel_net"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:270
+#: plug-ins/imagemap/imap_edit_area_info.c:267
 msgid "e-_mail"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:276
+#: plug-ins/imagemap/imap_edit_area_info.c:273
 msgid "_URL to activate when this area is clicked: (required)"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:278
+#: plug-ins/imagemap/imap_edit_area_info.c:275
 msgid "Select HTML file"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:287
+#: plug-ins/imagemap/imap_edit_area_info.c:284
 msgid "Relati_ve link"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:293
+#: plug-ins/imagemap/imap_edit_area_info.c:290
 msgid "_Target frame name/ID: (optional - used for FRAMES only)"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:296
+#: plug-ins/imagemap/imap_edit_area_info.c:293
 msgid "ALT te_xt: (optional)"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:299
+#: plug-ins/imagemap/imap_edit_area_info.c:296
-msgid "Access _Key: (optional)"
-msgstr ""
-
-#: plug-ins/imagemap/imap_edit_area_info.c:302
-msgid "Ta_b Index: (optional)"
-msgstr ""
-
-#: plug-ins/imagemap/imap_edit_area_info.c:305
 msgid "_Link"
 msgstr "_ბმული"
 
-#: plug-ins/imagemap/imap_edit_area_info.c:339
+#: plug-ins/imagemap/imap_edit_area_info.c:330
 msgid "Dimensions"
 msgstr "ზომები"
 
-#: plug-ins/imagemap/imap_edit_area_info.c:343
+#: plug-ins/imagemap/imap_edit_area_info.c:334
 msgid "Pre_view"
 msgstr "გადახედვა"
 
-#: plug-ins/imagemap/imap_edit_area_info.c:385
+#: plug-ins/imagemap/imap_edit_area_info.c:372
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: plug-ins/imagemap/imap_edit_area_info.c:490
+#: plug-ins/imagemap/imap_edit_area_info.c:471
 msgid "Area Settings"
 msgstr ""
 
-#: plug-ins/imagemap/imap_edit_area_info.c:536
+#: plug-ins/imagemap/imap_edit_area_info.c:513
 #, c-format
 msgid "Area #%d Settings"
 msgstr ""

po-plug-ins/pl.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika-plug-ins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-24 13:39+0200\n"
+"POT-Creation-Date: 2023-02-18 11:45+0100\n"
-"PO-Revision-Date: 2023-09-24 13:40+0200\n"
+"PO-Revision-Date: 2023-02-18 11:48+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -51,10 +51,10 @@ msgstr "Wyrównanie widocznych warstw"
 #: ../plug-ins/common/depth-merge.c:621 ../plug-ins/common/despeckle.c:397
 #: ../plug-ins/common/destripe.c:468 ../plug-ins/common/edge-dog.c:306
 #: ../plug-ins/common/emboss.c:453 ../plug-ins/common/file-cel.c:951
-#: ../plug-ins/common/file-gif-save.c:1127 ../plug-ins/common/file-heif.c:1927
+#: ../plug-ins/common/file-gif-save.c:1112 ../plug-ins/common/file-heif.c:1908
 #: ../plug-ins/common/file-jp2-load.c:961
 #: ../plug-ins/common/file-pdf-load.c:708
-#: ../plug-ins/common/file-pdf-load.c:1356
+#: ../plug-ins/common/file-pdf-load.c:1338
 #: ../plug-ins/common/file-pdf-save.c:1020 ../plug-ins/common/file-ps.c:3447
 #: ../plug-ins/common/file-raw-data.c:1816 ../plug-ins/common/file-svg.c:663
 #: ../plug-ins/common/file-wmf.c:515 ../plug-ins/common/film.c:1207
@@ -116,7 +116,7 @@ msgstr "_Anuluj"
 #: ../plug-ins/common/curve-bend.c:1295 ../plug-ins/common/decompose.c:814
 #: ../plug-ins/common/depth-merge.c:622 ../plug-ins/common/despeckle.c:398
 #: ../plug-ins/common/destripe.c:469 ../plug-ins/common/edge-dog.c:307
-#: ../plug-ins/common/emboss.c:454 ../plug-ins/common/file-heif.c:1928
+#: ../plug-ins/common/emboss.c:454 ../plug-ins/common/file-heif.c:1909
 #: ../plug-ins/common/file-pdf-load.c:709 ../plug-ins/common/file-svg.c:664
 #: ../plug-ins/common/file-wmf.c:516 ../plug-ins/common/film.c:1208
 #: ../plug-ins/common/filter-pack.c:1265 ../plug-ins/common/fractal-trace.c:712
@@ -380,12 +380,12 @@ msgstr "Prędkość odtwarzania"
 
 #. 2 styles of default frame disposals: cumulative layers and one frame per layer.
 #: ../plug-ins/common/animation-play.c:931
-#: ../plug-ins/common/file-gif-save.c:1336
+#: ../plug-ins/common/file-gif-save.c:1321
 msgid "Cumulative layers (combine)"
 msgstr "Kumulacja warstw (składanie)"
 
 #: ../plug-ins/common/animation-play.c:935
-#: ../plug-ins/common/file-gif-save.c:1338
+#: ../plug-ins/common/file-gif-save.c:1323
 msgid "One frame per layer (replace)"
 msgstr "Jedna klatka na warstwę (zastępowanie)"
 
@@ -1075,7 +1075,7 @@ msgstr "Wczytanie parametrów przeglądarki CML"
 #: ../plug-ins/common/file-gif-load.c:361 ../plug-ins/common/file-mng.c:1158
 #: ../plug-ins/common/file-pcx.c:378 ../plug-ins/common/file-png.c:941
 #: ../plug-ins/common/file-ps.c:1075 ../plug-ins/common/file-ps.c:3397
-#: ../plug-ins/common/file-psp.c:2237 ../plug-ins/common/file-psp.c:2287
+#: ../plug-ins/common/file-psp.c:2228 ../plug-ins/common/file-psp.c:2278
 #: ../plug-ins/common/file-raw-data.c:477
 #: ../plug-ins/common/file-raw-data.c:1284 ../plug-ins/common/file-sunras.c:436
 #: ../plug-ins/common/file-svg.c:329 ../plug-ins/common/file-svg.c:647
@@ -2145,7 +2145,7 @@ msgstr "Koniec pliku lub błąd podczas odczytywania nagłówka obrazu"
 #.
 #: ../plug-ins/common/file-cel.c:342 ../plug-ins/common/file-dicom.c:338
 #: ../plug-ins/common/file-gegl.c:322 ../plug-ins/common/file-gif-load.c:353
-#: ../plug-ins/common/file-heif.c:737 ../plug-ins/common/file-jp2-load.c:1077
+#: ../plug-ins/common/file-heif.c:703 ../plug-ins/common/file-jp2-load.c:1077
 #: ../plug-ins/common/file-pcx.c:370 ../plug-ins/common/file-pdf-load.c:1059
 #: ../plug-ins/common/file-pix.c:357 ../plug-ins/common/file-png.c:933
 #: ../plug-ins/common/file-pnm.c:566 ../plug-ins/common/file-ps.c:1067
@@ -2233,9 +2233,9 @@ msgstr "„%s”: koniec pliku lub błąd podczas odczytywania danych palety"
 #.
 #. * Open the file for writing...
 #.
-#: ../plug-ins/common/file-cel.c:790 ../plug-ins/common/file-gif-save.c:895
+#: ../plug-ins/common/file-cel.c:790 ../plug-ins/common/file-gif-save.c:880
 #: ../plug-ins/common/file-html-table.c:238
-#: ../plug-ins/common/file-jpegxl.c:787 ../plug-ins/common/file-pcx.c:761
+#: ../plug-ins/common/file-jpegxl.c:778 ../plug-ins/common/file-pcx.c:761
 #: ../plug-ins/common/file-pix.c:538 ../plug-ins/common/file-png.c:1611
 #: ../plug-ins/common/file-pnm.c:1249 ../plug-ins/common/file-ps.c:1278
 #: ../plug-ins/common/file-sunras.c:602 ../plug-ins/common/file-tga.c:1221
@@ -2442,13 +2442,13 @@ msgstr ""
 "GIF: nieudokumentowany typ łączenia %d nie jest obsługiwany. Animacja może "
 "być odtwarzana w nieoczekiwany sposób, zmieni się ona również po zapisaniu."
 
-#: ../plug-ins/common/file-gif-save.c:556
+#: ../plug-ins/common/file-gif-save.c:541
 msgid "Couldn't simply reduce colors further. Exporting as opaque."
 msgstr ""
 "Nie można w prosty sposób bardziej zredukować kolorów. Eksportowanie bez "
 "przezroczystości."
 
-#: ../plug-ins/common/file-gif-save.c:675
+#: ../plug-ins/common/file-gif-save.c:660
 #, c-format
 msgid ""
 "Unable to export '%s'.  The GIF file format does not support images that are "
@@ -2457,7 +2457,7 @@ msgstr ""
 "Nie można wyeksportować „%s”. Format GIF nie obsługuje obrazów większych niż "
 "%d pikseli wzdłuż lub wszerz."
 
-#: ../plug-ins/common/file-gif-save.c:788
+#: ../plug-ins/common/file-gif-save.c:773
 msgid ""
 "The GIF format only supports comments in 7bit ASCII encoding. No comment is "
 "saved."
@@ -2465,19 +2465,19 @@ msgstr ""
 "Format GIF obsługuje jedynie komentarze zapisane w 7-bitowym kodowaniu "
 "ASCII. Komentarz nie został zapisany."
 
-#: ../plug-ins/common/file-gif-save.c:868
+#: ../plug-ins/common/file-gif-save.c:853
 msgid ""
 "Cannot export RGB color images. Convert to indexed color or grayscale first."
 msgstr ""
 "Nie można eksportować obrazów RGB w formacie GIF. Należy najpierw "
 "skonwertować obraz do odcieni szarości lub do trybu indeksowanego."
 
-#: ../plug-ins/common/file-gif-save.c:1073
+#: ../plug-ins/common/file-gif-save.c:1058
 msgid "Delay inserted to prevent evil CPU-sucking animation."
 msgstr ""
 "Wstawiono opóźnienie, aby uniknąć animacji pochłaniającej moc procesora."
 
-#: ../plug-ins/common/file-gif-save.c:1122
+#: ../plug-ins/common/file-gif-save.c:1107
 msgid ""
 "The image you are trying to export as a GIF contains layers which extend "
 "beyond the actual borders of the image."
@@ -2485,11 +2485,11 @@ msgstr ""
 "Eksportowany obraz w formacie GIF zawiera warstwy, które wykraczają poza "
 "granice obrazu."
 
-#: ../plug-ins/common/file-gif-save.c:1128
+#: ../plug-ins/common/file-gif-save.c:1113
 msgid "Cr_op"
 msgstr "_Przytnij"
 
-#: ../plug-ins/common/file-gif-save.c:1139
+#: ../plug-ins/common/file-gif-save.c:1124
 msgid ""
 "The GIF file format does not allow this.  You may choose whether to crop all "
 "of the layers to the image borders, or cancel this export."
@@ -2497,11 +2497,11 @@ msgstr ""
 "W formacie GIF takie sytuacje nie są dopuszczalne. Można wybrać między "
 "przycięciem wszystkich warstw do granic obrazu lub anulowaniem eksportu."
 
-#: ../plug-ins/common/file-gif-save.c:1273
+#: ../plug-ins/common/file-gif-save.c:1258
 msgid "GIF"
 msgstr "GIF"
 
-#: ../plug-ins/common/file-gif-save.c:1281
+#: ../plug-ins/common/file-gif-save.c:1266
 #, c-format
 msgid ""
 "Error loading UI file '%s':\n"
@@ -2510,11 +2510,11 @@ msgstr ""
 "Błąd podczas wczytywania pliku interfejsu użytkownika „%s”:\n"
 "%s"
 
-#: ../plug-ins/common/file-gif-save.c:1334
+#: ../plug-ins/common/file-gif-save.c:1319
 msgid "I don't care"
 msgstr "Bez znaczenia"
 
-#: ../plug-ins/common/file-gif-save.c:1355
+#: ../plug-ins/common/file-gif-save.c:1340
 msgid ""
 "You can only export as animation when the image has more than one layer. The "
 "image you are trying to export only has one layer."
@@ -2523,7 +2523,7 @@ msgstr ""
 "Eksportowany obraz ma tylko jedną warstwę."
 
 #. translators: the %d is *always* 240 here
-#: ../plug-ins/common/file-gif-save.c:2571
+#: ../plug-ins/common/file-gif-save.c:2556
 #, c-format
 msgid "The default comment is limited to %d characters."
 msgstr "Długość domyślnego komentarza jest ograniczona do %d znaków."
@@ -2584,11 +2584,11 @@ msgstr "Rzędy:"
 msgid "C source code header"
 msgstr "Nagłówek kodu źródłowego języka C"
 
-#: ../plug-ins/common/file-heif.c:147
+#: ../plug-ins/common/file-heif.c:143
 msgid "Loads HEIF images"
 msgstr "Wczytuje obrazy HEIF"
 
-#: ../plug-ins/common/file-heif.c:148
+#: ../plug-ins/common/file-heif.c:144
 msgid ""
 "Load image stored in HEIF format (High Efficiency Image File Format). "
 "Typical suffices for HEIF files are .heif, .heic."
@@ -2596,95 +2596,95 @@ msgstr ""
 "Wczytywanie obrazów przechowywanych w formacie HEIF (High Efficiency Image "
 "File Format). Typowe przyrostki plików HEIF to .heif i .heic."
 
-#: ../plug-ins/common/file-heif.c:154 ../plug-ins/common/file-heif.c:183
+#: ../plug-ins/common/file-heif.c:150 ../plug-ins/common/file-heif.c:179
 msgid "HEIF/HEIC"
 msgstr "HEIF/HEIC"
 
-#: ../plug-ins/common/file-heif.c:177
+#: ../plug-ins/common/file-heif.c:173
 msgid "Exports HEIF images"
 msgstr "Eksportuje obrazy HEIF"
 
-#: ../plug-ins/common/file-heif.c:178
+#: ../plug-ins/common/file-heif.c:174
 msgid "Save image in HEIF format (High Efficiency Image File Format)."
 msgstr "Zapis obrazów w formacie HEIF (High Efficiency Image File Format)."
 
-#: ../plug-ins/common/file-heif.c:198
+#: ../plug-ins/common/file-heif.c:194
 msgid "Exports AVIF images"
 msgstr "Eksportuje obrazy AVIF"
 
-#: ../plug-ins/common/file-heif.c:199
+#: ../plug-ins/common/file-heif.c:195
 msgid "Save image in AV1 Image File Format (AVIF)"
 msgstr "Zapis obrazów w formacie AVIF (AV1 Image File Format)"
 
-#: ../plug-ins/common/file-heif.c:776 ../plug-ins/common/file-heif.c:809
+#: ../plug-ins/common/file-heif.c:742 ../plug-ins/common/file-heif.c:775
-#: ../plug-ins/common/file-heif.c:848 ../plug-ins/common/file-heif.c:914
+#: ../plug-ins/common/file-heif.c:814 ../plug-ins/common/file-heif.c:880
 #, c-format
 msgid "Loading HEIF image failed: %s"
 msgstr "Wczytanie pliku HEIF się nie powiodło: %s"
 
-#: ../plug-ins/common/file-heif.c:798
+#: ../plug-ins/common/file-heif.c:764
 msgid "Loading HEIF image failed: Input file contains no readable images"
 msgstr ""
 "Wczytanie obrazu HEIF się nie powiodło: plik wejściowy nie zawiera "
 "odczytywalnych obrazów"
 
-#: ../plug-ins/common/file-heif.c:1041
+#: ../plug-ins/common/file-heif.c:1007
 msgid "image content"
 msgstr "zawartość obrazu"
 
-#: ../plug-ins/common/file-heif.c:1361
+#: ../plug-ins/common/file-heif.c:1328
 #, c-format
 msgid "Exporting '%s' using %s encoder"
 msgstr "Eksportowanie „%s” za pomocą kodera %s"
 
-#: ../plug-ins/common/file-heif.c:1412 ../plug-ins/common/file-heif.c:1652
+#: ../plug-ins/common/file-heif.c:1379 ../plug-ins/common/file-heif.c:1633
 #, c-format
 msgid "Encoding HEIF image failed: %s"
 msgstr "Zakodowanie obrazu HEIF się nie powiodło: %s"
 
-#: ../plug-ins/common/file-heif.c:1689
+#: ../plug-ins/common/file-heif.c:1670
 #, c-format
 msgid "Writing HEIF image failed: %s"
 msgstr "Zapisanie obrazu HEIF się nie powiodło: %s"
 
-#: ../plug-ins/common/file-heif.c:1778
+#: ../plug-ins/common/file-heif.c:1759
 msgid "primary"
 msgstr "główny"
 
-#: ../plug-ins/common/file-heif.c:1923
+#: ../plug-ins/common/file-heif.c:1904
 msgid "Load HEIF Image"
 msgstr "Wczytanie obrazu HEIF"
 
-#: ../plug-ins/common/file-heif.c:1937
+#: ../plug-ins/common/file-heif.c:1918
 msgid "Select Image"
 msgstr "Wybór obrazu"
 
-#: ../plug-ins/common/file-heif.c:2103
+#: ../plug-ins/common/file-heif.c:2084
 msgid "Nearly _lossless"
 msgstr "_Prawie bezstratne"
 
-#: ../plug-ins/common/file-heif.c:2107 ../plug-ins/file-jpeg/jpeg-save.c:835
+#: ../plug-ins/common/file-heif.c:2088 ../plug-ins/file-jpeg/jpeg-save.c:835
 msgid "_Quality:"
 msgstr "_Jakość:"
 
-#: ../plug-ins/common/file-heif.c:2150
+#: ../plug-ins/common/file-heif.c:2131
 msgid "Bit depth:"
 msgstr "Głębia bitowa:"
 
-#: ../plug-ins/common/file-heif.c:2156
+#: ../plug-ins/common/file-heif.c:2137
 msgid "8 bit/channel"
 msgstr "8 bitów/kanał"
 
-#: ../plug-ins/common/file-heif.c:2157
+#: ../plug-ins/common/file-heif.c:2138
 msgid "10 bit/channel"
 msgstr "10 bitów/kanał"
 
-#: ../plug-ins/common/file-heif.c:2158
+#: ../plug-ins/common/file-heif.c:2139
 msgid "12 bit/channel"
 msgstr "12 bitów/kanał"
 
 #. Color profile
-#: ../plug-ins/common/file-heif.c:2167 ../plug-ins/file-jpeg/jpeg-save.c:974
+#: ../plug-ins/common/file-heif.c:2148 ../plug-ins/file-jpeg/jpeg-save.c:974
 #: ../plug-ins/file-webp/file-webp-dialog.c:404
 #: ../plug-ins/ui/plug-in-file-tiff.ui.h:12
 msgid "Save color _profile"
@@ -3168,49 +3168,49 @@ msgstr "%s-%s"
 msgid "%s-pages"
 msgstr "%s-stron"
 
-#: ../plug-ins/common/file-pdf-load.c:1352
+#: ../plug-ins/common/file-pdf-load.c:1334
 msgid "Import from PDF"
 msgstr "Import z PDF"
 
-#: ../plug-ins/common/file-pdf-load.c:1357 ../plug-ins/common/file-ps.c:3448
+#: ../plug-ins/common/file-pdf-load.c:1339 ../plug-ins/common/file-ps.c:3448
 #: ../plug-ins/file-tiff/file-tiff-load.c:2665
 #: ../plug-ins/metadata/metadata-editor.c:4627
 msgid "_Import"
 msgstr "Zai_mportuj"
 
-#: ../plug-ins/common/file-pdf-load.c:1390
+#: ../plug-ins/common/file-pdf-load.c:1372
 msgid "Error getting number of pages from the given PDF file."
 msgstr "Błąd podczas uzyskiwania liczby stron z podanego pliku PDF."
 
 #. "Load in reverse order" toggle button
-#: ../plug-ins/common/file-pdf-load.c:1435
+#: ../plug-ins/common/file-pdf-load.c:1416
 msgid "Load in reverse order"
 msgstr "Wczytanie w odwróconej kolejności"
 
-#: ../plug-ins/common/file-pdf-load.c:1453
+#: ../plug-ins/common/file-pdf-load.c:1434
 msgid "_Width (pixels):"
 msgstr "_Szerokość (piksele):"
 
-#: ../plug-ins/common/file-pdf-load.c:1454
+#: ../plug-ins/common/file-pdf-load.c:1435
 msgid "_Height (pixels):"
 msgstr "_Wysokość (piksele):"
 
-#: ../plug-ins/common/file-pdf-load.c:1456
+#: ../plug-ins/common/file-pdf-load.c:1437
 msgid "_Resolution:"
 msgstr "_Rozdzielczość:"
 
 #. Antialiasing
-#: ../plug-ins/common/file-pdf-load.c:1467
+#: ../plug-ins/common/file-pdf-load.c:1448
 msgid "Use _Anti-aliasing"
 msgstr "Użycie _wygładzania"
 
 #. White Background
-#: ../plug-ins/common/file-pdf-load.c:1476
+#: ../plug-ins/common/file-pdf-load.c:1457
 msgid "_Fill transparent areas with white"
 msgstr "_Wypełnienie przezroczystych obszarów białym kolorem"
 
-#: ../plug-ins/common/file-pdf-load.c:1762
+#: ../plug-ins/common/file-pdf-load.c:1743
-#: ../plug-ins/common/file-pdf-load.c:1763 ../plug-ins/common/file-svg.c:852
+#: ../plug-ins/common/file-pdf-load.c:1744 ../plug-ins/common/file-svg.c:852
 #: ../plug-ins/common/file-wmf.c:710 ../plug-ins/print/print-page-layout.c:305
 #, c-format
 msgid "pixels/%a"
@@ -3770,102 +3770,97 @@ msgstr "Błąd podczas odczytywania danych słowa kluczowego twórcy"
 msgid "Error reading color block"
 msgstr "Błąd podczas odczytywania bloku koloru"
 
-#: ../plug-ins/common/file-psp.c:1136
+#: ../plug-ins/common/file-psp.c:1138
-#, c-format
-msgid "Error: Unsupported palette size"
-msgstr "Błąd: nieobsługiwany rozmiar palety"
-
-#: ../plug-ins/common/file-psp.c:1147
 #, c-format
 msgid "Error reading color palette"
 msgstr "Błąd podczas odczytywania palety kolorów"
 
-#: ../plug-ins/common/file-psp.c:1573 ../plug-ins/common/file-psp.c:1587
+#: ../plug-ins/common/file-psp.c:1564 ../plug-ins/common/file-psp.c:1578
 #, c-format
 msgid "zlib error"
 msgstr "Błąd biblioteki zlib"
 
-#: ../plug-ins/common/file-psp.c:1650 ../plug-ins/common/file-psp.c:1684
+#: ../plug-ins/common/file-psp.c:1641 ../plug-ins/common/file-psp.c:1675
-#: ../plug-ins/common/file-psp.c:1694
+#: ../plug-ins/common/file-psp.c:1685
 #, c-format
 msgid "Error reading layer extension information"
 msgstr "Błąd podczas odczytywania informacji o rozszerzeniu warstwy"
 
-#: ../plug-ins/common/file-psp.c:1671
+#: ../plug-ins/common/file-psp.c:1662
 #, c-format
 msgid "Error reading block information"
 msgstr "Błąd podczas odczytywania informacji o bloku"
 
-#: ../plug-ins/common/file-psp.c:1751
+#: ../plug-ins/common/file-psp.c:1742
 #, c-format
 msgid "Invalid layer sub-block %s, should be LAYER"
 msgstr "Nieprawidłowy podblok %s warstwy, powinien wynosić „LAYER”"
 
-#: ../plug-ins/common/file-psp.c:1782 ../plug-ins/common/file-psp.c:1839
+#: ../plug-ins/common/file-psp.c:1773 ../plug-ins/common/file-psp.c:1830
 #, c-format
 msgid "Error reading layer information chunk"
 msgstr "Błąd podczas odczytywania fragmentu informacji o warstwie"
 
-#: ../plug-ins/common/file-psp.c:1881
+#: ../plug-ins/common/file-psp.c:1872
 #, c-format
 msgid "Invalid layer dimensions: %dx%d"
 msgstr "Nieprawidłowe wymiary warstwy: %d×%d"
 
-#: ../plug-ins/common/file-psp.c:1942
+#: ../plug-ins/common/file-psp.c:1933
 #, c-format
 msgid "Error creating layer"
 msgstr "Błąd podczas tworzenia warstwy"
 
-#: ../plug-ins/common/file-psp.c:1987
+#: ../plug-ins/common/file-psp.c:1978
 #, c-format
 msgid "Invalid layer sub-block %s, should be CHANNEL"
 msgstr "Nieprawidłowy podblok %s warstwy, powinien wynosić „CHANNEL”"
 
-#: ../plug-ins/common/file-psp.c:2003
+#: ../plug-ins/common/file-psp.c:1994
 #, c-format
 msgid "Error reading channel information chunk"
 msgstr "Błąd podczas odczytywania fragmentu informacji o kanale"
 
-#: ../plug-ins/common/file-psp.c:2026
+#: ../plug-ins/common/file-psp.c:2017
 #, c-format
 msgid "Invalid channel type %d in channel information chunk"
 msgstr "Nieprawidłowy typ kanału %d we fragmencie informacji o kanale"
 
-#: ../plug-ins/common/file-psp.c:2130 ../plug-ins/common/file-psp.c:2147
+#: ../plug-ins/common/file-psp.c:2121 ../plug-ins/common/file-psp.c:2138
 #, c-format
 msgid "Error reading tube data chunk"
 msgstr "Błąd podczas odczytywania fragmentu danych o rurze"
 
-#: ../plug-ins/common/file-psp.c:2248
+#: ../plug-ins/common/file-psp.c:2239
 #, c-format
 msgid "Error reading file header."
 msgstr "Błąd podczas odczytywania nagłówka pliku."
 
-#: ../plug-ins/common/file-psp.c:2255
+#: ../plug-ins/common/file-psp.c:2246
 #, c-format
 msgid "Incorrect file signature."
 msgstr "Niepoprawny podpis pliku."
 
-#: ../plug-ins/common/file-psp.c:2269
+#: ../plug-ins/common/file-psp.c:2260
 #, c-format
 msgid "Unsupported PSP file format version %d.%d."
 msgstr "Nieobsługiwana wersja formatu pliku PSP %d.%d."
 
-#: ../plug-ins/common/file-psp.c:2289
+#: ../plug-ins/common/file-psp.c:2280
 msgid "invalid block size"
 msgstr "nieprawidłowy rozmiar bloku"
 
-#: ../plug-ins/common/file-psp.c:2298
+#: ../plug-ins/common/file-psp.c:2289
 #, c-format
 msgid "Duplicate General Image Attributes block."
 msgstr "Podwójny blok ogólnych atrybutów obrazu."
 
-#: ../plug-ins/common/file-psp.c:2328
+#: ../plug-ins/common/file-psp.c:2319
 #, c-format
 msgid "Missing General Image Attributes block."
 msgstr "Brak bloku ogólnych atrybutów obrazu."
 
-#: ../plug-ins/common/file-psp.c:2442
+#: ../plug-ins/common/file-psp.c:2433
 #, c-format
 msgid "Exporting not implemented yet."
 msgstr "Eksportowanie nie jest jeszcze zaimplementowane."
@@ -4125,8 +4120,8 @@ msgstr "Nie można wykonywać tego działania na nieznanych typach obrazów"
 #: ../plug-ins/common/file-sunras.c:1158 ../plug-ins/common/file-sunras.c:1252
 #: ../plug-ins/common/file-sunras.c:1335 ../plug-ins/common/file-sunras.c:1434
 #: ../plug-ins/common/file-xwd.c:1429 ../plug-ins/common/file-xwd.c:1532
-#: ../plug-ins/common/file-xwd.c:1691 ../plug-ins/common/file-xwd.c:1914
+#: ../plug-ins/common/file-xwd.c:1691 ../plug-ins/common/file-xwd.c:1906
-#: ../plug-ins/common/file-xwd.c:2072 ../plug-ins/common/file-xwd.c:2335
+#: ../plug-ins/common/file-xwd.c:2064 ../plug-ins/common/file-xwd.c:2327
 #: ../plug-ins/file-fits/fits.c:804
 msgid "EOF encountered on reading"
 msgstr "Podczas odczytu napotkano koniec pliku"
@@ -4726,7 +4721,7 @@ msgstr "Nie można otworzyć pliku „%s” do zapisania: "
 msgid "Error exporting '%s': "
 msgstr "Błąd podczas eksportowania pliku „%s”: "
 
-#: ../plug-ins/common/file-xwd.c:1770 ../plug-ins/common/file-xwd.c:2168
+#: ../plug-ins/common/file-xwd.c:1762 ../plug-ins/common/file-xwd.c:2160
 #, c-format
 msgid "XWD-file %s is corrupt."
 msgstr "Plik XWD %s jest uszkodzony."

po-plug-ins/sl.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika-plug-ins master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-23 22:01+0000\n"
+"POT-Creation-Date: 2023-09-02 03:31+0000\n"
-"PO-Revision-Date: 2023-09-24 08:13+0200\n"
+"PO-Revision-Date: 2023-09-02 22:38+0200\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language: sl\n"
@@ -646,7 +646,7 @@ msgstr "Navpične"
 #: plug-ins/common/file-gif-load.c:1097 plug-ins/common/file-iff.c:343
 #: plug-ins/common/file-jp2-load.c:1317 plug-ins/common/file-pcx.c:742
 #: plug-ins/common/file-pcx.c:750 plug-ins/common/file-pcx.c:758
-#: plug-ins/common/file-pix.c:450 plug-ins/common/file-png.c:950
+#: plug-ins/common/file-pix.c:422 plug-ins/common/file-png.c:950
 #: plug-ins/common/file-pnm.c:869 plug-ins/common/file-qoi.c:321
 #: plug-ins/common/file-raw-data.c:1836 plug-ins/common/file-sunras.c:1083
 #: plug-ins/common/file-tga.c:1117 plug-ins/common/file-wbmp.c:270
@@ -1245,8 +1245,8 @@ msgstr "Naloži parametre raziskovalca MZP"
 #: plug-ins/common/file-iff.c:227 plug-ins/common/file-mng.c:1407
 #: plug-ins/common/file-pcx.c:523 plug-ins/common/file-pcx.c:566
 #: plug-ins/common/file-png.c:673 plug-ins/common/file-ps.c:1126
-#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2445
+#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2436
-#: plug-ins/common/file-psp.c:2495 plug-ins/common/file-qoi.c:300
+#: plug-ins/common/file-psp.c:2486 plug-ins/common/file-qoi.c:300
 #: plug-ins/common/file-raw-data.c:514 plug-ins/common/file-raw-data.c:1673
 #: plug-ins/common/file-sunras.c:458 plug-ins/common/file-svg.c:365
 #: plug-ins/common/file-svg.c:825 plug-ins/common/file-tga.c:448
@@ -2251,7 +2251,7 @@ msgstr "EOF ali napaka pri branju zaglavja slike"
 #: plug-ins/common/file-gegl.c:352 plug-ins/common/file-gif-load.c:402
 #: plug-ins/common/file-heif.c:877 plug-ins/common/file-jp2-load.c:1091
 #: plug-ins/common/file-pcx.c:515 plug-ins/common/file-pcx.c:558
-#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:387
+#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:381
 #: plug-ins/common/file-png.c:665 plug-ins/common/file-pnm.c:714
 #: plug-ins/common/file-ps.c:1116 plug-ins/common/file-raw-data.c:1665
 #: plug-ins/common/file-sunras.c:450 plug-ins/common/file-tga.c:440
@@ -2334,7 +2334,7 @@ msgstr "»%s«: EOF ali napaka pri branju podatkov palete"
 #: plug-ins/common/file-cel.c:840 plug-ins/common/file-farbfeld.c:373
 #: plug-ins/common/file-gif-save.c:917 plug-ins/common/file-html-table.c:364
 #: plug-ins/common/file-jpegxl.c:1383 plug-ins/common/file-pcx.c:1114
-#: plug-ins/common/file-pix.c:655 plug-ins/common/file-png.c:1494
+#: plug-ins/common/file-pix.c:560 plug-ins/common/file-png.c:1494
 #: plug-ins/common/file-pnm.c:1635 plug-ins/common/file-ps.c:1338
 #: plug-ins/common/file-qoi.c:375 plug-ins/common/file-sunras.c:629
 #: plug-ins/common/file-tga.c:1230 plug-ins/common/file-xbm.c:1051
@@ -4116,27 +4116,14 @@ msgstr "Napaka! Če želite shraniti datoteko, morate dodati vsaj eno sliko!"
 msgid "Cannot handle the size (either width or height) of the image."
 msgstr "Velikosti slike ni mogoče obvladati (širina ali višina)."
 
-#: plug-ins/common/file-pix.c:171 plug-ins/common/file-pix.c:202
+#: plug-ins/common/file-pix.c:169 plug-ins/common/file-pix.c:196
 msgid "Alias Pix image"
 msgstr "Slika Alias PIX"
 
-#: plug-ins/common/file-pix.c:291
+#: plug-ins/common/file-pix.c:285
 msgid "PIX format does not support multiple layers."
 msgstr "Zapis PIX ne podpira več plasti."
 
-#: plug-ins/common/file-pix.c:584
-#, c-format
-msgid ""
-"Error trying to open temporary JPEG file '%s' for Esm Software pix loading: "
-"%s"
-msgstr ""
-"Napaka pri odpiranju začasne datoteke JPEG »%s« pri nalaganju zapisa Esm "
-"Software PIX: %s"
-
-#: plug-ins/common/file-pix.c:600
-msgid "Invalid Esm Software PIX file"
-msgstr "Neveljavna datoteka Esm Software PIX"
-
 #: plug-ins/common/file-png.c:180 plug-ins/common/file-png.c:210
 msgid "PNG image"
 msgstr "Slika PNG"
@@ -4848,94 +4835,90 @@ msgstr "Napaka pri branju podatkov ključnih besed ustvarjalca"
 msgid "Error reading color block"
 msgstr "Napaka pri branju barvnega bloka"
 
-#: plug-ins/common/file-psp.c:1287
+#: plug-ins/common/file-psp.c:1289
-msgid "Error: Unsupported palette size"
-msgstr "Napaka: nepodprta velikost palete"
-
-#: plug-ins/common/file-psp.c:1298
 msgid "Error reading color palette"
 msgstr "Napaka pri branju barvne palete"
 
-#: plug-ins/common/file-psp.c:1724 plug-ins/common/file-psp.c:1738
+#: plug-ins/common/file-psp.c:1715 plug-ins/common/file-psp.c:1729
 msgid "zlib error"
 msgstr "Napaka zlib"
 
-#: plug-ins/common/file-psp.c:1801 plug-ins/common/file-psp.c:1835
+#: plug-ins/common/file-psp.c:1792 plug-ins/common/file-psp.c:1826
-#: plug-ins/common/file-psp.c:1845
+#: plug-ins/common/file-psp.c:1836
 msgid "Error reading layer extension information"
 msgstr "Napaka pri branju podatkov o razšrijenosti plasti."
 
-#: plug-ins/common/file-psp.c:1822
+#: plug-ins/common/file-psp.c:1813
 msgid "Error reading block information"
 msgstr "Napaka pri branju kosa podatkov."
 
-#: plug-ins/common/file-psp.c:1902
+#: plug-ins/common/file-psp.c:1893
 #, c-format
 msgid "Invalid layer sub-block %s, should be LAYER"
 msgstr "Neveljaven podblok plasti %s, mora biti LAYER"
 
-#: plug-ins/common/file-psp.c:1933 plug-ins/common/file-psp.c:1990
+#: plug-ins/common/file-psp.c:1924 plug-ins/common/file-psp.c:1981
 msgid "Error reading layer information chunk"
 msgstr "Napaka pri branju kosa podatkov o plasti"
 
-#: plug-ins/common/file-psp.c:2032
+#: plug-ins/common/file-psp.c:2023
 #, c-format
 msgid "Invalid layer dimensions: %dx%d"
 msgstr "Neveljavne dimenzije plasti: %dx%d"
 
-#: plug-ins/common/file-psp.c:2093
+#: plug-ins/common/file-psp.c:2084
 msgid "Error creating layer"
 msgstr "Napaka pri ustvarjanju plasti"
 
-#: plug-ins/common/file-psp.c:2138
+#: plug-ins/common/file-psp.c:2129
 #, c-format
 msgid "Invalid layer sub-block %s, should be CHANNEL"
 msgstr "Neveljaven podblok plasti %s, mora biti CHANNEL"
 
-#: plug-ins/common/file-psp.c:2154
+#: plug-ins/common/file-psp.c:2145
 msgid "Error reading channel information chunk"
 msgstr "Napaka pri branju kosa podatkov o kanalu"
 
-#: plug-ins/common/file-psp.c:2177
+#: plug-ins/common/file-psp.c:2168
 #, c-format
 msgid "Invalid channel type %d in channel information chunk"
 msgstr "Neveljavna vrsta kanala %d v informacijskem koščku kanala"
 
-#: plug-ins/common/file-psp.c:2281 plug-ins/common/file-psp.c:2298
+#: plug-ins/common/file-psp.c:2272 plug-ins/common/file-psp.c:2289
 msgid "Error reading tube data chunk"
 msgstr "Napaka pri branju kosa podatkov o cevi"
 
-#: plug-ins/common/file-psp.c:2380 plug-ins/common/file-psp.c:2392
+#: plug-ins/common/file-psp.c:2371 plug-ins/common/file-psp.c:2383
-#: plug-ins/common/file-psp.c:2403
+#: plug-ins/common/file-psp.c:2394
 msgid "Error reading colorprofile chunk"
 msgstr "Napaka pri branju kosa podatkov o barvnem profilu"
 
-#: plug-ins/common/file-psp.c:2456
+#: plug-ins/common/file-psp.c:2447
 msgid "Error reading file header."
 msgstr "Napaka pri branju glave datoteke."
 
-#: plug-ins/common/file-psp.c:2463
+#: plug-ins/common/file-psp.c:2454
 msgid "Incorrect file signature."
 msgstr "Neveljaven podpis datoteke."
 
-#: plug-ins/common/file-psp.c:2477
+#: plug-ins/common/file-psp.c:2468
 #, c-format
 msgid "Unsupported PSP file format version %d.%d."
 msgstr "Nepodprta različica datoteke vrste PSP %d.%d."
 
-#: plug-ins/common/file-psp.c:2497
+#: plug-ins/common/file-psp.c:2488
 msgid "invalid block size"
 msgstr "neveljavna velikost bloka"
 
-#: plug-ins/common/file-psp.c:2506
+#: plug-ins/common/file-psp.c:2497
 msgid "Duplicate General Image Attributes block."
 msgstr "Podvojeni blok splošnih atributov slike."
 
-#: plug-ins/common/file-psp.c:2534
+#: plug-ins/common/file-psp.c:2525
 msgid "Missing General Image Attributes block."
 msgstr "Manjkajoči blok splošnih atributov slike."
 
-#: plug-ins/common/file-psp.c:2653
+#: plug-ins/common/file-psp.c:2644
 msgid "Exporting not implemented yet."
 msgstr "Izvoz še ni implementiran."
 

po-plug-ins/uk.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika-plug-ins\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-24 13:35+0000\n"
+"POT-Creation-Date: 2023-09-02 03:31+0000\n"
-"PO-Revision-Date: 2023-09-24 18:52+0300\n"
+"PO-Revision-Date: 2023-09-02 19:26+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
 "Language: uk\n"
@@ -644,7 +644,7 @@ msgstr "Вертикально"
 #: plug-ins/common/file-gif-load.c:1097 plug-ins/common/file-iff.c:343
 #: plug-ins/common/file-jp2-load.c:1317 plug-ins/common/file-pcx.c:742
 #: plug-ins/common/file-pcx.c:750 plug-ins/common/file-pcx.c:758
-#: plug-ins/common/file-pix.c:450 plug-ins/common/file-png.c:950
+#: plug-ins/common/file-pix.c:422 plug-ins/common/file-png.c:950
 #: plug-ins/common/file-pnm.c:869 plug-ins/common/file-qoi.c:321
 #: plug-ins/common/file-raw-data.c:1836 plug-ins/common/file-sunras.c:1083
 #: plug-ins/common/file-tga.c:1117 plug-ins/common/file-wbmp.c:270
@@ -1245,8 +1245,8 @@ msgstr "Завантажити параметри CML Explorer"
 #: plug-ins/common/file-iff.c:227 plug-ins/common/file-mng.c:1407
 #: plug-ins/common/file-pcx.c:523 plug-ins/common/file-pcx.c:566
 #: plug-ins/common/file-png.c:673 plug-ins/common/file-ps.c:1126
-#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2445
+#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2436
-#: plug-ins/common/file-psp.c:2495 plug-ins/common/file-qoi.c:300
+#: plug-ins/common/file-psp.c:2486 plug-ins/common/file-qoi.c:300
 #: plug-ins/common/file-raw-data.c:514 plug-ins/common/file-raw-data.c:1673
 #: plug-ins/common/file-sunras.c:458 plug-ins/common/file-svg.c:365
 #: plug-ins/common/file-svg.c:825 plug-ins/common/file-tga.c:448
@@ -2255,7 +2255,7 @@ msgstr "Кінець файлу або помилка при читанні за
 #: plug-ins/common/file-gegl.c:352 plug-ins/common/file-gif-load.c:402
 #: plug-ins/common/file-heif.c:877 plug-ins/common/file-jp2-load.c:1091
 #: plug-ins/common/file-pcx.c:515 plug-ins/common/file-pcx.c:558
-#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:387
+#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:381
 #: plug-ins/common/file-png.c:665 plug-ins/common/file-pnm.c:714
 #: plug-ins/common/file-ps.c:1116 plug-ins/common/file-raw-data.c:1665
 #: plug-ins/common/file-sunras.c:450 plug-ins/common/file-tga.c:440
@@ -2338,7 +2338,7 @@ msgstr "«%s»: Кінець файлу або помилка при читан
 #: plug-ins/common/file-cel.c:840 plug-ins/common/file-farbfeld.c:373
 #: plug-ins/common/file-gif-save.c:917 plug-ins/common/file-html-table.c:364
 #: plug-ins/common/file-jpegxl.c:1383 plug-ins/common/file-pcx.c:1114
-#: plug-ins/common/file-pix.c:655 plug-ins/common/file-png.c:1494
+#: plug-ins/common/file-pix.c:560 plug-ins/common/file-png.c:1494
 #: plug-ins/common/file-pnm.c:1635 plug-ins/common/file-ps.c:1338
 #: plug-ins/common/file-qoi.c:375 plug-ins/common/file-sunras.c:629
 #: plug-ins/common/file-tga.c:1230 plug-ins/common/file-xbm.c:1051
@@ -4137,28 +4137,14 @@ msgstr ""
 msgid "Cannot handle the size (either width or height) of the image."
 msgstr "Неможливо опрацювати розмір (ширину чи висоту) зображення."
 
-#: plug-ins/common/file-pix.c:171 plug-ins/common/file-pix.c:202
+#: plug-ins/common/file-pix.c:169 plug-ins/common/file-pix.c:196
 msgid "Alias Pix image"
 msgstr "Зображення Alias Pix"
 
-#: plug-ins/common/file-pix.c:291
+#: plug-ins/common/file-pix.c:285
 msgid "PIX format does not support multiple layers."
 msgstr "Для формату PIX не передбачено підтримку декількох шарів."
 
-#: plug-ins/common/file-pix.c:584
-#, c-format
-#| msgid "Error trying to open temporary file '%s' for parasite loading: %s"
-msgid ""
-"Error trying to open temporary JPEG file '%s' for Esm Software pix loading: "
-"%s"
-msgstr ""
-"Помилка при відкриванні тимчасового файла JPEG «%s» для завантаження PIX Esm"
-" Software: %s"
-
-#: plug-ins/common/file-pix.c:600
-msgid "Invalid Esm Software PIX file"
-msgstr "Некоректний файл PIX Esm Software"
-
 #: plug-ins/common/file-png.c:180 plug-ins/common/file-png.c:210
 msgid "PNG image"
 msgstr "Зображення PNG"
@@ -4888,95 +4874,90 @@ msgstr "Помилка зчитування даних ключового сло
 msgid "Error reading color block"
 msgstr "Помилка під час читання блоку кольорів"
 
-#: plug-ins/common/file-psp.c:1287
+#: plug-ins/common/file-psp.c:1289
-#| msgid "Error reading palette. "
-msgid "Error: Unsupported palette size"
-msgstr "Помилка: непідтримуваний розмір палітри"
-
-#: plug-ins/common/file-psp.c:1298
 msgid "Error reading color palette"
 msgstr "Помилка під час читання палітри кольорів"
 
-#: plug-ins/common/file-psp.c:1724 plug-ins/common/file-psp.c:1738
+#: plug-ins/common/file-psp.c:1715 plug-ins/common/file-psp.c:1729
 msgid "zlib error"
 msgstr "Помилка zlib"
 
-#: plug-ins/common/file-psp.c:1801 plug-ins/common/file-psp.c:1835
+#: plug-ins/common/file-psp.c:1792 plug-ins/common/file-psp.c:1826
-#: plug-ins/common/file-psp.c:1845
+#: plug-ins/common/file-psp.c:1836
 msgid "Error reading layer extension information"
 msgstr "Помилка зчитування даних щодо розширення шару"
 
-#: plug-ins/common/file-psp.c:1822
+#: plug-ins/common/file-psp.c:1813
 msgid "Error reading block information"
 msgstr "Помилка зчитування блокових даних"
 
-#: plug-ins/common/file-psp.c:1902
+#: plug-ins/common/file-psp.c:1893
 #, c-format
 msgid "Invalid layer sub-block %s, should be LAYER"
 msgstr "Хибний підблок шару %s, має бути LAYER"
 
-#: plug-ins/common/file-psp.c:1933 plug-ins/common/file-psp.c:1990
+#: plug-ins/common/file-psp.c:1924 plug-ins/common/file-psp.c:1981
 msgid "Error reading layer information chunk"
 msgstr "Помилка зчитування інформаційного сегменту шару"
 
-#: plug-ins/common/file-psp.c:2032
+#: plug-ins/common/file-psp.c:2023
 #, c-format
 msgid "Invalid layer dimensions: %dx%d"
 msgstr "Хибні розміри шару: %dx%d"
 
-#: plug-ins/common/file-psp.c:2093
+#: plug-ins/common/file-psp.c:2084
 msgid "Error creating layer"
 msgstr "Помилка при створенні шару"
 
-#: plug-ins/common/file-psp.c:2138
+#: plug-ins/common/file-psp.c:2129
 #, c-format
 msgid "Invalid layer sub-block %s, should be CHANNEL"
 msgstr "Хибний підблок %s шару, має бути CHANNEL"
 
-#: plug-ins/common/file-psp.c:2154
+#: plug-ins/common/file-psp.c:2145
 msgid "Error reading channel information chunk"
 msgstr "Помилка читання фрагмента інформації каналу"
 
-#: plug-ins/common/file-psp.c:2177
+#: plug-ins/common/file-psp.c:2168
 #, c-format
 msgid "Invalid channel type %d in channel information chunk"
 msgstr "Хибний тип каналу %d у фрагменті інформації каналу"
 
-#: plug-ins/common/file-psp.c:2281 plug-ins/common/file-psp.c:2298
+#: plug-ins/common/file-psp.c:2272 plug-ins/common/file-psp.c:2289
 msgid "Error reading tube data chunk"
 msgstr "Помилка при читання фрагмента даних тюбика"
 
-#: plug-ins/common/file-psp.c:2380 plug-ins/common/file-psp.c:2392
+#: plug-ins/common/file-psp.c:2371 plug-ins/common/file-psp.c:2383
-#: plug-ins/common/file-psp.c:2403
+#: plug-ins/common/file-psp.c:2394
 msgid "Error reading colorprofile chunk"
 msgstr "Помилка під час читання фрагмента профілю кольорів"
 
-#: plug-ins/common/file-psp.c:2456
+#: plug-ins/common/file-psp.c:2447
 msgid "Error reading file header."
 msgstr "Помилка при читанні заголовка файлу."
 
-#: plug-ins/common/file-psp.c:2463
+#: plug-ins/common/file-psp.c:2454
 msgid "Incorrect file signature."
 msgstr "Хибна сигнатура файлу."
 
-#: plug-ins/common/file-psp.c:2477
+#: plug-ins/common/file-psp.c:2468
 #, c-format
 msgid "Unsupported PSP file format version %d.%d."
 msgstr "Непідтримувана версія формату файлу PSP %d.%d."
 
-#: plug-ins/common/file-psp.c:2497
+#: plug-ins/common/file-psp.c:2488
 msgid "invalid block size"
 msgstr "хибний розмір блока"
 
-#: plug-ins/common/file-psp.c:2506
+#: plug-ins/common/file-psp.c:2497
 msgid "Duplicate General Image Attributes block."
 msgstr "Повторний блок загальних атрибутів зображення."
 
-#: plug-ins/common/file-psp.c:2534
+#: plug-ins/common/file-psp.c:2525
 msgid "Missing General Image Attributes block."
 msgstr "Відсутній блок загальних атрибутів зображення."
 
-#: plug-ins/common/file-psp.c:2653
+#: plug-ins/common/file-psp.c:2644
 msgid "Exporting not implemented yet."
 msgstr "Експорт ще не реалізовано."
 
@@ -12475,6 +12456,7 @@ msgid "_Web Site"
 msgstr "_Веб-сторінка"
 
 #: plug-ins/imagemap/imap_edit_area_info.c:234
+#| msgid "_Ftp Site"
 msgid "_FTP Site"
 msgstr "_FTP-сайт"
 
@@ -12523,10 +12505,12 @@ msgid "ALT te_xt: (optional)"
 msgstr "_Текст ALT: (необов'язково)"
 
 #: plug-ins/imagemap/imap_edit_area_info.c:299
+#| msgid "ALT te_xt: (optional)"
 msgid "Access _Key: (optional)"
 msgstr "К_люч доступу: (необов'язковий)"
 
 #: plug-ins/imagemap/imap_edit_area_info.c:302
+#| msgid "ALT te_xt: (optional)"
 msgid "Ta_b Index: (optional)"
 msgstr "_Індекс вкладки: (необов'язковий)"
 

po-plug-ins/zh_CN.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika-plug-ins HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-23 22:01+0000\n"
+"POT-Creation-Date: 2023-09-02 03:31+0000\n"
-"PO-Revision-Date: 2023-09-24 19:40+0800\n"
+"PO-Revision-Date: 2023-09-03 19:34+0800\n"
 "Last-Translator: lumingzh <lumingzh@qq.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Gtranslator 45.1\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: extensions/goat-exercises/goat-exercise-c.c:114
 msgid "Exercise in _C minor"
@@ -134,8 +134,8 @@ msgstr "运行(_R)"
 #, c-format, python-format, lua-format
 msgid ""
 "This plug-in is an exercise in '%s' to demo plug-in creation.\n"
-"Check out the last version of the source code online by clicking the "
+"Check out the last version of the source code online by clicking the \"Source"
-"\"Source\" button."
+"\" button."
 msgstr ""
 "该插件是用于演示插件创建的“%s”中的一个练习。\n"
 "点击“源代码”按钮可以查看最新版本的在线源代码。"
@@ -639,7 +639,7 @@ msgstr "竖直"
 #: plug-ins/common/file-gif-load.c:1097 plug-ins/common/file-iff.c:343
 #: plug-ins/common/file-jp2-load.c:1317 plug-ins/common/file-pcx.c:742
 #: plug-ins/common/file-pcx.c:750 plug-ins/common/file-pcx.c:758
-#: plug-ins/common/file-pix.c:450 plug-ins/common/file-png.c:950
+#: plug-ins/common/file-pix.c:422 plug-ins/common/file-png.c:950
 #: plug-ins/common/file-pnm.c:869 plug-ins/common/file-qoi.c:321
 #: plug-ins/common/file-raw-data.c:1836 plug-ins/common/file-sunras.c:1083
 #: plug-ins/common/file-tga.c:1117 plug-ins/common/file-wbmp.c:270
@@ -1237,8 +1237,8 @@ msgstr "加载 CML 探索器参数"
 #: plug-ins/common/file-iff.c:227 plug-ins/common/file-mng.c:1407
 #: plug-ins/common/file-pcx.c:523 plug-ins/common/file-pcx.c:566
 #: plug-ins/common/file-png.c:673 plug-ins/common/file-ps.c:1126
-#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2445
+#: plug-ins/common/file-ps.c:3636 plug-ins/common/file-psp.c:2436
-#: plug-ins/common/file-psp.c:2495 plug-ins/common/file-qoi.c:300
+#: plug-ins/common/file-psp.c:2486 plug-ins/common/file-qoi.c:300
 #: plug-ins/common/file-raw-data.c:514 plug-ins/common/file-raw-data.c:1673
 #: plug-ins/common/file-sunras.c:458 plug-ins/common/file-svg.c:365
 #: plug-ins/common/file-svg.c:825 plug-ins/common/file-tga.c:448
@@ -2224,7 +2224,7 @@ msgstr "读取图像头部信息时遇到文件尾或错误"
 #: plug-ins/common/file-gegl.c:352 plug-ins/common/file-gif-load.c:402
 #: plug-ins/common/file-heif.c:877 plug-ins/common/file-jp2-load.c:1091
 #: plug-ins/common/file-pcx.c:515 plug-ins/common/file-pcx.c:558
-#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:387
+#: plug-ins/common/file-pdf-load.c:879 plug-ins/common/file-pix.c:381
 #: plug-ins/common/file-png.c:665 plug-ins/common/file-pnm.c:714
 #: plug-ins/common/file-ps.c:1116 plug-ins/common/file-raw-data.c:1665
 #: plug-ins/common/file-sunras.c:450 plug-ins/common/file-tga.c:440
@@ -2305,7 +2305,7 @@ msgstr "“%s”：读取色板数据时遇到文件尾或错误"
 #: plug-ins/common/file-cel.c:840 plug-ins/common/file-farbfeld.c:373
 #: plug-ins/common/file-gif-save.c:917 plug-ins/common/file-html-table.c:364
 #: plug-ins/common/file-jpegxl.c:1383 plug-ins/common/file-pcx.c:1114
-#: plug-ins/common/file-pix.c:655 plug-ins/common/file-png.c:1494
+#: plug-ins/common/file-pix.c:560 plug-ins/common/file-png.c:1494
 #: plug-ins/common/file-pnm.c:1635 plug-ins/common/file-ps.c:1338
 #: plug-ins/common/file-qoi.c:375 plug-ins/common/file-sunras.c:629
 #: plug-ins/common/file-tga.c:1230 plug-ins/common/file-xbm.c:1051
@@ -4048,25 +4048,14 @@ msgstr "错误！为了保存该文件，应该添加至少一副图像！"
 msgid "Cannot handle the size (either width or height) of the image."
 msgstr "无法处理该图像的尺寸（无论宽度或高度）。"
 
-#: plug-ins/common/file-pix.c:171 plug-ins/common/file-pix.c:202
+#: plug-ins/common/file-pix.c:169 plug-ins/common/file-pix.c:196
 msgid "Alias Pix image"
 msgstr "别名 Pix 图像"
 
-#: plug-ins/common/file-pix.c:291
+#: plug-ins/common/file-pix.c:285
 msgid "PIX format does not support multiple layers."
 msgstr "PIX 格式不支持多图层。"
 
-#: plug-ins/common/file-pix.c:584
-#, c-format
-msgid ""
-"Error trying to open temporary JPEG file '%s' for Esm Software pix loading: "
-"%s"
-msgstr "试图打开临时 JPEG 文件“%s”用于加载 Esm 软件的 pix 文件时出错：%s"
-
-#: plug-ins/common/file-pix.c:600
-msgid "Invalid Esm Software PIX file"
-msgstr "无效的 Esm 软件 PIX 文件"
-
 #: plug-ins/common/file-png.c:180 plug-ins/common/file-png.c:210
 msgid "PNG image"
 msgstr "PNG 图像"
@@ -4768,94 +4757,90 @@ msgstr "读取创建者关键词数据出错"
 msgid "Error reading color block"
 msgstr "读取颜色数据块时出错"
 
-#: plug-ins/common/file-psp.c:1287
+#: plug-ins/common/file-psp.c:1289
-msgid "Error: Unsupported palette size"
-msgstr "错误：不支持的色板大小"
-
-#: plug-ins/common/file-psp.c:1298
 msgid "Error reading color palette"
 msgstr "读取颜色色板时出错"
 
-#: plug-ins/common/file-psp.c:1724 plug-ins/common/file-psp.c:1738
+#: plug-ins/common/file-psp.c:1715 plug-ins/common/file-psp.c:1729
 msgid "zlib error"
 msgstr "zlib 错误"
 
-#: plug-ins/common/file-psp.c:1801 plug-ins/common/file-psp.c:1835
+#: plug-ins/common/file-psp.c:1792 plug-ins/common/file-psp.c:1826
-#: plug-ins/common/file-psp.c:1845
+#: plug-ins/common/file-psp.c:1836
 msgid "Error reading layer extension information"
 msgstr "读取图层扩展信息时出错"
 
-#: plug-ins/common/file-psp.c:1822
+#: plug-ins/common/file-psp.c:1813
 msgid "Error reading block information"
 msgstr "读取数据块信息时出错"
 
-#: plug-ins/common/file-psp.c:1902
+#: plug-ins/common/file-psp.c:1893
 #, c-format
 msgid "Invalid layer sub-block %s, should be LAYER"
 msgstr "无效的图层子数据块 %s，应该为图层"
 
-#: plug-ins/common/file-psp.c:1933 plug-ins/common/file-psp.c:1990
+#: plug-ins/common/file-psp.c:1924 plug-ins/common/file-psp.c:1981
 msgid "Error reading layer information chunk"
 msgstr "读取图层信息数据块出错"
 
-#: plug-ins/common/file-psp.c:2032
+#: plug-ins/common/file-psp.c:2023
 #, c-format
 msgid "Invalid layer dimensions: %dx%d"
 msgstr "无效的图层尺寸：%dx%d"
 
-#: plug-ins/common/file-psp.c:2093
+#: plug-ins/common/file-psp.c:2084
 msgid "Error creating layer"
 msgstr "创建图层出错"
 
-#: plug-ins/common/file-psp.c:2138
+#: plug-ins/common/file-psp.c:2129
 #, c-format
 msgid "Invalid layer sub-block %s, should be CHANNEL"
 msgstr "无效的图层子数据块 %s，应该为通道"
 
-#: plug-ins/common/file-psp.c:2154
+#: plug-ins/common/file-psp.c:2145
 msgid "Error reading channel information chunk"
 msgstr "读取通道信息数据块出错"
 
-#: plug-ins/common/file-psp.c:2177
+#: plug-ins/common/file-psp.c:2168
 #, c-format
 msgid "Invalid channel type %d in channel information chunk"
 msgstr "通道信息数据块中的无效通道类型 %d"
 
-#: plug-ins/common/file-psp.c:2281 plug-ins/common/file-psp.c:2298
+#: plug-ins/common/file-psp.c:2272 plug-ins/common/file-psp.c:2289
 msgid "Error reading tube data chunk"
 msgstr "读取管道数据块出错"
 
-#: plug-ins/common/file-psp.c:2380 plug-ins/common/file-psp.c:2392
+#: plug-ins/common/file-psp.c:2371 plug-ins/common/file-psp.c:2383
-#: plug-ins/common/file-psp.c:2403
+#: plug-ins/common/file-psp.c:2394
 msgid "Error reading colorprofile chunk"
 msgstr "读取颜色配置文件数据块时出错"
 
-#: plug-ins/common/file-psp.c:2456
+#: plug-ins/common/file-psp.c:2447
 msgid "Error reading file header."
 msgstr "读取文件头部信息出错。"
 
-#: plug-ins/common/file-psp.c:2463
+#: plug-ins/common/file-psp.c:2454
 msgid "Incorrect file signature."
 msgstr "错误的文件签名。"
 
-#: plug-ins/common/file-psp.c:2477
+#: plug-ins/common/file-psp.c:2468
 #, c-format
 msgid "Unsupported PSP file format version %d.%d."
 msgstr "不支持的 PSP 文件格式版本 %d.%d。"
 
-#: plug-ins/common/file-psp.c:2497
+#: plug-ins/common/file-psp.c:2488
 msgid "invalid block size"
 msgstr "无效的数据块大小"
 
-#: plug-ins/common/file-psp.c:2506
+#: plug-ins/common/file-psp.c:2497
 msgid "Duplicate General Image Attributes block."
 msgstr "重制通常的图像属性数据块。"
 
-#: plug-ins/common/file-psp.c:2534
+#: plug-ins/common/file-psp.c:2525
 msgid "Missing General Image Attributes block."
 msgstr "缺失通常的图像属性数据块。"
 
-#: plug-ins/common/file-psp.c:2653
+#: plug-ins/common/file-psp.c:2644
 msgid "Exporting not implemented yet."
 msgstr "尚未实现导出功能。"
 
@@ -8594,8 +8579,8 @@ msgid ""
 "horizontally), 2 == 4:4:4 (best quality), 3 == 4:4:0 (chroma halved "
 "vertically)"
 msgstr ""
-"次采样类型 { 0 == 4:2:0（色度四分）；1 == 4:2:2（色度水平分半）；2 == 4:4:4"
+"次采样类型 { 0 == 4:2:0（色度四分）；1 == 4:2:2（色度水平分半）；2 == "
-"（最佳质量）；3 == 4:4:0（色度竖直分半）"
+"4:4:4（最佳质量）；3 == 4:4:0（色度竖直分半）"
 
 #: plug-ins/file-jpeg/jpeg.c:244
 msgid "Baseline"

po/ka.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-24 21:51+0000\n"
+"POT-Creation-Date: 2023-09-14 23:23+0000\n"
-"PO-Revision-Date: 2023-09-25 05:48+0200\n"
+"PO-Revision-Date: 2023-09-15 05:45+0200\n"
 "Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n"
 "Language-Team: Georgian <(nothing)>\n"
 "Language: ka\n"
@@ -2390,7 +2390,7 @@ msgstr "240 წამი"
 #: app/display/pikadisplayshell-close.c:181
 #: app/display/pikadisplayshell-filter-dialog.c:87
 #: app/display/pikadisplayshell-rotate-dialog.c:123
-#: app/display/pikadisplayshell-scale-dialog.c:131
+#: app/display/pikadisplayshell-scale-dialog.c:123
 #: app/tools/pikafiltertool.c:364 app/tools/pikaforegroundselecttool.c:331
 #: app/tools/pikatexttool.c:1751 app/tools/pikatransformgridtool.c:1264
 #: app/tools/pikatransformtool.c:428 app/widgets/pikaactionview.c:621
@@ -9367,465 +9367,407 @@ msgid "Zoom in a lot"
 msgstr "ძალიან დაპატარავება"
 
 #: app/actions/view-actions.c:373
-#| msgctxt "view-zoom-action"
-#| msgid "1_6:1  (1600%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 16:1 (1600%)"
-msgstr "გადიდება 16:1 (1600%)"
-
-#: app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1  (1600%)"
 
-#: app/actions/view-actions.c:376
+#: app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "გადიდება 16:1"
 
-#: app/actions/view-actions.c:381
+#: app/actions/view-actions.c:379
-#| msgctxt "view-zoom-action"
-#| msgid "_8:1  (800%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 8:1 (800%)"
-msgstr "გადიდება 8:1 (800%)"
-
-#: app/actions/view-actions.c:382
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1  (800%)"
 
-#: app/actions/view-actions.c:384
+#: app/actions/view-actions.c:380
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "გადიდება 8:1"
 
-#: app/actions/view-actions.c:389
+#: app/actions/view-actions.c:385
-#| msgctxt "view-zoom-action"
-#| msgid "_4:1  (400%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 4:1 (400%)"
-msgstr "გადიდება 4:1 (400%)"
-
-#: app/actions/view-actions.c:390
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1  (400%)"
 
-#: app/actions/view-actions.c:392
+#: app/actions/view-actions.c:386
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "გადიდება 4:1"
 
-#: app/actions/view-actions.c:397
+#: app/actions/view-actions.c:391
-#| msgctxt "view-zoom-action"
-#| msgid "_2:1  (200%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 2:1 (200%)"
-msgstr "გადიდება 2:1 (200%)"
-
-#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1  (200%)"
 
-#: app/actions/view-actions.c:400
+#: app/actions/view-actions.c:392
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "გადიდება 2:1"
 
-#: app/actions/view-actions.c:405
+#: app/actions/view-actions.c:397
-#| msgctxt "view-zoom-action"
-#| msgid "_1:1  (100%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:1 (100%)"
-msgstr "გადიდება 1:1 (100%)"
-
-#: app/actions/view-actions.c:406
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "1_6:1  (1600%)"
 
-#: app/actions/view-actions.c:408
+#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "გადიდება 1:1"
 
-#: app/actions/view-actions.c:413
+#: app/actions/view-actions.c:403
-#| msgctxt "view-zoom-action"
-#| msgid "Zoom 1:2"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:2 (50%)"
-msgstr "გადიდება 1:2 (50%)"
-
-#: app/actions/view-actions.c:414
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2  (50%)"
 
-#: app/actions/view-actions.c:416
+#: app/actions/view-actions.c:404
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "გადიდება 1:2"
 
-#: app/actions/view-actions.c:421
+#: app/actions/view-actions.c:409
-#| msgctxt "view-zoom-action"
-#| msgid "Zoom 1:4"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:4 (25%)"
-msgstr "გადიდება 1:4 (25%)"
-
-#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4  (25%)"
 
-#: app/actions/view-actions.c:424
+#: app/actions/view-actions.c:410
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "გადიდება 1:4"
 
-#: app/actions/view-actions.c:429
+#: app/actions/view-actions.c:415
-#| msgctxt "view-zoom-action"
-#| msgid "1:_8  (12.5%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:8 (12.5%)"
-msgstr "გადიდება 1:8 (12.5%)"
-
-#: app/actions/view-actions.c:430
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8  (12.5%)"
 
-#: app/actions/view-actions.c:432
+#: app/actions/view-actions.c:416
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "გადიდება 1:8"
 
-#: app/actions/view-actions.c:437
+#: app/actions/view-actions.c:421
-#| msgctxt "view-zoom-action"
-#| msgid "1:1_6  (6.25%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:16 (6.25%)"
-msgstr "გადიდება 1:16 (6.25%)"
-
-#: app/actions/view-actions.c:438
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6  (6.25%)"
 
-#: app/actions/view-actions.c:440
+#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "გადიდება 1:16"
 
-#: app/actions/view-actions.c:445 app/actions/view-actions.c:448
+#: app/actions/view-actions.c:427
-msgctxt "view-zoom-action"
-msgid "Set a custom zoom factor"
-msgstr "გადიდების კოეფიციენტის ხელით მითითება"
-
-#: app/actions/view-actions.c:446
 msgctxt "view-zoom-action"
 msgid "Othe_r zoom factor..."
 msgstr "გადიდების სხ_ვა კოეფიციენტი..."
 
-#: app/actions/view-actions.c:456
+#: app/actions/view-actions.c:428
+msgctxt "view-zoom-action"
+msgid "Set a custom zoom factor"
+msgstr "გადიდების კოეფიციენტის ხელით მითითება"
+
+#: app/actions/view-actions.c:436
 msgctxt "view-action"
 msgid "Flip _Horizontally"
 msgstr "_ჰორიზონტალურად გადაბრუნება"
 
-#: app/actions/view-actions.c:457
+#: app/actions/view-actions.c:437
 msgctxt "view-action"
 msgid "Flip the view horizontally"
 msgstr "ხედის ჰორიზონტალურად გადაბრუნება"
 
-#: app/actions/view-actions.c:463
+#: app/actions/view-actions.c:443
 msgctxt "view-action"
 msgid "Flip _Vertically"
 msgstr "_ვერტიკალურად გადაბრუნება"
 
-#: app/actions/view-actions.c:464
+#: app/actions/view-actions.c:444
 msgctxt "view-action"
 msgid "Flip the view vertically"
 msgstr "ხედის ვერტიკალურად გადაბრუნება"
 
-#: app/actions/view-actions.c:473
+#: app/actions/view-actions.c:453
 msgctxt "view-action"
 msgid "Display Rotation Absolute Angle Set"
 msgstr "მობრუნების აბსოლუტური კუთხის დაყენების ჩვენება"
 
-#: app/actions/view-actions.c:479
+#: app/actions/view-actions.c:459
 msgctxt "view-action"
 msgid "_Reset Rotate"
 msgstr "_შემობრუნების საწყის მდგომარეობაში დაბრუნება"
 
-#: app/actions/view-actions.c:481
+#: app/actions/view-actions.c:461
 msgctxt "view-action"
 msgid "Reset the angle of rotation to 0°"
 msgstr "შემობრუნების კუთხის საწყის 0°-ზე დაბრუნება"
 
-#: app/actions/view-actions.c:489
+#: app/actions/view-actions.c:469
 msgctxt "view-action"
 msgid "Rotate 15° _clockwise"
 msgstr "საათის ისრის მიმართულებით 15°-ით შემობრუნება"
 
-#: app/actions/view-actions.c:490
+#: app/actions/view-actions.c:470
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the right"
 msgstr "ხედის საათის ისრის მიმართულებით 15°-ით შემობრუნება"
 
-#: app/actions/view-actions.c:495
+#: app/actions/view-actions.c:475
 msgctxt "view-action"
 msgid "Rotate 90° _clockwise"
 msgstr "_90°-ით საათის მიმართულებით შემობრუნება"
 
-#: app/actions/view-actions.c:496
+#: app/actions/view-actions.c:476
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the right"
 msgstr "ხედის 90°-ით მარჯვნივ შებრუნება"
 
-#: app/actions/view-actions.c:501
+#: app/actions/view-actions.c:481
 msgctxt "view-action"
 msgid "Rotate _180°"
 msgstr "_180°-ით შემობრუნება"
 
-#: app/actions/view-actions.c:502
+#: app/actions/view-actions.c:482
 msgctxt "view-action"
 msgid "Turn the view upside-down"
 msgstr "ხედის თავდაყირა დაყენება"
 
-#: app/actions/view-actions.c:507
+#: app/actions/view-actions.c:487
 msgctxt "view-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "_90°-ით საათის საწ. მიმართულებით შებრუნება"
 
-#: app/actions/view-actions.c:508
+#: app/actions/view-actions.c:488
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the left"
 msgstr "ხედის 90°-ით მარცხნივ შებრუნება"
 
-#: app/actions/view-actions.c:513
+#: app/actions/view-actions.c:493
 msgctxt "view-action"
 msgid "Rotate 15° counter-clock_wise"
 msgstr "საათის ისრის საწ. მიმართულებით 15°-ით შემობრუნება"
 
-#: app/actions/view-actions.c:514
+#: app/actions/view-actions.c:494
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the left"
 msgstr "ხედის 15°-ით მარცხნივ შებრუნება"
 
-#: app/actions/view-actions.c:522
+#: app/actions/view-actions.c:502
 msgctxt "view-action"
 msgid "_Perceptual"
 msgstr "_აღქმადი"
 
-#: app/actions/view-actions.c:523
+#: app/actions/view-actions.c:503
 msgctxt "view-action"
 msgid "Display rendering intent is perceptual"
 msgstr ""
 
-#: app/actions/view-actions.c:528
+#: app/actions/view-actions.c:508
 msgctxt "view-action"
 msgid "_Relative Colorimetric"
 msgstr "_შეფარდებით კოლორიმეტრული"
 
-#: app/actions/view-actions.c:529
+#: app/actions/view-actions.c:509
 msgctxt "view-action"
 msgid "Display rendering intent is relative colorimetric"
 msgstr ""
 
-#: app/actions/view-actions.c:534
+#: app/actions/view-actions.c:514
 msgctxt "view-action"
 msgid "_Saturation"
 msgstr "_გაჯერებულობა"
 
-#: app/actions/view-actions.c:535
+#: app/actions/view-actions.c:515
 msgctxt "view-action"
 msgid "Display rendering intent is saturation"
 msgstr ""
 
-#: app/actions/view-actions.c:540
+#: app/actions/view-actions.c:520
 msgctxt "view-action"
 msgid "_Absolute Colorimetric"
 msgstr "აბსოლუტური კოლორიმეტრული"
 
-#: app/actions/view-actions.c:541
+#: app/actions/view-actions.c:521
 msgctxt "view-action"
 msgid "Display rendering intent is absolute colorimetric"
 msgstr "ეკრანზე რენდერის დანიშნულება აბსოლუტურად კოლორიმეტრულია"
 
-#: app/actions/view-actions.c:549
+#: app/actions/view-actions.c:529
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "_თემიდან"
 
-#: app/actions/view-actions.c:550
+#: app/actions/view-actions.c:530
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "ფონის ფერის თემიდან აღება"
 
-#: app/actions/view-actions.c:555
+#: app/actions/view-actions.c:535
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "_ღია"
 
-#: app/actions/view-actions.c:556
+#: app/actions/view-actions.c:536
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "ღია ფერის გამოყენება"
 
-#: app/actions/view-actions.c:561
+#: app/actions/view-actions.c:541
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "_მუქი"
 
-#: app/actions/view-actions.c:562
+#: app/actions/view-actions.c:542
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "მუქი ფერის გამოყენება"
 
-#: app/actions/view-actions.c:567
+#: app/actions/view-actions.c:547
 msgctxt "view-padding-color"
 msgid "_Custom Color..."
 msgstr "_ფერის არჩევა..."
 
-#: app/actions/view-actions.c:568
+#: app/actions/view-actions.c:548
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "ნებისმიერი ფერის გამოყენება"
 
-#: app/actions/view-actions.c:573
+#: app/actions/view-actions.c:553
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "როგორც _პარამეტრებში"
 
-#: app/actions/view-actions.c:575
+#: app/actions/view-actions.c:555
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr ""
 
-#: app/actions/view-actions.c:583
+#: app/actions/view-actions.c:563
 msgctxt "view-padding-color"
 msgid "Keep Padding in \"Show _All\" Mode"
 msgstr ""
 
-#: app/actions/view-actions.c:585
+#: app/actions/view-actions.c:565
 msgctxt "view-padding-color"
 msgid "Keep canvas padding when \"View -> Show All\" is enabled"
 msgstr ""
 
-#: app/actions/view-actions.c:594
+#: app/actions/view-actions.c:574
 msgctxt "view-action"
 msgid "Set horizontal scroll offset"
 msgstr "დააყენეთ ჰორიზონტალური ცოციის გადაწევა"
 
-#: app/actions/view-actions.c:599
+#: app/actions/view-actions.c:579
 msgctxt "view-action"
 msgid "Scroll to left border"
 msgstr "მარცხენა საზღვრამდე გაწევა"
 
-#: app/actions/view-actions.c:604
+#: app/actions/view-actions.c:584
 msgctxt "view-action"
 msgid "Scroll to right border"
 msgstr "მარჯვენა საზღვრამდე გაწევა"
 
-#: app/actions/view-actions.c:609
+#: app/actions/view-actions.c:589
 msgctxt "view-action"
 msgid "Scroll left"
 msgstr "მარცხნივ გაწევა"
 
-#: app/actions/view-actions.c:614
+#: app/actions/view-actions.c:594
 msgctxt "view-action"
 msgid "Scroll right"
 msgstr "მარჯვნივ გაწევა"
 
-#: app/actions/view-actions.c:619
+#: app/actions/view-actions.c:599
 msgctxt "view-action"
 msgid "Scroll page left"
 msgstr "გვერდის მარცხნივ გაწევა"
 
-#: app/actions/view-actions.c:624
+#: app/actions/view-actions.c:604
 msgctxt "view-action"
 msgid "Scroll page right"
 msgstr "გვერდის მარჯვნივ გაწევა"
 
-#: app/actions/view-actions.c:632
+#: app/actions/view-actions.c:612
 msgctxt "view-action"
 msgid "Set vertical scroll offset"
 msgstr "დააყენეთ ვერტიკალური ცოციის გადაწევა"
 
-#: app/actions/view-actions.c:637
+#: app/actions/view-actions.c:617
 msgctxt "view-action"
 msgid "Scroll to top border"
 msgstr "ზედა საზღვრამდე აქაჩვა"
 
-#: app/actions/view-actions.c:642
+#: app/actions/view-actions.c:622
 msgctxt "view-action"
 msgid "Scroll to bottom border"
 msgstr "ქვედა საზღვრამდე ჩამოქაჩვა"
 
-#: app/actions/view-actions.c:647
+#: app/actions/view-actions.c:627
 msgctxt "view-action"
 msgid "Scroll up"
 msgstr "მაღლა აწევა"
 
-#: app/actions/view-actions.c:652
+#: app/actions/view-actions.c:632
 msgctxt "view-action"
 msgid "Scroll down"
 msgstr "დაბლა ჩამოქაჩვა"
 
-#: app/actions/view-actions.c:657
+#: app/actions/view-actions.c:637
 msgctxt "view-action"
 msgid "Scroll page up"
 msgstr "გვერდით მაღლა აწევა"
 
-#: app/actions/view-actions.c:662
+#: app/actions/view-actions.c:642
 msgctxt "view-action"
 msgid "Scroll page down"
 msgstr "გვერდით დაბლა ჩამოწევა"
 
-#: app/actions/view-actions.c:848
+#: app/actions/view-actions.c:841
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "გადიდების აღდგენა(%d%%)"
 
-#: app/actions/view-actions.c:856
+#: app/actions/view-actions.c:849
 msgid "Re_vert Zoom"
 msgstr "გადიდების აღდგენა"
 
-#: app/actions/view-actions.c:1004
+#: app/actions/view-actions.c:1017
+#, c-format
+msgid "Othe_r (%s)..."
+msgstr "ს_ხვა (%s) ..."
+
+#: app/actions/view-actions.c:1028
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_გადიდება (%s)"
 
 #. please preserve the trailing space
 #. H: Horizontal, V: Vertical
-#: app/actions/view-actions.c:1024
+#: app/actions/view-actions.c:1052
 msgid "(H+V) "
 msgstr "(H+V) "
 
 #. please preserve the trailing space
 #. H: Horizontal
-#: app/actions/view-actions.c:1030
+#: app/actions/view-actions.c:1058
 msgid "(H) "
 msgstr "(H) "
 
 #. please preserve the trailing space
 #. V: Vertical
-#: app/actions/view-actions.c:1036
+#: app/actions/view-actions.c:1064
 msgid "(V) "
 msgstr "(V) "
 
-#: app/actions/view-actions.c:1045
+#: app/actions/view-actions.c:1073
 #, c-format
 msgid "_Flip %s& Rotate (%d°)"
 msgstr "გადაბრუნება %s და შებრუნება (%d°)"
 
-#: app/actions/view-commands.c:1074
+#: app/actions/view-commands.c:1089
 msgid "Set Canvas Padding Color"
 msgstr "სურათის გარშემო ფონის ფერის დაყენება"
 
-#: app/actions/view-commands.c:1076
+#: app/actions/view-commands.c:1091
 msgid "Set Custom Canvas Padding Color"
 msgstr "სურათის გარშემო ფონის ფერის ხელით არჩევა"
 
@@ -9849,7 +9791,7 @@ msgstr "ამ ფანჯრის %s-ე ეკრანზე წაღე
 #: app/dialogs/template-options-dialog.c:119
 #: app/display/pikadisplayshell-filter-dialog.c:88
 #: app/display/pikadisplayshell-rotate-dialog.c:124
-#: app/display/pikadisplayshell-scale-dialog.c:132 app/gui/gui.c:184
+#: app/display/pikadisplayshell-scale-dialog.c:124 app/gui/gui.c:184
 #: app/tools/pikafiltertool.c:365 app/widgets/pikacolordialog.c:464
 #: app/widgets/pikacontrollereditor.c:663 app/widgets/pikaerrordialog.c:76
 #: app/widgets/pikafiledialog.c:176 app/widgets/pikamodifierseditor.c:685
@@ -18146,34 +18088,22 @@ msgstr "კუთხე:"
 msgid "degrees"
 msgstr "გრადუსი"
 
-#: app/display/pikadisplayshell-scale-dialog.c:124
+#: app/display/pikadisplayshell-scale-dialog.c:116
 msgid "Zoom Ratio"
 msgstr "გადიდების კოეფიციენტი"
 
-#: app/display/pikadisplayshell-scale-dialog.c:126
+#: app/display/pikadisplayshell-scale-dialog.c:118
 msgid "Select Zoom Ratio"
 msgstr "აირჩიეთ გადიდების კოეფიციენტი"
 
-#: app/display/pikadisplayshell-scale-dialog.c:168
+#: app/display/pikadisplayshell-scale-dialog.c:160
 msgid "Zoom ratio:"
 msgstr "გადიდების კოეფიციენტი:"
 
-#: app/display/pikadisplayshell-scale-dialog.c:193
+#: app/display/pikadisplayshell-scale-dialog.c:185
 msgid "Zoom:"
 msgstr "გადიდება:"
 
-#: app/display/pikadisplayshell-scale-dialog.c:246
-#, c-format
-msgid "Othe_r (%s)..."
-msgstr "ს_ხვა (%s) ..."
-
-#: app/display/pikadisplayshell-scale-dialog.c:250
-#, c-format
-#| msgctxt "view-padding-color"
-#| msgid "_Custom Color..."
-msgid "Custom Zoom (%s)..."
-msgstr "გადიდების მითითება (%s)..."
-
 #: app/display/pikadisplayshell-title.c:299
 msgid "(modified)"
 msgstr "(შეცვლილი)"

po/tr.po

@@ -43,8 +43,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PIKA UI translations master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-14 23:23+0000\n"
+"POT-Creation-Date: 2023-09-06 20:17+0000\n"
-"PO-Revision-Date: 2023-09-19 23:49+0300\n"
+"PO-Revision-Date: 2023-09-07 01:06+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: Turkish <gnometurk@gnome.org>\n"
 "Language: tr\n"
@@ -2537,9 +2537,9 @@ msgstr ""
 "%s"
 
 #: app/actions/data-commands.c:115 app/actions/tool-options-commands.c:75
-#: app/core/pikabrushgenerated-load.c:121 app/core/pikaimage.c:2430
+#: app/core/pikabrushgenerated-load.c:121 app/core/pikaimage.c:2428
 #: app/core/pikapalette.c:428 app/core/pikapalette-import.c:213
-#: app/core/pikapalette-load.c:243 app/dialogs/palette-import-dialog.c:762
+#: app/core/pikapalette-load.c:241 app/dialogs/palette-import-dialog.c:762
 #: app/widgets/pikadnd-xds.c:87
 msgid "Untitled"
 msgstr "Başlıksız"
@@ -6928,7 +6928,7 @@ msgctxt "undo-type"
 msgid "Remove %d Layers"
 msgstr "%d Katmanı Kaldır"
 
-#: app/actions/layers-commands.c:994 app/text/pikatextlayer.c:585
+#: app/actions/layers-commands.c:994 app/text/pikatextlayer.c:581
 msgid "Discard Text Information"
 msgstr "Metin Bilgisinden Vazgeç"
 
@@ -13143,7 +13143,7 @@ msgid "Palette"
 msgstr "Palet"
 
 #: app/core/pikacontext.c:742 app/core/pikacontext.c:743
-#: app/tools/pikatextoptions.c:800
+#: app/tools/pikatextoptions.c:795
 msgid "Font"
 msgstr "Yazı tipi"
 
@@ -13173,7 +13173,7 @@ msgstr "kopyala"
 msgid "%s copy"
 msgstr "%s kopyası"
 
-#: app/core/pikadatafactory.c:630 app/tools/pikatextoptions.c:781
+#: app/core/pikadatafactory.c:630 app/tools/pikatextoptions.c:776
 #: app/widgets/pikafontfactoryview.c:97
 msgid "Loading fonts (this may take a while...)"
 msgstr "Yazı tipleri yükleniyor (bu biraz zaman alabilir...)"
@@ -13216,7 +13216,7 @@ msgstr "'%s' yüklenirken hata"
 #: app/core/pikadataloaderfactory.c:492 app/file-data/file-data-gbr.c:95
 #: app/file-data/file-data-gex.c:343 app/file-data/file-data-gex.c:493
 #: app/file-data/file-data-gih.c:99 app/file-data/file-data-pat.c:102
-#: app/xcf/xcf.c:444
+#: app/xcf/xcf.c:443
 #, c-format
 msgid "Could not open '%s' for reading: "
 msgstr "'%s' dosyası okumak için açılamadı: "
@@ -13323,7 +13323,7 @@ msgstr "Özel biçem"
 # Menü öğesi olmadığı için tümce düzeni tercih edildi
 #: app/core/pikafilloptions.c:128 app/pdb/pikapdbcontext.c:101
 #: app/tools/pikabucketfilloptions.c:186 app/tools/pikaselectionoptions.c:81
-#: app/tools/pikatextoptions.c:178
+#: app/tools/pikatextoptions.c:176
 msgid "Antialiasing"
 msgstr "Kenar yumuşatma"
 
@@ -13515,187 +13515,181 @@ msgctxt "undo-type"
 msgid "Transform Layer Group"
 msgstr "Katman Kümesini Dönüştür"
 
-#: app/core/pikaimage.c:709 app/widgets/pikasymmetryeditor.c:182
+#: app/core/pikaimage.c:707 app/widgets/pikasymmetryeditor.c:182
 msgid "Symmetry"
 msgstr "Simetri"
 
-#: app/core/pikaimage.c:2675
+#: app/core/pikaimage.c:2673
 msgid " (exported)"
 msgstr " (dışa aktarılmış)"
 
-#: app/core/pikaimage.c:2679
+#: app/core/pikaimage.c:2677
 msgid " (overwritten)"
 msgstr " (üstüne yazılmış)"
 
-#: app/core/pikaimage.c:2688
+#: app/core/pikaimage.c:2686
 msgid " (imported)"
 msgstr " (içe aktarılmış)"
 
 # Hata mesajı: İkinci S Pika ve sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2861 app/core/pikaimage.c:2875
+#: app/core/pikaimage.c:2859 app/core/pikaimage.c:2873
-#: app/core/pikaimage.c:2918
+#: app/core/pikaimage.c:2916
 #, c-format
 msgid "Layer mode '%s' was added in %s"
 msgstr "'%s' katman kipi %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2933
+#: app/core/pikaimage.c:2931
 #, c-format
 msgid "Layer groups were added in %s"
 msgstr "Katman kümeleri %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2940
+#: app/core/pikaimage.c:2938
 #, c-format
 msgid "Masks on layer groups were added in %s"
 msgstr "Katman kümelerindeki maskeler %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2947
+#: app/core/pikaimage.c:2945
 #, c-format
 msgid "Position locks on layer groups were added in %s"
 msgstr "Katman kümelerindeki konum kilitleri %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2954
+#: app/core/pikaimage.c:2952
 #, c-format
 msgid "Alpha channel locks on layer groups were added in %s"
 msgstr "Katman kümelerindeki alfa kanalı kilitleri %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2962 app/core/pikaimage.c:2987
+#: app/core/pikaimage.c:2960 app/core/pikaimage.c:2974
 #, c-format
 msgid "Visibility locks were added in %s"
 msgstr "Görünürlük kilitleri %s ile eklendi"
 
-# %s burada PIKA 3.0 şeklinde sürümü belirtmek için kullanılıyor.
-#: app/core/pikaimage.c:2973
-#, c-format
-msgid "Format of font information in text layer was changed in %s"
-msgstr "Metin katmanındaki yazı tipi bilgilerinin biçimi %s ile değiştirildi"
-
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:2996
+#: app/core/pikaimage.c:2983
 #, c-format
 msgid "Multiple path selection was added in %s"
 msgstr "Çoklu yol seçimi %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3008
+#: app/core/pikaimage.c:2995
 #, c-format
 msgid "Storing color tags in path was added in %s"
 msgstr "Renk etiketlerinin yola kaydedilmesi %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3015
+#: app/core/pikaimage.c:3002
 #, c-format
 msgid "Storing locks in path was added in %s"
 msgstr "Kilitlerin yola kaydedilmesi %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3029
+#: app/core/pikaimage.c:3016
 #, c-format
 msgid "High bit-depth images were added in %s"
 msgstr "Yüksek bit derinlikli görüntüler %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3037
+#: app/core/pikaimage.c:3024
 #, c-format
 msgid "Encoding of high bit-depth images was fixed in %s"
 msgstr "Yüksek bit derinlikli görüntülerin kodlaması %s ile düzeltildi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3045
+#: app/core/pikaimage.c:3032
 #, c-format
 msgid "Internal zlib compression was added in %s"
 msgstr "Dahili zlib sıkıştırması %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3062
+#: app/core/pikaimage.c:3049
 #, c-format
 msgid "Support for image files larger than 4GB was added in %s"
 msgstr " 4 GB’dan büyük görüntü dosyaları desteği %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3069
+#: app/core/pikaimage.c:3056
 #, c-format
 msgid "Multiple layer selection was added in %s"
 msgstr "Çoklu katman seçimi %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3086
+#: app/core/pikaimage.c:3073
 #, c-format
 msgid "Off-canvas guides added in %s"
 msgstr "Tuval dışı kılavuzlar %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3097
+#: app/core/pikaimage.c:3084
 #, c-format
 msgid "Item set and pattern search in item's name were added in %s"
 msgstr "Öge seti ve öge adlarında desen araması %s ile eklendi"
 
 # Hata mesajı: S burada Pika sürümünü belirtmeye yarıyor.
-#: app/core/pikaimage.c:3103
+#: app/core/pikaimage.c:3090
 #, c-format
 msgid "Multiple channel selection was added in %s"
 msgstr "Çoklu kanal seçimi %s ile eklendi"
 
-#: app/core/pikaimage.c:3209
+#: app/core/pikaimage.c:3195
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "Görüntü Çözünürlüğünü Değiştir"
 
-#: app/core/pikaimage.c:3261
+#: app/core/pikaimage.c:3247
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "Görüntü Birimini Değiştir"
 
-#: app/core/pikaimage.c:4314
+#: app/core/pikaimage.c:4300
 msgid ""
 "'pika-comment' parasite validation failed: comment contains invalid UTF-8"
 msgstr "'pika-comment' parasit doğrulanamadı: yorum geçersiz UTF-8 içeriyor"
 
-#: app/core/pikaimage.c:4376
+#: app/core/pikaimage.c:4362
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
 msgstr "Görüntüye Parazit İliştir"
 
-#: app/core/pikaimage.c:4421
+#: app/core/pikaimage.c:4407
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "Görüntüden Paraziti Kaldır"
 
-#: app/core/pikaimage.c:5256
+#: app/core/pikaimage.c:5242
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "Katman Ekle"
 
-#: app/core/pikaimage.c:5300 app/core/pikaimage.c:5331
+#: app/core/pikaimage.c:5286 app/core/pikaimage.c:5317
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "Katmanı Kaldır"
 
-#: app/core/pikaimage.c:5325
+#: app/core/pikaimage.c:5311
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "Yüzen Seçimi Kaldır"
 
-#: app/core/pikaimage.c:5849
+#: app/core/pikaimage.c:5835
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "Kanal Ekle"
 
-#: app/core/pikaimage.c:5879 app/core/pikaimage.c:5904
+#: app/core/pikaimage.c:5865 app/core/pikaimage.c:5890
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "Kanalı Kaldır"
 
-#: app/core/pikaimage.c:5964
+#: app/core/pikaimage.c:5950
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "Yol Ekle"
 
-#: app/core/pikaimage.c:5999 app/core/pikaimage.c:6007
+#: app/core/pikaimage.c:5985 app/core/pikaimage.c:5993
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "Yolu Kaldır"
@@ -14300,25 +14294,25 @@ msgstr "MyPaint fırçası seri hale getirilemedi."
 msgid "%s (occurs %u)"
 msgstr "%s (%u defa)"
 
-#: app/core/pikapalette-import.c:548
+#: app/core/pikapalette-import.c:544
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "Bilinmeyen palet dosyası türü: %s"
 
-#: app/core/pikapalette-load.c:120
+#: app/core/pikapalette-load.c:118
 msgid "Missing magic header."
 msgstr "Eksik sihirli başlık."
 
-#: app/core/pikapalette-load.c:143
+#: app/core/pikapalette-load.c:141
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "'%s' palet dosyası içinde geçersiz UTF-8 dizgesi"
 
-#: app/core/pikapalette-load.c:163
+#: app/core/pikapalette-load.c:161
 msgid "Invalid column count."
 msgstr "Geçersiz sütun sayısı."
 
-#: app/core/pikapalette-load.c:170
+#: app/core/pikapalette-load.c:168
 #, c-format
 msgid ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
@@ -14327,130 +14321,92 @@ msgstr ""
 "'%s' palet dosyası okunuyor: %d. satır içindeki sütunların sayısı geçersiz. "
 "Öntanımlı değer kullanılıyor."
 
-#: app/core/pikapalette-load.c:204
+#: app/core/pikapalette-load.c:202
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "'%s' palet dosyası okunuyor: %d. satırda KIRMIZI bileşen kayıp."
 
-#: app/core/pikapalette-load.c:212
+#: app/core/pikapalette-load.c:210
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr "'%s' palet dosyası okunuyor: %d. satırda YEŞİL bileşen kayıp."
 
-#: app/core/pikapalette-load.c:220
+#: app/core/pikapalette-load.c:218
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "'%s' palet dosyası okunuyor: %d. satırda MAVİ bileşen kayıp."
 
-#: app/core/pikapalette-load.c:230
+#: app/core/pikapalette-load.c:228
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "'%s' palet dosyası okunuyor: %d. satırda RGB değeri erim dışı."
 
-#: app/core/pikapalette-load.c:257 app/core/pikapalette-load.c:507
+#: app/core/pikapalette-load.c:255 app/core/pikapalette-load.c:505
 #, c-format
 msgid "Reading palette file '%s': Read %d colors from truncated file: %s"
 msgstr "'%s' palet dosyası okunuyor: Kırpılmış dosyadan %d renkler oku: %s"
 
-#: app/core/pikapalette-load.c:279
+#: app/core/pikapalette-load.c:277
 #, c-format
 msgid "In line %d of palette file: "
 msgstr "Palet dosyasının %d satırında: "
 
-#: app/core/pikapalette-load.c:475 app/core/pikapalette-load.c:682
+#: app/core/pikapalette-load.c:473 app/core/pikapalette-load.c:675
-#: app/core/pikapalette-load.c:1025
 #, c-format
 msgid "Could not read header from palette file '%s': "
 msgstr "'%s' palet dosyasından başlık okunamadı: "
 
-#: app/core/pikapalette-load.c:512
+#: app/core/pikapalette-load.c:510
 msgid "Premature end of file."
 msgstr "Belirsiz dosya sonu."
 
-#: app/core/pikapalette-load.c:691
+#: app/core/pikapalette-load.c:685
-msgid "Invalid ACB palette version."
-msgstr "ACB palet sürümü geçersiz."
-
-#: app/core/pikapalette-load.c:697
-msgid "PIKA only supports version 1 ACB palettes"
-msgstr "PIKA yalnızca ACB sürüm 1 paletlerini destekler"
-
-#: app/core/pikapalette-load.c:704
-msgid "Invalid ACB palette identifier."
-msgstr "ACB palet tanımlayıcı geçersiz."
-
-#: app/core/pikapalette-load.c:719 app/core/pikapalette-load.c:958
-#: app/core/pikapalette-load.c:979
-msgid "Invalid ACB palette name."
-msgstr "ACB palet adı geçersiz."
-
-#: app/core/pikapalette-load.c:737
-msgid "Invalid ACB palette prefix."
-msgstr "ACB palet ön eki geçersiz."
-
-#: app/core/pikapalette-load.c:752
-msgid "Invalid ACB palette suffix."
-msgstr "ACB palet son eki geçersiz."
-
-#: app/core/pikapalette-load.c:770 app/core/pikapalette-load.c:1044
-msgid "Invalid number of colors in palette."
-msgstr "Paletteki renk sayısı geçersiz."
-
-#: app/core/pikapalette-load.c:776 app/core/pikapalette-load.c:1050
-#, c-format
-msgid "Invalid number of colors: %s."
-msgstr "Geçersiz renk sayısı: %s."
-
-#: app/core/pikapalette-load.c:788 app/core/pikapalette-load.c:797
-msgid "Invalid ACB palette page info."
-msgstr "ACB palet sayfa bilgisi geçersiz."
-
-#: app/core/pikapalette-load.c:808 app/core/pikapalette-load.c:830
-msgid "Invalid ACB palette color space."
-msgstr "ACB palet renk uzayı geçersiz."
-
-#: app/core/pikapalette-load.c:968
-msgid "Invalid ACB name size."
-msgstr "ACB palet ad boyutu geçersiz."
-
-#: app/core/pikapalette-load.c:1035
 #, c-format
 msgid "Invalid ASE header: %s"
 msgstr "Geçersiz ASE başlığı: %s"
 
-#: app/core/pikapalette-load.c:1060
+#: app/core/pikapalette-load.c:694
+msgid "Invalid number of colors in palette."
+msgstr "Paletteki renk sayısı geçersiz."
+
+#: app/core/pikapalette-load.c:700
+#, c-format
+msgid "Invalid number of colors: %s."
+msgstr "Geçersiz renk sayısı: %s."
+
+#: app/core/pikapalette-load.c:710
 #, c-format
 msgid "Invalid ASE file: %s."
 msgstr "Geçersiz ASE dosyası: %s."
 
-#: app/core/pikapalette-load.c:1138
+#: app/core/pikapalette-load.c:788
 #, c-format
 msgid "Invalid color components: %s."
 msgstr "Geçersiz renk bileşenleri: %s."
 
-#: app/core/pikapalette-load.c:1152 app/core/pikapalette-load.c:1179
+#: app/core/pikapalette-load.c:802 app/core/pikapalette-load.c:829
 #, c-format
 msgid "Invalid ASE color entry: %s."
 msgstr "Geçersiz ASE renk girdisi: %s."
 
-#: app/core/pikapalette-load.c:1207 app/core/pikapalette-load.c:1223
+#: app/core/pikapalette-load.c:857 app/core/pikapalette-load.c:873
-#: app/core/pikapalette-load.c:1242
+#: app/core/pikapalette-load.c:892
 msgid "Invalid ASE palette name."
 msgstr "Geçersiz ASE palet adı."
 
-#: app/core/pikapalette-load.c:1216
+#: app/core/pikapalette-load.c:866
 msgid "Invalid ASE block size."
 msgstr "Geçersiz ASE blok boyutu."
 
-#: app/core/pikapalette-load.c:1232
+#: app/core/pikapalette-load.c:882
 msgid "Invalid ASE name size."
 msgstr "Geçersiz ASE ad boyutu."
 
-#: app/core/pikapalette-load.c:1360
+#: app/core/pikapalette-load.c:1010
 msgid "Unable to read SBZ file"
 msgstr "SBZ dosyası okunamadı"
 
-#: app/core/pikapalette-load.c:1424
+#: app/core/pikapalette-load.c:1074
 msgid "Unable to open SBZ file"
 msgstr "SBZ dosyası açılamadı"
 
@@ -14618,7 +14574,7 @@ msgid "Line width"
 msgstr "Çizgi genişliği"
 
 #: app/core/pikastrokeoptions.c:168 app/core/pikatemplate.c:158
-#: app/tools/pikatextoptions.c:165 app/tools/pikatextoptions.c:308
+#: app/tools/pikatextoptions.c:163 app/tools/pikatextoptions.c:306
 msgid "Unit"
 msgstr "Birim"
 
@@ -14634,7 +14590,7 @@ msgstr "Birleştirme biçemi"
 msgid "Miter limit"
 msgstr "Köşe sınırı"
 
-#: app/core/pikastrokeoptions.c:190 app/tools/pikatextoptions.c:325
+#: app/core/pikastrokeoptions.c:190 app/tools/pikatextoptions.c:323
 msgid ""
 "Convert a mitered join to a bevelled join if the miter would extend to a "
 "distance of more than miter-limit * line-width from the actual join point."
@@ -15767,7 +15723,7 @@ msgstr "X Konumu:"
 msgid "Offset Y:"
 msgstr "Y Konumu:"
 
-#: app/dialogs/layer-options-dialog.c:377 app/dialogs/resize-dialog.c:510
+#: app/dialogs/layer-options-dialog.c:377 app/dialogs/resize-dialog.c:508
 #: app/widgets/pikatemplateeditor.c:489
 msgid "_Fill with:"
 msgstr "_Doldur:"
@@ -16582,7 +16538,7 @@ msgstr "Kullanıcı Arabirimi"
 msgid "Interface"
 msgstr "Arabirim"
 
-#: app/dialogs/preferences-dialog.c:1917 app/tools/pikatextoptions.c:195
+#: app/dialogs/preferences-dialog.c:1917 app/tools/pikatextoptions.c:193
 msgid "Language"
 msgstr "Dil"
 
@@ -17778,29 +17734,29 @@ msgid "_Y:"
 msgstr "_Y:"
 
 #. Button to center the image on canvas just below the preview.
-#: app/dialogs/resize-dialog.c:446
+#: app/dialogs/resize-dialog.c:444
 msgid "C_enter"
 msgstr "M_erkez"
 
-#: app/dialogs/resize-dialog.c:472
+#: app/dialogs/resize-dialog.c:470
 msgid "Resize _layers:"
 msgstr "Ka_tmanları yeniden boyutlandır:"
 
-#: app/dialogs/resize-dialog.c:520
+#: app/dialogs/resize-dialog.c:518
 msgid "Resize _text layers"
 msgstr "_Metin katmanını yeniden boyutlandır"
 
-#: app/dialogs/resize-dialog.c:531
+#: app/dialogs/resize-dialog.c:529
 msgid "Resizing text layers will make them uneditable"
 msgstr ""
 "Metin katmanlarını yeniden boyutlandırmak onları düzenlenemez hale getirir"
 
-#: app/dialogs/resize-dialog.c:753
+#: app/dialogs/resize-dialog.c:751
 #, c-format
 msgid "Scale template to %.2f ppi"
 msgstr "Şablonu %.2f ppiʼye ölçekle"
 
-#: app/dialogs/resize-dialog.c:758
+#: app/dialogs/resize-dialog.c:756
 #, c-format
 msgid "Set image to %.2f ppi"
 msgstr "Görüntüyü %.2f ppiʼye ayarla"
@@ -21324,21 +21280,21 @@ msgstr "Rüzgar"
 msgid "Resource '%s' is not renamable"
 msgstr "'%s' kaynağı yeniden adlandırılamaz"
 
-#: app/pdb/text-layer-cmds.c:98
+#: app/pdb/text-layer-cmds.c:97
 msgid "Failed to create text layer"
 msgstr "Metin katmanı oluşturulamadı"
 
-#: app/pdb/text-layer-cmds.c:162 app/pdb/text-layer-cmds.c:300
+#: app/pdb/text-layer-cmds.c:161 app/pdb/text-layer-cmds.c:295
-#: app/pdb/text-layer-cmds.c:365 app/pdb/text-layer-cmds.c:424
+#: app/pdb/text-layer-cmds.c:360 app/pdb/text-layer-cmds.c:419
-#: app/pdb/text-layer-cmds.c:482 app/pdb/text-layer-cmds.c:540
+#: app/pdb/text-layer-cmds.c:477 app/pdb/text-layer-cmds.c:535
-#: app/pdb/text-layer-cmds.c:598 app/pdb/text-layer-cmds.c:656
+#: app/pdb/text-layer-cmds.c:593 app/pdb/text-layer-cmds.c:651
-#: app/pdb/text-layer-cmds.c:714 app/pdb/text-layer-cmds.c:770
+#: app/pdb/text-layer-cmds.c:709 app/pdb/text-layer-cmds.c:765
-#: app/pdb/text-layer-cmds.c:828 app/pdb/text-layer-cmds.c:886
+#: app/pdb/text-layer-cmds.c:823 app/pdb/text-layer-cmds.c:881
-#: app/pdb/text-layer-cmds.c:944 app/pdb/text-layer-cmds.c:979
+#: app/pdb/text-layer-cmds.c:939 app/pdb/text-layer-cmds.c:974
 msgid "Set text layer attribute"
 msgstr "Metin katmanı özniteliğini ayarla"
 
-#: app/pdb/text-layer-cmds.c:231
+#: app/pdb/text-layer-cmds.c:230
 msgid "Set text layer markup"
 msgstr "Metin katmanı işaretlemesini ayarla"
 
@@ -21929,7 +21885,7 @@ msgstr "Bu işlem hiçbir düzenlenebilir özellik içermez"
 
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
-#: app/text/pikafont.c:56
+#: app/text/pikafont.c:52
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -21950,11 +21906,7 @@ msgstr ""
 msgid "Add Text Layer"
 msgstr "Metin Katmanı Ekle"
 
-#: app/text/pikatext-parasite.c:168
+#: app/text/pikatext-parasite.c:95
-msgid "Invalid markup format in text parasite"
-msgstr "Metin parazitinde geçersiz işaretleme biçimi"
-
-#: app/text/pikatext-parasite.c:192
 msgid "Empty text parasite"
 msgstr "Metin parazitini boşalt"
 
@@ -21990,15 +21942,15 @@ msgstr "Metin Katmanını Döndür"
 msgid "Transform Text Layer"
 msgstr "Metin Katmanını Dönüştür"
 
-#: app/text/pikatextlayer.c:721
+#: app/text/pikatextlayer.c:716
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "Hiçbir yazı tipi olmaması , metin işlevi kullanılamaz."
 
-#: app/text/pikatextlayer.c:784
+#: app/text/pikatextlayer.c:779
 msgid "Empty Text Layer"
 msgstr "Boş Metin Katmanı"
 
-#: app/text/pikatextlayer.c:952
+#: app/text/pikatextlayer.c:947
 msgid ""
 "Your text cannot be rendered. It is likely too big. Please make it shorter "
 "or use a smaller font."
@@ -22006,7 +21958,7 @@ msgstr ""
 "Metniniz görselleştirilemiyor. Çok büyük olmasından kaynaklanabilir. Lütfen "
 "daha kısa hale getirin ya da daha küçük yazı tipi kullanın."
 
-#: app/text/pikatextlayer-xcf.c:82
+#: app/text/pikatextlayer-xcf.c:80
 #, c-format
 msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
@@ -22021,7 +21973,7 @@ msgstr ""
 "Bazı metin özellikleri yanlış olabilir. Metin katmanını düzenlemek "
 "istemedikçe, bunun hakkında endişelenmenize gerek yok."
 
-#: app/text/pikatextlayout.c:596
+#: app/text/pikatextlayout.c:594
 msgid ""
 "The new text layout cannot be generated. Most likely the font size is too "
 "big."
@@ -23396,7 +23348,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. the color label
-#: app/tools/pikagradienttool-editor.c:1340 app/tools/pikatextoptions.c:856
+#: app/tools/pikagradienttool-editor.c:1340 app/tools/pikatextoptions.c:851
 msgid "Color:"
 msgstr "Renk:"
 
@@ -24251,7 +24203,7 @@ msgstr "Geçerli"
 msgid "Fixed"
 msgstr "Sabit"
 
-#: app/tools/pikarectangleoptions.c:1006 app/tools/pikatextoptions.c:814
+#: app/tools/pikarectangleoptions.c:1006 app/tools/pikatextoptions.c:809
 msgid "Size:"
 msgstr "Boyut:"
 
@@ -24526,66 +24478,66 @@ msgstr "Lekelemek için tıklayın"
 msgid "Click to smudge the line"
 msgstr "Çizgiyi lekelemek için tıklayın"
 
-#: app/tools/pikatextoptions.c:166
+#: app/tools/pikatextoptions.c:164
 msgid "Font size unit"
 msgstr "Yazı tipi boyutu birimi"
 
-#: app/tools/pikatextoptions.c:171 app/tools/pikatextoptions.c:172
+#: app/tools/pikatextoptions.c:169 app/tools/pikatextoptions.c:170
 msgid "Font size"
 msgstr "Yazı Tipi Boyutu"
 
-#: app/tools/pikatextoptions.c:185
+#: app/tools/pikatextoptions.c:183
 msgid "Hinting"
 msgstr "İpucu"
 
-#: app/tools/pikatextoptions.c:186
+#: app/tools/pikatextoptions.c:184
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 "Dokunma, yazı tipi dış çizgisini, küçük boyutlu canlı bit eşlem oluşturmak "
 "için değiştirir"
 
-#: app/tools/pikatextoptions.c:196
+#: app/tools/pikatextoptions.c:194
 msgid "The text language may have an effect on the way the text is rendered."
 msgstr "Metin dili, metnin görselleştirme şeklini etkileyebilir."
 
-#: app/tools/pikatextoptions.c:210
+#: app/tools/pikatextoptions.c:208
 msgid "Justify"
 msgstr "Hizala"
 
-#: app/tools/pikatextoptions.c:211
+#: app/tools/pikatextoptions.c:209
 msgid "Text alignment"
 msgstr "Metin hizalaması"
 
-#: app/tools/pikatextoptions.c:218
+#: app/tools/pikatextoptions.c:216
 msgid "Indentation"
 msgstr "Girinti"
 
-#: app/tools/pikatextoptions.c:219
+#: app/tools/pikatextoptions.c:217
 msgid "Indentation of the first line"
 msgstr "İlk satırın girintili yazımı"
 
-#: app/tools/pikatextoptions.c:226
+#: app/tools/pikatextoptions.c:224
 msgid "Line spacing"
 msgstr "Çizgi boşluğu"
 
-#: app/tools/pikatextoptions.c:227
+#: app/tools/pikatextoptions.c:225
 msgid "Adjust line spacing"
 msgstr "Satır boşluğunu ayarla"
 
-#: app/tools/pikatextoptions.c:234
+#: app/tools/pikatextoptions.c:232
 msgid "Letter spacing"
 msgstr "Harf boşluğu"
 
-#: app/tools/pikatextoptions.c:235
+#: app/tools/pikatextoptions.c:233
 msgid "Adjust letter spacing"
 msgstr "Harf boşluğunu ayarla"
 
-#: app/tools/pikatextoptions.c:242
+#: app/tools/pikatextoptions.c:240
 msgid "Box"
 msgstr "Kutu"
 
-#: app/tools/pikatextoptions.c:243
+#: app/tools/pikatextoptions.c:241
 msgid ""
 "Whether text flows into rectangular shape or moves into a new line when you "
 "press Enter"
@@ -24593,63 +24545,63 @@ msgstr ""
 "Enter tuşuna bastığınızda metnin yeni bir satıra kaydırılması veya "
 "dikdörtgen şekil içine devam edip etmemesi"
 
-#: app/tools/pikatextoptions.c:251
+#: app/tools/pikatextoptions.c:249
 msgid "Use editor window"
 msgstr "Düzenleyici penceresini kullan"
 
-#: app/tools/pikatextoptions.c:252
+#: app/tools/pikatextoptions.c:250
 msgid "Use an external editor window for text entry"
 msgstr "Metin girişi için dış metin düzenleyici kullan"
 
-#: app/tools/pikatextoptions.c:258
+#: app/tools/pikatextoptions.c:256
 msgid "Show on-canvas editor"
 msgstr "Tuvalde düzenleyici göster"
 
-#: app/tools/pikatextoptions.c:259
+#: app/tools/pikatextoptions.c:257
 msgid "Show on-canvas text editor"
 msgstr "Tuvalde metin düzenleyici göster"
 
-#: app/tools/pikatextoptions.c:301
+#: app/tools/pikatextoptions.c:299
 msgid "Outline width"
 msgstr "Çerçeve genişliği"
 
-#: app/tools/pikatextoptions.c:302
+#: app/tools/pikatextoptions.c:300
 msgid "Adjust outline width"
 msgstr "Çerçeve genişliğini ayarla"
 
-#: app/tools/pikatextoptions.c:309
+#: app/tools/pikatextoptions.c:307
 msgid "Outline width unit"
 msgstr "Çerçeve genişliği birimi"
 
-#: app/tools/pikatextoptions.c:324
+#: app/tools/pikatextoptions.c:322
 msgid "Outline miter limit"
 msgstr "Çerçeve gönye sınırı"
 
-#: app/tools/pikatextoptions.c:845
+#: app/tools/pikatextoptions.c:840
 msgid "Hinting:"
 msgstr "İpucu:"
 
-#: app/tools/pikatextoptions.c:849
+#: app/tools/pikatextoptions.c:844
 msgid "Text Color"
 msgstr "Metin Rengi"
 
-#: app/tools/pikatextoptions.c:862
+#: app/tools/pikatextoptions.c:857
 msgid "Style:"
 msgstr "Biçem:"
 
-#: app/tools/pikatextoptions.c:866
+#: app/tools/pikatextoptions.c:861
 msgid "Outline Options"
 msgstr "Çerçeve Seçenekleri"
 
-#: app/tools/pikatextoptions.c:887
+#: app/tools/pikatextoptions.c:882
 msgid "Justify:"
 msgstr "Hizala:"
 
-#: app/tools/pikatextoptions.c:917
+#: app/tools/pikatextoptions.c:912
 msgid "Box:"
 msgstr "Kutu:"
 
-#: app/tools/pikatextoptions.c:957
+#: app/tools/pikatextoptions.c:952
 msgid "Language:"
 msgstr "Dil:"
 
@@ -28230,40 +28182,40 @@ msgctxt "tab-style"
 msgid "Status & desc"
 msgstr "Durum ve açıklama"
 
-#: app/xcf/xcf.c:121 app/xcf/xcf.c:189
+#: app/xcf/xcf.c:120 app/xcf/xcf.c:188
 msgid "PIKA XCF image"
 msgstr "PIKA XCF görüntüsü"
 
-#: app/xcf/xcf.c:266 app/xcf/xcf.c:355
+#: app/xcf/xcf.c:265 app/xcf/xcf.c:354
 msgid "Memory Stream"
 msgstr "Bellek Akışı"
 
-#: app/xcf/xcf.c:277
+#: app/xcf/xcf.c:276
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' açılıyor"
 
-#: app/xcf/xcf.c:319
+#: app/xcf/xcf.c:318
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr "XCF hatası: desteklenmeyen %d XCF dosya sürümüyle karşılaşıldı"
 
-#: app/xcf/xcf.c:378
+#: app/xcf/xcf.c:377
 #, c-format
 msgid "Saving '%s'"
 msgstr "'%s' kaydediliyor"
 
-#: app/xcf/xcf.c:386
+#: app/xcf/xcf.c:385
 #, c-format
 msgid "Closing '%s'"
 msgstr "'%s' kapatılıyor"
 
-#: app/xcf/xcf.c:404
+#: app/xcf/xcf.c:403
 #, c-format
 msgid "Error writing '%s': "
 msgstr "'%s' yazma hatası: "
 
-#: app/xcf/xcf.c:492
+#: app/xcf/xcf.c:491
 #, c-format
 msgid "Error creating '%s': "
 msgstr "'%s' oluşturulurken hata: "

po/uk.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pika\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-24 21:51+0000\n"
+"POT-Creation-Date: 2023-09-14 23:23+0000\n"
-"PO-Revision-Date: 2023-09-25 09:53+0300\n"
+"PO-Revision-Date: 2023-09-15 20:27+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -2437,7 +2437,7 @@ msgstr "240 секунд"
 #: app/display/pikadisplayshell-close.c:181
 #: app/display/pikadisplayshell-filter-dialog.c:87
 #: app/display/pikadisplayshell-rotate-dialog.c:123
-#: app/display/pikadisplayshell-scale-dialog.c:131
+#: app/display/pikadisplayshell-scale-dialog.c:123
 #: app/tools/pikafiltertool.c:364 app/tools/pikaforegroundselecttool.c:331
 #: app/tools/pikatexttool.c:1751 app/tools/pikatransformgridtool.c:1264
 #: app/tools/pikatransformtool.c:428 app/widgets/pikaactionview.c:621
@@ -5018,8 +5018,7 @@ msgstr "Повторно просканувати встановлені шри
 
 #: app/actions/pikageglprocedure.c:303
 #, c-format
-msgid ""
+msgid "There are no last settings for '%s', showing the filter dialog instead."
-"There are no last settings for '%s', showing the filter dialog instead."
 msgstr ""
 "Немає останніх параметрів «%s». Показуємо діалогове вікно фільтрування."
 
@@ -5439,8 +5438,7 @@ msgstr "Показати у програмі для _керування файл
 #: app/actions/gradients-actions.c:63
 msgctxt "gradients-action"
 msgid "Show gradient file location in the file manager"
-msgstr ""
+msgstr "Показати розташування файла градієнта у програмі для керування файлами"
-"Показати розташування файла градієнта у програмі для керування файлами"
 
 #: app/actions/gradients-actions.c:68
 msgctxt "gradients-action"
@@ -8005,8 +8003,7 @@ msgstr "З_берігати параметри інструментів до ш
 #: app/actions/tool-preset-editor-actions.c:45
 msgctxt "tool-preset-editor-action"
 msgid "Save the active tool options to this tool preset"
-msgstr ""
+msgstr "Зберегти параметри активних інструментів до цього шаблону інструментів"
-"Зберегти параметри активних інструментів до цього шаблону інструментів"
 
 #: app/actions/tool-preset-editor-actions.c:51
 msgctxt "tool-preset-editor-action"
@@ -8079,8 +8076,7 @@ msgstr "З_берігати параметри інструментів до ш
 #: app/actions/tool-presets-actions.c:71
 msgctxt "tool-presets-action"
 msgid "Save the active tool options to this tool preset"
-msgstr ""
+msgstr "Зберегти параметри активних інструментів до цього шаблону інструментів"
-"Зберегти параметри активних інструментів до цього шаблону інструментів"
 
 #: app/actions/tool-presets-actions.c:77
 msgctxt "tool-presets-action"
@@ -9488,467 +9484,409 @@ msgid "Zoom in a lot"
 msgstr "Значно збільшити"
 
 #: app/actions/view-actions.c:373
-#| msgctxt "view-zoom-action"
-#| msgid "1_6:1  (1600%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 16:1 (1600%)"
-msgstr "Масштаб 16:1 (1600%)"
-
-#: app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1  (1600%)"
 
-#: app/actions/view-actions.c:376
+#: app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "Масштаб 16:1"
 
-#: app/actions/view-actions.c:381
+#: app/actions/view-actions.c:379
-#| msgctxt "view-zoom-action"
-#| msgid "_8:1  (800%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 8:1 (800%)"
-msgstr "Масштаб 8:1 (800%)"
-
-#: app/actions/view-actions.c:382
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1  (800%)"
 
-#: app/actions/view-actions.c:384
+#: app/actions/view-actions.c:380
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "Масштаб 8:1"
 
-#: app/actions/view-actions.c:389
+#: app/actions/view-actions.c:385
-#| msgctxt "view-zoom-action"
-#| msgid "_4:1  (400%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 4:1 (400%)"
-msgstr "Масштаб 4:1 (400%)"
-
-#: app/actions/view-actions.c:390
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1  (400%)"
 
-#: app/actions/view-actions.c:392
+#: app/actions/view-actions.c:386
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "Масштаб 4:1"
 
-#: app/actions/view-actions.c:397
+#: app/actions/view-actions.c:391
-#| msgctxt "view-zoom-action"
-#| msgid "_2:1  (200%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 2:1 (200%)"
-msgstr "Масштаб 2:1 (200%)"
-
-#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1  (200%)"
 
-#: app/actions/view-actions.c:400
+#: app/actions/view-actions.c:392
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "Масштаб 2:1"
 
-#: app/actions/view-actions.c:405
+#: app/actions/view-actions.c:397
-#| msgctxt "view-zoom-action"
-#| msgid "_1:1  (100%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:1 (100%)"
-msgstr "Масштаб 1:1 (100%)"
-
-#: app/actions/view-actions.c:406
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "_1:1  (100%)"
 
-#: app/actions/view-actions.c:408
+#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "Масштаб 1:1"
 
-#: app/actions/view-actions.c:413
+#: app/actions/view-actions.c:403
-#| msgctxt "view-zoom-action"
-#| msgid "Zoom 1:2"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:2 (50%)"
-msgstr "Масштаб 1:2 (50%)"
-
-#: app/actions/view-actions.c:414
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2  (50%)"
 
-#: app/actions/view-actions.c:416
+#: app/actions/view-actions.c:404
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "Масштаб 1:2"
 
-#: app/actions/view-actions.c:421
+#: app/actions/view-actions.c:409
-#| msgctxt "view-zoom-action"
-#| msgid "Zoom 1:4"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:4 (25%)"
-msgstr "Масштаб 1:4 (25%)"
-
-#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4  (25%)"
 
-#: app/actions/view-actions.c:424
+#: app/actions/view-actions.c:410
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "Масштаб 1:4"
 
-#: app/actions/view-actions.c:429
+#: app/actions/view-actions.c:415
-#| msgctxt "view-zoom-action"
-#| msgid "1:_8  (12.5%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:8 (12.5%)"
-msgstr "Масштаб 1:8 (12.5%)"
-
-#: app/actions/view-actions.c:430
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8  (12.5%)"
 
-#: app/actions/view-actions.c:432
+#: app/actions/view-actions.c:416
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "Масштаб 1:8"
 
-#: app/actions/view-actions.c:437
+#: app/actions/view-actions.c:421
-#| msgctxt "view-zoom-action"
-#| msgid "1:1_6  (6.25%)"
-msgctxt "view-zoom-action"
-msgid "Zoom 1:16 (6.25%)"
-msgstr "Масштаб 1:16 (6.25%)"
-
-#: app/actions/view-actions.c:438
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6  (6.25%)"
 
-#: app/actions/view-actions.c:440
+#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "Масштаб 1:16"
 
-#: app/actions/view-actions.c:445 app/actions/view-actions.c:448
+#: app/actions/view-actions.c:427
-msgctxt "view-zoom-action"
-msgid "Set a custom zoom factor"
-msgstr "Вказати інший масштаб"
-
-#: app/actions/view-actions.c:446
 msgctxt "view-zoom-action"
 msgid "Othe_r zoom factor..."
 msgstr "І_нший масштаб…"
 
-#: app/actions/view-actions.c:456
+#: app/actions/view-actions.c:428
+msgctxt "view-zoom-action"
+msgid "Set a custom zoom factor"
+msgstr "Вказати інший масштаб"
+
+#: app/actions/view-actions.c:436
 msgctxt "view-action"
 msgid "Flip _Horizontally"
 msgstr "Віддзеркалити _горизонтально"
 
-#: app/actions/view-actions.c:457
+#: app/actions/view-actions.c:437
 msgctxt "view-action"
 msgid "Flip the view horizontally"
 msgstr "Віддзеркалення зображення горизонтально"
 
-#: app/actions/view-actions.c:463
+#: app/actions/view-actions.c:443
 msgctxt "view-action"
 msgid "Flip _Vertically"
 msgstr "Віддзеркалити _вертикально"
 
-#: app/actions/view-actions.c:464
+#: app/actions/view-actions.c:444
 msgctxt "view-action"
 msgid "Flip the view vertically"
 msgstr "Віддзеркалення зображення вертикально"
 
-#: app/actions/view-actions.c:473
+#: app/actions/view-actions.c:453
 msgctxt "view-action"
 msgid "Display Rotation Absolute Angle Set"
 msgstr "Показати встановлений абсолютний кут обертання"
 
-#: app/actions/view-actions.c:479
+#: app/actions/view-actions.c:459
 msgctxt "view-action"
 msgid "_Reset Rotate"
 msgstr "С_кинути обертання"
 
-#: app/actions/view-actions.c:481
+#: app/actions/view-actions.c:461
 msgctxt "view-action"
 msgid "Reset the angle of rotation to 0°"
 msgstr "Встановити кут обертання 0°"
 
-#: app/actions/view-actions.c:489
+#: app/actions/view-actions.c:469
 msgctxt "view-action"
 msgid "Rotate 15° _clockwise"
 msgstr "Обернути на 15° за _годинниковою стрілкою"
 
-#: app/actions/view-actions.c:490
+#: app/actions/view-actions.c:470
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the right"
 msgstr "Обертання зображення на 15 градусів праворуч"
 
-#: app/actions/view-actions.c:495
+#: app/actions/view-actions.c:475
 msgctxt "view-action"
 msgid "Rotate 90° _clockwise"
 msgstr "Обернути на 90° за _годинниковою стрілкою"
 
-#: app/actions/view-actions.c:496
+#: app/actions/view-actions.c:476
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the right"
 msgstr "Обертання зображення на 90 градусів праворуч"
 
-#: app/actions/view-actions.c:501
+#: app/actions/view-actions.c:481
 msgctxt "view-action"
 msgid "Rotate _180°"
 msgstr "Обернути на _180°"
 
-#: app/actions/view-actions.c:502
+#: app/actions/view-actions.c:482
 msgctxt "view-action"
 msgid "Turn the view upside-down"
 msgstr "Обертання зображення догори ногами"
 
-#: app/actions/view-actions.c:507
+#: app/actions/view-actions.c:487
 msgctxt "view-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "Обернути на 90° _проти годинникової стрілки"
 
-#: app/actions/view-actions.c:508
+#: app/actions/view-actions.c:488
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the left"
 msgstr "Обернути зображення на 90 градусів ліворуч"
 
-#: app/actions/view-actions.c:513
+#: app/actions/view-actions.c:493
 msgctxt "view-action"
 msgid "Rotate 15° counter-clock_wise"
 msgstr "Обернути на 15° _проти годинникової стрілки"
 
-#: app/actions/view-actions.c:514
+#: app/actions/view-actions.c:494
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the left"
 msgstr "Обернути зображення на 15 градусів ліворуч"
 
-#: app/actions/view-actions.c:522
+#: app/actions/view-actions.c:502
 msgctxt "view-action"
 msgid "_Perceptual"
 msgstr "П_ридатне до сприйняття"
 
-#: app/actions/view-actions.c:523
+#: app/actions/view-actions.c:503
 msgctxt "view-action"
 msgid "Display rendering intent is perceptual"
 msgstr "Відтворення кольорів на дисплеї є придатним до сприйняття"
 
-#: app/actions/view-actions.c:528
+#: app/actions/view-actions.c:508
 msgctxt "view-action"
 msgid "_Relative Colorimetric"
 msgstr "_Відносне колориметричне"
 
-#: app/actions/view-actions.c:529
+#: app/actions/view-actions.c:509
 msgctxt "view-action"
 msgid "Display rendering intent is relative colorimetric"
 msgstr "Відтворення кольорів на дисплеї є відносним колориметричним"
 
-#: app/actions/view-actions.c:534
+#: app/actions/view-actions.c:514
 msgctxt "view-action"
 msgid "_Saturation"
 msgstr "_Насиченість"
 
-#: app/actions/view-actions.c:535
+#: app/actions/view-actions.c:515
 msgctxt "view-action"
 msgid "Display rendering intent is saturation"
 msgstr "Відтворення кольорів на дисплеї є спрямованим на насиченість"
 
-#: app/actions/view-actions.c:540
+#: app/actions/view-actions.c:520
 msgctxt "view-action"
 msgid "_Absolute Colorimetric"
 msgstr "_Абсолютне колориметричне"
 
-#: app/actions/view-actions.c:541
+#: app/actions/view-actions.c:521
 msgctxt "view-action"
 msgid "Display rendering intent is absolute colorimetric"
 msgstr "Відтворення кольорів на дисплеї є абсолютним колориметричним"
 
-#: app/actions/view-actions.c:549
+#: app/actions/view-actions.c:529
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "З т_еми"
 
-#: app/actions/view-actions.c:550
+#: app/actions/view-actions.c:530
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "Встановити колір тла поточної теми оформлення"
 
-#: app/actions/view-actions.c:555
+#: app/actions/view-actions.c:535
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "_Світлий"
 
-#: app/actions/view-actions.c:556
+#: app/actions/view-actions.c:536
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "Використовувати світлий колір тла"
 
-#: app/actions/view-actions.c:561
+#: app/actions/view-actions.c:541
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "_Темний"
 
-#: app/actions/view-actions.c:562
+#: app/actions/view-actions.c:542
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "Використовувати темний колір тла"
 
-#: app/actions/view-actions.c:567
+#: app/actions/view-actions.c:547
 msgctxt "view-padding-color"
 msgid "_Custom Color..."
 msgstr "Інший _колір…"
 
-#: app/actions/view-actions.c:568
+#: app/actions/view-actions.c:548
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "Використовувати довільний колір тла"
 
-#: app/actions/view-actions.c:573
+#: app/actions/view-actions.c:553
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "Як у п_араметрах"
 
-#: app/actions/view-actions.c:575
+#: app/actions/view-actions.c:555
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "Скинути колір тла до вказаного у параметрах програми"
 
-#: app/actions/view-actions.c:583
+#: app/actions/view-actions.c:563
 msgctxt "view-padding-color"
 msgid "Keep Padding in \"Show _All\" Mode"
 msgstr "Зберігати підкладку у режимі «Показати _усе»"
 
-#: app/actions/view-actions.c:585
+#: app/actions/view-actions.c:565
 msgctxt "view-padding-color"
 msgid "Keep canvas padding when \"View -> Show All\" is enabled"
 msgstr ""
 "Зберігати підкладку полотна, якщо позначено пункт меню «Перегляд → Показати "
 "усе»"
 
-#: app/actions/view-actions.c:594
+#: app/actions/view-actions.c:574
 msgctxt "view-action"
 msgid "Set horizontal scroll offset"
 msgstr "Встановити горизонтальне зміщення гортання"
 
-#: app/actions/view-actions.c:599
+#: app/actions/view-actions.c:579
 msgctxt "view-action"
 msgid "Scroll to left border"
 msgstr "Гортати до лівої межі"
 
-#: app/actions/view-actions.c:604
+#: app/actions/view-actions.c:584
 msgctxt "view-action"
 msgid "Scroll to right border"
 msgstr "Гортати до правої межі"
 
-#: app/actions/view-actions.c:609
+#: app/actions/view-actions.c:589
 msgctxt "view-action"
 msgid "Scroll left"
 msgstr "Гортати ліворуч"
 
-#: app/actions/view-actions.c:614
+#: app/actions/view-actions.c:594
 msgctxt "view-action"
 msgid "Scroll right"
 msgstr "Гортати праворуч"
 
-#: app/actions/view-actions.c:619
+#: app/actions/view-actions.c:599
 msgctxt "view-action"
 msgid "Scroll page left"
 msgstr "Гортати на сторінку ліворуч"
 
-#: app/actions/view-actions.c:624
+#: app/actions/view-actions.c:604
 msgctxt "view-action"
 msgid "Scroll page right"
 msgstr "Гортати на сторінку праворуч"
 
-#: app/actions/view-actions.c:632
+#: app/actions/view-actions.c:612
 msgctxt "view-action"
 msgid "Set vertical scroll offset"
 msgstr "Встановити вертикальне зміщення гортання"
 
-#: app/actions/view-actions.c:637
+#: app/actions/view-actions.c:617
 msgctxt "view-action"
 msgid "Scroll to top border"
 msgstr "Гортати до верхньої межі"
 
-#: app/actions/view-actions.c:642
+#: app/actions/view-actions.c:622
 msgctxt "view-action"
 msgid "Scroll to bottom border"
 msgstr "Гортати до нижньої межі"
 
-#: app/actions/view-actions.c:647
+#: app/actions/view-actions.c:627
 msgctxt "view-action"
 msgid "Scroll up"
 msgstr "Гортати вгору"
 
-#: app/actions/view-actions.c:652
+#: app/actions/view-actions.c:632
 msgctxt "view-action"
 msgid "Scroll down"
 msgstr "Гортати вниз"
 
-#: app/actions/view-actions.c:657
+#: app/actions/view-actions.c:637
 msgctxt "view-action"
 msgid "Scroll page up"
 msgstr "Гортати на сторінку вгору"
 
-#: app/actions/view-actions.c:662
+#: app/actions/view-actions.c:642
 msgctxt "view-action"
 msgid "Scroll page down"
 msgstr "Гортати на сторінку вниз"
 
-#: app/actions/view-actions.c:848
+#: app/actions/view-actions.c:841
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "Повернути _масштаб (%d%%)"
 
-#: app/actions/view-actions.c:856
+#: app/actions/view-actions.c:849
 msgid "Re_vert Zoom"
 msgstr "_Вернути масштаб"
 
-#: app/actions/view-actions.c:1004
+#: app/actions/view-actions.c:1017
+#, c-format
+msgid "Othe_r (%s)..."
+msgstr "_Інший (%s) …"
+
+#: app/actions/view-actions.c:1028
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "Мас_штаб (%s)"
 
 #. please preserve the trailing space
 #. H: Horizontal, V: Vertical
-#: app/actions/view-actions.c:1024
+#: app/actions/view-actions.c:1052
 msgid "(H+V) "
 msgstr "(H+V) "
 
 #. please preserve the trailing space
 #. H: Horizontal
-#: app/actions/view-actions.c:1030
+#: app/actions/view-actions.c:1058
 msgid "(H) "
 msgstr "(H) "
 
 #. please preserve the trailing space
 #. V: Vertical
-#: app/actions/view-actions.c:1036
+#: app/actions/view-actions.c:1064
 msgid "(V) "
 msgstr "(V) "
 
-#: app/actions/view-actions.c:1045
+#: app/actions/view-actions.c:1073
 #, c-format
 msgid "_Flip %s& Rotate (%d°)"
 msgstr "_Віддзеркалити %s і обернути (%d°)"
 
-#: app/actions/view-commands.c:1074
+#: app/actions/view-commands.c:1089
 msgid "Set Canvas Padding Color"
 msgstr "Колір тла навколо зображення"
 
-#: app/actions/view-commands.c:1076
+#: app/actions/view-commands.c:1091
 msgid "Set Custom Canvas Padding Color"
 msgstr "Встановити колір тла навколо зображення"
 
@@ -9972,7 +9910,7 @@ msgstr "Перемістити це вікно на екран %s"
 #: app/dialogs/template-options-dialog.c:119
 #: app/display/pikadisplayshell-filter-dialog.c:88
 #: app/display/pikadisplayshell-rotate-dialog.c:124
-#: app/display/pikadisplayshell-scale-dialog.c:132 app/gui/gui.c:184
+#: app/display/pikadisplayshell-scale-dialog.c:124 app/gui/gui.c:184
 #: app/tools/pikafiltertool.c:365 app/widgets/pikacolordialog.c:464
 #: app/widgets/pikacontrollereditor.c:663 app/widgets/pikaerrordialog.c:76
 #: app/widgets/pikafiledialog.c:176 app/widgets/pikamodifierseditor.c:685
@@ -10447,8 +10385,7 @@ msgid ""
 msgstr "Якщо ввімкнено, кожна точка зображення відповідатиме точці екрану."
 
 #: app/config/pikarc-blurbs.h:112
-msgid ""
+msgid "This is the distance in pixels where Guide and Grid snapping activates."
-"This is the distance in pixels where Guide and Grid snapping activates."
 msgstr ""
 "Відстань у точках, при наближенні на яку відбувається прилипання до "
 "напрямних чи сітки."
@@ -10463,8 +10400,7 @@ msgstr "Типово увімкнено прилипання до сітки у
 
 #: app/config/pikarc-blurbs.h:122
 msgid "Snap to the canvas edges by default in new image windows."
-msgstr ""
+msgstr "Типово увімкнено прилипання до країв полотна у вікнах нових зображень."
-"Типово увімкнено прилипання до країв полотна у вікнах нових зображень."
 
 #: app/config/pikarc-blurbs.h:125
 msgid "Snap to the active path by default in new image windows."
@@ -11100,8 +11036,7 @@ msgstr ""
 
 #: app/config/pikarc-blurbs.h:581
 msgid "Sets the default palette type for the 'Convert to Indexed' dialog."
-msgstr ""
+msgstr "Встановлює типовий тип палітри для вікна «Перетворити на індексоване»."
-"Встановлює типовий тип палітри для вікна «Перетворити на індексоване»."
 
 #: app/config/pikarc-blurbs.h:584
 msgid ""
@@ -11339,12 +11274,10 @@ msgstr ""
 
 #: app/config/pikarc-blurbs.h:720
 msgid "Show the current foreground and background colors in the toolbox."
-msgstr ""
+msgstr "Поміняти у панелі інструментів місцями кольори переднього плану та тла"
-"Поміняти у панелі інструментів місцями кольори переднього плану та тла"
 
 #: app/config/pikarc-blurbs.h:723
-msgid ""
+msgid "Show the currently selected brush, pattern and gradient in the toolbox."
-"Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr ""
 "Показувати активний пензель, текстуру та градієнт у панелі інструментів."
 
@@ -12803,8 +12736,7 @@ msgstr "Немає доступних текстур для цієї опера
 
 #: app/core/pika-utils.c:1467
 msgid "This parser does not support imbricated lists."
-msgstr ""
+msgstr "У цьому засобі обробки не передбачено підтримки упорядкованих списків."
-"У цьому засобі обробки не передбачено підтримки упорядкованих списків."
 
 #: app/core/pika-utils.c:1490
 msgid "<li> must be inside <ol> or <ul> tags."
@@ -12893,8 +12825,7 @@ msgstr ""
 
 #: app/core/pikabrush-load.c:736
 msgid "Fatal parse error in brush file: Wide brushes are not supported."
-msgstr ""
+msgstr "Критична помилка аналізу файла пензля: широкі пензлі не підтримуються."
-"Критична помилка аналізу файла пензля: широкі пензлі не підтримуються."
 
 #: app/core/pikabrush-load.c:885
 msgid "Fatal parse error in brush file: File appears truncated: "
@@ -13530,8 +13461,7 @@ msgstr "Колір переднього плану."
 #: app/core/pikagrid.c:102
 msgid ""
 "The background color of the grid; only used in double dashed line style."
-msgstr ""
+msgstr "Колір тла сітки; використовується лише для стилю \"Подвійний пунктир\""
-"Колір тла сітки; використовується лише для стилю \"Подвійний пунктир\""
 
 #: app/core/pikagrid.c:109
 msgid "Spacing X"
@@ -13826,8 +13756,7 @@ msgstr ""
 "кольорів з відтінків сірого"
 
 #: app/core/pikaimage-color-profile.c:557
-msgid ""
+msgid "ICC profile validation failed: Color profile is not for RGB color space"
-"ICC profile validation failed: Color profile is not for RGB color space"
 msgstr ""
 "Перевірка профілю ICC не вдалася: колірний профіль не годиться для колірного "
 "простору RGB"
@@ -14464,6 +14393,7 @@ msgid "Premature end of file."
 msgstr "Передчасний кінець файлу."
 
 #: app/core/pikapalette-load.c:691
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette version."
 msgstr "Некоректна версія палітри ACB."
 
@@ -14472,19 +14402,23 @@ msgid "PIKA only supports version 1 ACB palettes"
 msgstr "У PIKA передбачено підтримку лише версії 1 палітр ACB"
 
 #: app/core/pikapalette-load.c:704
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette identifier."
 msgstr "Некоректний ідентифікатор палітри ACB."
 
 #: app/core/pikapalette-load.c:719 app/core/pikapalette-load.c:958
 #: app/core/pikapalette-load.c:979
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette name."
 msgstr "Некоректна назва палітри ACB."
 
 #: app/core/pikapalette-load.c:737
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette prefix."
 msgstr "Некоректний префікс палітри ACB."
 
 #: app/core/pikapalette-load.c:752
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette suffix."
 msgstr "Некоректний суфікс палітри ACB."
 
@@ -14498,14 +14432,17 @@ msgid "Invalid number of colors: %s."
 msgstr "Некоректна кількість кольорів: %s."
 
 #: app/core/pikapalette-load.c:788 app/core/pikapalette-load.c:797
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette page info."
 msgstr "Некоректні дані сторінки палітри ACB."
 
 #: app/core/pikapalette-load.c:808 app/core/pikapalette-load.c:830
+#| msgid "Invalid ASE palette name."
 msgid "Invalid ACB palette color space."
 msgstr "Некоректний простір кольорів палітри ACB."
 
 #: app/core/pikapalette-load.c:968
+#| msgid "Invalid ASE name size."
 msgid "Invalid ACB name size."
 msgstr "Некоректний розмір назви ACB."
 
@@ -14584,8 +14521,7 @@ msgstr ""
 #: app/core/pikapattern-load.c:116
 #, c-format
 msgid "Invalid header data in '%s': Pattern name is too long: %lu"
-msgstr ""
+msgstr "Неправильний заголовок даних у «%s»: занадто довга назва візерунка %lu"
-"Неправильний заголовок даних у «%s»: занадто довга назва візерунка %lu"
 
 #: app/core/pikapattern-load.c:129 app/core/pikapattern-load.c:167
 msgid "File appears truncated."
@@ -15753,8 +15689,7 @@ msgid "Reset Input Device Configuration"
 msgstr "Скинути налаштування пристрою введення"
 
 #: app/dialogs/input-devices-dialog.c:132
-msgid ""
+msgid "Do you really want to reset all input devices to default configuration?"
-"Do you really want to reset all input devices to default configuration?"
 msgstr ""
 "Ви дійсно бажаєте відновити типові налаштування для усіх пристроїв введення?"
 
@@ -15921,8 +15856,7 @@ msgstr "Рівень: %s, життя: %s"
 
 #: app/dialogs/lebl-dialog.c:150
 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"
-msgstr ""
+msgstr "Вліво/Вправо - переміщення, Пробіл - постріл, 'p' - пауза, 'q' - вихід"
-"Вліво/Вправо - переміщення, Пробіл - постріл, 'p' - пауза, 'q' - вихід"
 
 #: app/dialogs/lebl-dialog.c:816
 msgid "Killer GEGLs from Outer Space"
@@ -16092,8 +16026,7 @@ msgid "Do you really want to reset all preferences to default values?"
 msgstr "Дійсно бажаєте повернутись до початкових значень усіх параметрів?"
 
 #: app/dialogs/preferences-dialog.c:396
-msgid ""
+msgid "You will have to restart PIKA for the following changes to take effect:"
-"You will have to restart PIKA for the following changes to take effect:"
 msgstr "Щоб зміни вступили в дію, необхідно перезапустити PIKA."
 
 #: app/dialogs/preferences-dialog.c:668
@@ -17461,8 +17394,7 @@ msgstr "Інтерфейс введення з вказівника:"
 
 #: app/dialogs/preferences-dialog.c:3397
 msgid "S_hare tool and tool options between input devices"
-msgstr ""
+msgstr "Сп_ільне використання інструментів і параметрів для пристроїв введення"
-"Сп_ільне використання інструментів і параметрів для пристроїв введення"
 
 #: app/dialogs/preferences-dialog.c:3401
 msgid "Configure E_xtended Input Devices..."
@@ -18435,8 +18367,7 @@ msgstr[3] ""
 
 #: app/display/pikadisplayshell-close.c:332
 #, c-format
-msgid ""
+msgid "If you don't save the image, changes from the last minute will be lost."
-"If you don't save the image, changes from the last minute will be lost."
 msgid_plural ""
 "If you don't save the image, changes from the last %d minutes will be lost."
 msgstr[0] ""
@@ -18545,34 +18476,22 @@ msgstr "Кут:"
 msgid "degrees"
 msgstr "градуси"
 
-#: app/display/pikadisplayshell-scale-dialog.c:124
+#: app/display/pikadisplayshell-scale-dialog.c:116
 msgid "Zoom Ratio"
 msgstr "Масштаб"
 
-#: app/display/pikadisplayshell-scale-dialog.c:126
+#: app/display/pikadisplayshell-scale-dialog.c:118
 msgid "Select Zoom Ratio"
 msgstr "Вибір масштабу"
 
-#: app/display/pikadisplayshell-scale-dialog.c:168
+#: app/display/pikadisplayshell-scale-dialog.c:160
 msgid "Zoom ratio:"
 msgstr "Пропорції:"
 
-#: app/display/pikadisplayshell-scale-dialog.c:193
+#: app/display/pikadisplayshell-scale-dialog.c:185
 msgid "Zoom:"
 msgstr "Масштаб:"
 
-#: app/display/pikadisplayshell-scale-dialog.c:246
-#, c-format
-msgid "Othe_r (%s)..."
-msgstr "_Інший (%s) …"
-
-#: app/display/pikadisplayshell-scale-dialog.c:250
-#, c-format
-#| msgctxt "view-padding-color"
-#| msgid "_Custom Color..."
-msgid "Custom Zoom (%s)..."
-msgstr "Нетиповий масштаб (%s)…"
-
 #: app/display/pikadisplayshell-title.c:299
 msgid "(modified)"
 msgstr "(змінено)"
@@ -20707,8 +20626,7 @@ msgstr "Метод малювання «%s» не існує"
 
 #: app/pdb/pikapdb-utils.c:326
 #, c-format
-msgid ""
+msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
-"Item '%s' (%d) cannot be used because it has not been added to an image"
 msgstr ""
 "Об'єкт «%s» (%d) неможливо використовувати, бо його не додано до зображення"
 
@@ -21487,8 +21405,7 @@ msgstr "Неправильна назва змінної у файлі сере
 #: app/plug-in/pikainterpreterdb.c:303 app/plug-in/pikainterpreterdb.c:400
 #, c-format
 msgid "Bad interpreter referenced in interpreter file %s: %s"
-msgstr ""
+msgstr "Неправильне посилання на інтерпретатор у інтерпретованому файлі %s: %s"
-"Неправильне посилання на інтерпретатор у інтерпретованому файлі %s: %s"
 
 #: app/plug-in/pikainterpreterdb.c:372
 #, c-format
@@ -22236,8 +22153,7 @@ msgstr "Вирівняти точки прив'язки цілей за етал
 
 #: app/tools/pikaalignoptions.c:504
 msgid "Align anchor points of targets on horizontal middle of reference"
-msgstr ""
+msgstr "Вирівняти точки прив'язки цілей за еталонною серединою за горизонталлю"
-"Вирівняти точки прив'язки цілей за еталонною серединою за горизонталлю"
 
 #: app/tools/pikaalignoptions.c:508
 msgid "Align anchor points of targets on bottom of reference"
@@ -23638,8 +23554,7 @@ msgid "Handle Transform"
 msgstr "Перетворення за точками"
 
 #: app/tools/pikahandletransformtool.c:112
-msgid ""
+msgid "Handle Transform Tool: Deform the layer, selection or path with handles"
-"Handle Transform Tool: Deform the layer, selection or path with handles"
 msgstr ""
 "Перетворення за точками: деформуйте шар, позначену ділянку або контур на "
 "основі позначених опорних точок"
@@ -24049,8 +23964,7 @@ msgid "N-Point Deformation"
 msgstr "Деформація за N точками"
 
 #: app/tools/pikanpointdeformationtool.c:159
-msgid ""
+msgid "N-Point Deformation Tool: Rubber-like deformation of image using points"
-"N-Point Deformation Tool: Rubber-like deformation of image using points"
 msgstr ""
 "Деформація за N точками: гумова деформація зображення на основі вказаних "
 "точок"
@@ -25741,8 +25655,7 @@ msgstr "_Перепризначити скорочення"
 #: app/widgets/pikaactionview.c:638
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
-msgstr ""
+msgstr "Клавіші швидкого \"%s\" вже використані у пункті \"%s\" з меню \"%s\"."
-"Клавіші швидкого \"%s\" вже використані у пункті \"%s\" з меню \"%s\"."
 
 #: app/widgets/pikaactionview.c:642
 #, c-format

po/zh_CN.po

@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PIKA-master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/pika/issues\n"
-"POT-Creation-Date: 2023-09-24 21:51+0000\n"
+"POT-Creation-Date: 2023-09-14 23:23+0000\n"
-"PO-Revision-Date: 2023-09-25 09:22+0800\n"
+"PO-Revision-Date: 2023-09-15 09:12+0800\n"
 "Last-Translator: lumingzh <lumingzh@qq.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Gtranslator 45.1\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: desktop/technology.heckin.PIKA.appdata.xml.in.in:15
 msgid "The PIKA team"
@@ -2423,7 +2423,7 @@ msgstr "240 秒"
 #: app/display/pikadisplayshell-close.c:181
 #: app/display/pikadisplayshell-filter-dialog.c:87
 #: app/display/pikadisplayshell-rotate-dialog.c:123
-#: app/display/pikadisplayshell-scale-dialog.c:131
+#: app/display/pikadisplayshell-scale-dialog.c:123
 #: app/tools/pikafiltertool.c:364 app/tools/pikaforegroundselecttool.c:331
 #: app/tools/pikatexttool.c:1751 app/tools/pikatransformgridtool.c:1264
 #: app/tools/pikatransformtool.c:428 app/widgets/pikaactionview.c:621
@@ -9382,446 +9382,406 @@ msgstr "放大很多"
 
 #: app/actions/view-actions.c:373
 msgctxt "view-zoom-action"
-msgid "Zoom 16:1 (1600%)"
-msgstr "缩放 16:1 (1600%)"
-
-#: app/actions/view-actions.c:374
-msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1  (1600%)"
 
-#: app/actions/view-actions.c:376
+#: app/actions/view-actions.c:374
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "缩放 16:1"
 
-#: app/actions/view-actions.c:381
+#: app/actions/view-actions.c:379
-msgctxt "view-zoom-action"
-msgid "Zoom 8:1 (800%)"
-msgstr "缩放 8:1 (800%)"
-
-#: app/actions/view-actions.c:382
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1  (800%)"
 
-#: app/actions/view-actions.c:384
+#: app/actions/view-actions.c:380
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "缩放 8:1"
 
-#: app/actions/view-actions.c:389
+#: app/actions/view-actions.c:385
-msgctxt "view-zoom-action"
-msgid "Zoom 4:1 (400%)"
-msgstr "缩放 4:1 (400%)"
-
-#: app/actions/view-actions.c:390
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1  (400%)"
 
-#: app/actions/view-actions.c:392
+#: app/actions/view-actions.c:386
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "缩放 4:1"
 
-#: app/actions/view-actions.c:397
+#: app/actions/view-actions.c:391
-msgctxt "view-zoom-action"
-msgid "Zoom 2:1 (200%)"
-msgstr "缩放 2:1 (200%)"
-
-#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1  (200%)"
 
-#: app/actions/view-actions.c:400
+#: app/actions/view-actions.c:392
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "缩放 2:1"
 
-#: app/actions/view-actions.c:405
+#: app/actions/view-actions.c:397
-msgctxt "view-zoom-action"
-msgid "Zoom 1:1 (100%)"
-msgstr "缩放 1:1 (100%)"
-
-#: app/actions/view-actions.c:406
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "_1:1  (100%)"
 
-#: app/actions/view-actions.c:408
+#: app/actions/view-actions.c:398
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "缩放 1:1"
 
-#: app/actions/view-actions.c:413
+#: app/actions/view-actions.c:403
-msgctxt "view-zoom-action"
-msgid "Zoom 1:2 (50%)"
-msgstr "缩放 1:2 (50%)"
-
-#: app/actions/view-actions.c:414
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2  (50%)"
 
-#: app/actions/view-actions.c:416
+#: app/actions/view-actions.c:404
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "缩放 1:2"
 
-#: app/actions/view-actions.c:421
+#: app/actions/view-actions.c:409
-msgctxt "view-zoom-action"
-msgid "Zoom 1:4 (25%)"
-msgstr "缩放 1:4 (25%)"
-
-#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4  (25%)"
 
-#: app/actions/view-actions.c:424
+#: app/actions/view-actions.c:410
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "缩放 1:4"
 
-#: app/actions/view-actions.c:429
+#: app/actions/view-actions.c:415
-msgctxt "view-zoom-action"
-msgid "Zoom 1:8 (12.5%)"
-msgstr "缩放 1:8 (12.5%)"
-
-#: app/actions/view-actions.c:430
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8  (12.5%)"
 
-#: app/actions/view-actions.c:432
+#: app/actions/view-actions.c:416
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "缩放 1:8"
 
-#: app/actions/view-actions.c:437
+#: app/actions/view-actions.c:421
-msgctxt "view-zoom-action"
-msgid "Zoom 1:16 (6.25%)"
-msgstr "缩放 1:16 (6.25%)"
-
-#: app/actions/view-actions.c:438
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6  (6.25%)"
 
-#: app/actions/view-actions.c:440
+#: app/actions/view-actions.c:422
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "缩放 1:16"
 
-#: app/actions/view-actions.c:445 app/actions/view-actions.c:448
+#: app/actions/view-actions.c:427
-msgctxt "view-zoom-action"
-msgid "Set a custom zoom factor"
-msgstr "设置自定义缩放比例"
-
-#: app/actions/view-actions.c:446
 msgctxt "view-zoom-action"
 msgid "Othe_r zoom factor..."
 msgstr "其他缩放比例(_R)…"
 
-#: app/actions/view-actions.c:456
+#: app/actions/view-actions.c:428
+msgctxt "view-zoom-action"
+msgid "Set a custom zoom factor"
+msgstr "设置自定义缩放比例"
+
+#: app/actions/view-actions.c:436
 msgctxt "view-action"
 msgid "Flip _Horizontally"
 msgstr "水平翻转(_H)"
 
-#: app/actions/view-actions.c:457
+#: app/actions/view-actions.c:437
 msgctxt "view-action"
 msgid "Flip the view horizontally"
 msgstr "水平翻转视图"
 
-#: app/actions/view-actions.c:463
+#: app/actions/view-actions.c:443
 msgctxt "view-action"
 msgid "Flip _Vertically"
 msgstr "竖直翻转(_V)"
 
-#: app/actions/view-actions.c:464
+#: app/actions/view-actions.c:444
 msgctxt "view-action"
 msgid "Flip the view vertically"
 msgstr "竖直翻转视图"
 
-#: app/actions/view-actions.c:473
+#: app/actions/view-actions.c:453
 msgctxt "view-action"
 msgid "Display Rotation Absolute Angle Set"
 msgstr "显示旋转绝对角度设定"
 
-#: app/actions/view-actions.c:479
+#: app/actions/view-actions.c:459
 msgctxt "view-action"
 msgid "_Reset Rotate"
 msgstr "重置旋转(_R)"
 
-#: app/actions/view-actions.c:481
+#: app/actions/view-actions.c:461
 msgctxt "view-action"
 msgid "Reset the angle of rotation to 0°"
 msgstr "重置旋转角度至 0°"
 
-#: app/actions/view-actions.c:489
+#: app/actions/view-actions.c:469
 msgctxt "view-action"
 msgid "Rotate 15° _clockwise"
 msgstr "顺时钟旋转 15° (_C)"
 
-#: app/actions/view-actions.c:490
+#: app/actions/view-actions.c:470
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the right"
 msgstr "将视图向右旋转 15 度"
 
-#: app/actions/view-actions.c:495
+#: app/actions/view-actions.c:475
 msgctxt "view-action"
 msgid "Rotate 90° _clockwise"
 msgstr "顺时针旋转 90° (_C)"
 
-#: app/actions/view-actions.c:496
+#: app/actions/view-actions.c:476
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the right"
 msgstr "将视图向右旋转 90 度"
 
-#: app/actions/view-actions.c:501
+#: app/actions/view-actions.c:481
 msgctxt "view-action"
 msgid "Rotate _180°"
 msgstr "旋转 _180°"
 
-#: app/actions/view-actions.c:502
+#: app/actions/view-actions.c:482
 msgctxt "view-action"
 msgid "Turn the view upside-down"
 msgstr "使视图上下颠倒"
 
-#: app/actions/view-actions.c:507
+#: app/actions/view-actions.c:487
 msgctxt "view-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "逆时针旋转 90° (_W)"
 
-#: app/actions/view-actions.c:508
+#: app/actions/view-actions.c:488
 msgctxt "view-action"
 msgid "Rotate the view 90 degrees to the left"
 msgstr "将视图向左旋转 90 度"
 
-#: app/actions/view-actions.c:513
+#: app/actions/view-actions.c:493
 msgctxt "view-action"
 msgid "Rotate 15° counter-clock_wise"
 msgstr "逆时针旋转 15° (_W)"
 
-#: app/actions/view-actions.c:514
+#: app/actions/view-actions.c:494
 msgctxt "view-action"
 msgid "Rotate the view 15 degrees to the left"
 msgstr "将视图向左旋转 15 度"
 
-#: app/actions/view-actions.c:522
+#: app/actions/view-actions.c:502
 msgctxt "view-action"
 msgid "_Perceptual"
 msgstr "感知(_P)"
 
-#: app/actions/view-actions.c:523
+#: app/actions/view-actions.c:503
 msgctxt "view-action"
 msgid "Display rendering intent is perceptual"
 msgstr "显示渲染效果是可感知的"
 
-#: app/actions/view-actions.c:528
+#: app/actions/view-actions.c:508
 msgctxt "view-action"
 msgid "_Relative Colorimetric"
 msgstr "相关色度(_R)"
 
-#: app/actions/view-actions.c:529
+#: app/actions/view-actions.c:509
 msgctxt "view-action"
 msgid "Display rendering intent is relative colorimetric"
 msgstr "显示渲染效果是相关色度的"
 
-#: app/actions/view-actions.c:534
+#: app/actions/view-actions.c:514
 msgctxt "view-action"
 msgid "_Saturation"
 msgstr "饱和度(_S)"
 
-#: app/actions/view-actions.c:535
+#: app/actions/view-actions.c:515
 msgctxt "view-action"
 msgid "Display rendering intent is saturation"
 msgstr "显示渲染效果是色饱和的"
 
-#: app/actions/view-actions.c:540
+#: app/actions/view-actions.c:520
 msgctxt "view-action"
 msgid "_Absolute Colorimetric"
 msgstr "绝对色度(_A)"
 
-#: app/actions/view-actions.c:541
+#: app/actions/view-actions.c:521
 msgctxt "view-action"
 msgid "Display rendering intent is absolute colorimetric"
 msgstr "显示渲染效果是绝对色度的"
 
-#: app/actions/view-actions.c:549
+#: app/actions/view-actions.c:529
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "来自主题(_T)"
 
-#: app/actions/view-actions.c:550
+#: app/actions/view-actions.c:530
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "使用当前主题的背景色"
 
-#: app/actions/view-actions.c:555
+#: app/actions/view-actions.c:535
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "浅色方格的颜色(_L)"
 
-#: app/actions/view-actions.c:556
+#: app/actions/view-actions.c:536
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "使用浅色方格的颜色"
 
-#: app/actions/view-actions.c:561
+#: app/actions/view-actions.c:541
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "深色方格的颜色(_D)"
 
-#: app/actions/view-actions.c:562
+#: app/actions/view-actions.c:542
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "使用深色方格的颜色"
 
-#: app/actions/view-actions.c:567
+#: app/actions/view-actions.c:547
 msgctxt "view-padding-color"
 msgid "_Custom Color..."
 msgstr "自定义颜色(_C)…"
 
-#: app/actions/view-actions.c:568
+#: app/actions/view-actions.c:548
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "使用任意颜色"
 
-#: app/actions/view-actions.c:573
+#: app/actions/view-actions.c:553
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "按首选项设定(_P)"
 
-#: app/actions/view-actions.c:575
+#: app/actions/view-actions.c:555
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "将填充颜色重置为在首选项中的配置"
 
-#: app/actions/view-actions.c:583
+#: app/actions/view-actions.c:563
 msgctxt "view-padding-color"
 msgid "Keep Padding in \"Show _All\" Mode"
 msgstr "在“显示全部”模式保持衬垫"
 
-#: app/actions/view-actions.c:585
+#: app/actions/view-actions.c:565
 msgctxt "view-padding-color"
 msgid "Keep canvas padding when \"View -> Show All\" is enabled"
 msgstr "“视图->显示全部”启用时保持画布衬垫"
 
-#: app/actions/view-actions.c:594
+#: app/actions/view-actions.c:574
 msgctxt "view-action"
 msgid "Set horizontal scroll offset"
 msgstr "设置水平滚动位移"
 
-#: app/actions/view-actions.c:599
+#: app/actions/view-actions.c:579
 msgctxt "view-action"
 msgid "Scroll to left border"
 msgstr "滚动到左边界"
 
-#: app/actions/view-actions.c:604
+#: app/actions/view-actions.c:584
 msgctxt "view-action"
 msgid "Scroll to right border"
 msgstr "滚动到右边界"
 
-#: app/actions/view-actions.c:609
+#: app/actions/view-actions.c:589
 msgctxt "view-action"
 msgid "Scroll left"
 msgstr "左滚"
 
-#: app/actions/view-actions.c:614
+#: app/actions/view-actions.c:594
 msgctxt "view-action"
 msgid "Scroll right"
 msgstr "右滚"
 
-#: app/actions/view-actions.c:619
+#: app/actions/view-actions.c:599
 msgctxt "view-action"
 msgid "Scroll page left"
 msgstr "页面向左滚动"
 
-#: app/actions/view-actions.c:624
+#: app/actions/view-actions.c:604
 msgctxt "view-action"
 msgid "Scroll page right"
 msgstr "页面向右滚动"
 
-#: app/actions/view-actions.c:632
+#: app/actions/view-actions.c:612
 msgctxt "view-action"
 msgid "Set vertical scroll offset"
 msgstr "设置竖直滚动位移"
 
-#: app/actions/view-actions.c:637
+#: app/actions/view-actions.c:617
 msgctxt "view-action"
 msgid "Scroll to top border"
 msgstr "滚动到上边界"
 
-#: app/actions/view-actions.c:642
+#: app/actions/view-actions.c:622
 msgctxt "view-action"
 msgid "Scroll to bottom border"
 msgstr "滚动到下边界"
 
-#: app/actions/view-actions.c:647
+#: app/actions/view-actions.c:627
 msgctxt "view-action"
 msgid "Scroll up"
 msgstr "上滚"
 
-#: app/actions/view-actions.c:652
+#: app/actions/view-actions.c:632
 msgctxt "view-action"
 msgid "Scroll down"
 msgstr "下滚"
 
-#: app/actions/view-actions.c:657
+#: app/actions/view-actions.c:637
 msgctxt "view-action"
 msgid "Scroll page up"
 msgstr "页面向上滚动"
 
-#: app/actions/view-actions.c:662
+#: app/actions/view-actions.c:642
 msgctxt "view-action"
 msgid "Scroll page down"
 msgstr "页面向下滚动"
 
-#: app/actions/view-actions.c:848
+#: app/actions/view-actions.c:841
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "恢复缩放 (%d%%)(_V)"
 
-#: app/actions/view-actions.c:856
+#: app/actions/view-actions.c:849
 msgid "Re_vert Zoom"
 msgstr "恢复缩放(_V)"
 
-#: app/actions/view-actions.c:1004
+#: app/actions/view-actions.c:1017
+#, c-format
+msgid "Othe_r (%s)..."
+msgstr "其他 (%s)(_R)…"
+
+#: app/actions/view-actions.c:1028
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "缩放 (%s)(_Z)"
 
 #. please preserve the trailing space
 #. H: Horizontal, V: Vertical
-#: app/actions/view-actions.c:1024
+#: app/actions/view-actions.c:1052
 msgid "(H+V) "
 msgstr "(H+V) "
 
 #. please preserve the trailing space
 #. H: Horizontal
-#: app/actions/view-actions.c:1030
+#: app/actions/view-actions.c:1058
 msgid "(H) "
 msgstr "(H+V) "
 
 #. please preserve the trailing space
 #. V: Vertical
-#: app/actions/view-actions.c:1036
+#: app/actions/view-actions.c:1064
 msgid "(V) "
 msgstr "(V) "
 
-#: app/actions/view-actions.c:1045
+#: app/actions/view-actions.c:1073
 #, c-format
 msgid "_Flip %s& Rotate (%d°)"
 msgstr "翻转%s和旋转(%d°)(_F)"
 
-#: app/actions/view-commands.c:1074
+#: app/actions/view-commands.c:1089
 msgid "Set Canvas Padding Color"
 msgstr "设置画布衬垫的颜色"
 
-#: app/actions/view-commands.c:1076
+#: app/actions/view-commands.c:1091
 msgid "Set Custom Canvas Padding Color"
 msgstr "设置自定义画布衬垫的颜色"
 
@@ -9845,7 +9805,7 @@ msgstr "移动此窗口至屏幕 %s"
 #: app/dialogs/template-options-dialog.c:119
 #: app/display/pikadisplayshell-filter-dialog.c:88
 #: app/display/pikadisplayshell-rotate-dialog.c:124
-#: app/display/pikadisplayshell-scale-dialog.c:132 app/gui/gui.c:184
+#: app/display/pikadisplayshell-scale-dialog.c:124 app/gui/gui.c:184
 #: app/tools/pikafiltertool.c:365 app/widgets/pikacolordialog.c:464
 #: app/widgets/pikacontrollereditor.c:663 app/widgets/pikaerrordialog.c:76
 #: app/widgets/pikafiledialog.c:176 app/widgets/pikamodifierseditor.c:685
@@ -10228,8 +10188,8 @@ msgstr "路径"
 #: app/config/pikarc-blurbs.h:13
 msgid ""
 "When enabled, an image will become the active image when its image window "
-"receives the focus. This is useful for window managers using \"click to "
+"receives the focus. This is useful for window managers using \"click to focus"
-"focus\"."
+"\"."
 msgstr ""
 "当启用时，当对应的图像窗口获得焦点时，图像将成为激活图像。这对使用“单击获取焦"
 "点”的窗口管理器有用。"
@@ -18123,32 +18083,22 @@ msgstr "角度："
 msgid "degrees"
 msgstr "度"
 
-#: app/display/pikadisplayshell-scale-dialog.c:124
+#: app/display/pikadisplayshell-scale-dialog.c:116
 msgid "Zoom Ratio"
 msgstr "缩放比率"
 
-#: app/display/pikadisplayshell-scale-dialog.c:126
+#: app/display/pikadisplayshell-scale-dialog.c:118
 msgid "Select Zoom Ratio"
 msgstr "选择缩放比率"
 
-#: app/display/pikadisplayshell-scale-dialog.c:168
+#: app/display/pikadisplayshell-scale-dialog.c:160
 msgid "Zoom ratio:"
 msgstr "缩放比率："
 
-#: app/display/pikadisplayshell-scale-dialog.c:193
+#: app/display/pikadisplayshell-scale-dialog.c:185
 msgid "Zoom:"
 msgstr "缩放："
 
-#: app/display/pikadisplayshell-scale-dialog.c:246
-#, c-format
-msgid "Othe_r (%s)..."
-msgstr "其他 (%s)(_R)…"
-
-#: app/display/pikadisplayshell-scale-dialog.c:250
-#, c-format
-msgid "Custom Zoom (%s)..."
-msgstr "自定义缩放 (%s)…"
-
 #: app/display/pikadisplayshell-title.c:299
 msgid "(modified)"
 msgstr "（已修改）"
@@ -20483,8 +20433,8 @@ msgstr "“%s”过程返回了错误的值类型用于返回值“%s” (#%d)
 #: app/pdb/pikaprocedure.c:860
 #, c-format
 msgid ""
-"Procedure '%s' has been called with a wrong value type for argument "
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#"
-"'%s' (#%d). Expected %s, got %s."
+"%d). Expected %s, got %s."
 msgstr ""
 "调用“%s”过程使用了错误的值类型用于参数“%s” (#%d) 。需要 %s，但获得 %s。"
 

themes/Default/common.css

@@ -127,11 +127,6 @@ notebook stack {
   background-color: @bg-color;
 }
 
-notebook header {
-  background-color: @bg-color;
-  border-color: @strong-border-color;
-}
-
 /* Use this to make a border or padding around each tab */
 notebook header tabs tab {
   padding: 1px;
@@ -241,6 +236,10 @@ scrolledwindow viewport grid, scrolledwindow viewport box {
    border: 0px solid @bg-color;
 }
 
+notebook header {
+  background-color: @bg-color;
+}
+
 PikaRuler {
   background-color: @ruler-color;
 }
@@ -323,11 +322,6 @@ spinbutton, entry {
   border-color: @strong-border-color;
 }
 
-/* Styling for the +/- buttons */
-spinbutton button.up, spinbutton button.down {
-  background-color: @bg-color;
-}
-
 PikaSpinScale entry progress {
   background-color: @extreme-selected-color;
   border-width:     0px;
@@ -345,7 +339,7 @@ checkbutton:hover, checkbutton.text-button:hover, checkbutton:hover label, radio
   background-color: @hover-color;
 }
 
-checkbutton check, radiobutton radio, treeview.view check {
+checkbutton check, radiobutton radio {
   background-image: none;
   background-color: @extreme-bg-color;
   border: 1px solid @stronger-border-color;
@@ -420,10 +414,6 @@ menuitem *:hover {
   background: @extreme-selected-color;
 }
 
-menuitem check {
-  border-color: @fg-color;
-}
-
 /* "Add Tab" menu in dockable dialog */
 menu {
   background-color: @bg-color;
@@ -440,17 +430,9 @@ menu box {
  * with a different background color. Let's get rid of it.
  */
 menu separator {
-  background-color: @stronger-border-color;
   margin: 0;
 }
 
-/* Defines the border around the Save Image actionbar options */
-actionbar revealer box {
-  border-width: 0px;
-  border-top-width: 1px;
-  border-top-color: @strong-border-color;
-}
-
 /* Sidebar in File > Open */
 
 /* The background to either side of the directory buttons.
@@ -492,11 +474,12 @@ switch {
   border: 1px solid @stronger-border-color;
 }
 
-/* The switch button is hard to understand without color.
+/* The switch button is quite hard to understand without color IMO. So
- * Let's indicate the checked state with foreground color.
+ * accept a bit of color here as an exception to indicate the checked
+ * state, even though this is globally a neutral gray theme.
  */
 switch:checked {
-  background-color: @fg-color;
+  background-color: rgb(200,200,255);
 }
 
 /* This prevents the 1/0 labels from appearing inside the switch slider */

upstream-documentation/MAINTAINERS.upstream

@@ -1,10 +0,0 @@
-Currently active maintainers
-----------------------------
-
-Michael Natterer
-E-mail: mitch@gimp.org
-Userid: mitch
-
-Jehan
-E-mail: jehan@girinstud.io
-Userid: Jehan