From a43bab85ffc455609813a19eac9a57020bcc565f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 4 May 2022 09:47:01 +0100 Subject: [PATCH] Update to upstream gtk-4-6 branch commit 4.6.3-9-g045446c3da - Work around infinite loop in box allocation (Closes: #1010547) - Make it easier to select the current folder with a file chooser - Fix saving into a subdirectory with a file chooser - Translation updates --- ...check-for-empty-instead-of-NULL-GLis.patch | 36 + ...return-empty-GListModel-in-get_files.patch | 44 + .../patches/Update-Hebrew-translation-1.patch | 46 + .../patches/Update-Hebrew-translation.patch | 1081 +++++++++++++++++ debian/patches/boxlayout-Do-not-infloop.patch | 90 ++ ...ser-Small-fix-for-select-folder-mode.patch | 30 + debian/patches/series | 6 + 7 files changed, 1333 insertions(+) create mode 100644 debian/patches/GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch create mode 100644 debian/patches/GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch create mode 100644 debian/patches/Update-Hebrew-translation-1.patch create mode 100644 debian/patches/Update-Hebrew-translation.patch create mode 100644 debian/patches/boxlayout-Do-not-infloop.patch create mode 100644 debian/patches/filechooser-Small-fix-for-select-folder-mode.patch diff --git a/debian/patches/GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch b/debian/patches/GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch new file mode 100644 index 0000000000..af428c0311 --- /dev/null +++ b/debian/patches/GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch @@ -0,0 +1,36 @@ +From: Luca Bacci +Date: Sun, 1 May 2022 16:31:47 +0200 +Subject: GtkFileChooserWidget: check for empty instead of NULL GListModel + +While porting GtkFileChooserWidget from GList to GListModel we did not +change some checks for NULL to checks for empty list. + +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4851 +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4858 +Origin: upstream, 4.6.4, commit:6b740c86f907e171d5bec227677ccf81b0091d73 +--- + gtk/gtkfilechooserwidget.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c +index be084da..4c34c49 100644 +--- a/gtk/gtkfilechooserwidget.c ++++ b/gtk/gtkfilechooserwidget.c +@@ -5448,7 +5448,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) + * So we want the selection to be "bar/foo.txt". Jump to the case for the + * filename entry to see if that is the case. + */ +- if (info.result == NULL && impl->location_entry) ++ if (g_list_model_get_n_items (G_LIST_MODEL (info.result)) == 0 && impl->location_entry) + goto file_entry; + } + else if (impl->location_entry && +@@ -5497,7 +5497,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) + * then we fall back to the current directory + */ + if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && +- info.result == NULL) ++ g_list_model_get_n_items (G_LIST_MODEL (info.result)) == 0) + { + GFile *current_folder; + diff --git a/debian/patches/GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch b/debian/patches/GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch new file mode 100644 index 0000000000..89e20268bd --- /dev/null +++ b/debian/patches/GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch @@ -0,0 +1,44 @@ +From: Luca Bacci +Date: Sun, 1 May 2022 16:41:10 +0200 +Subject: GtkFileChooserWidget: return empty GListModel in get_files () + instead of NULL + +Origin: upstream, 4.6.4, commit:f0120700dc872043c6828678870446df82382901 +--- + gtk/gtkfilechooserwidget.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c +index 4c34c49..34e3473 100644 +--- a/gtk/gtkfilechooserwidget.c ++++ b/gtk/gtkfilechooserwidget.c +@@ -5466,7 +5466,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) + goto out; + + if (!is_well_formed) +- return NULL; ++ goto empty; + + if (info.file_from_entry) + { +@@ -5476,7 +5476,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) + else if (!file_list_seen) + goto file_list; + else +- return NULL; ++ goto empty; + } + else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view) + goto file_list; +@@ -5508,6 +5508,11 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) + } + + return G_LIST_MODEL (info.result); ++ ++empty: ++ ++ g_list_store_remove_all (info.result); ++ return G_LIST_MODEL (info.result); + } + + /* Shows or hides the filter widgets */ diff --git a/debian/patches/Update-Hebrew-translation-1.patch b/debian/patches/Update-Hebrew-translation-1.patch new file mode 100644 index 0000000000..09684670b0 --- /dev/null +++ b/debian/patches/Update-Hebrew-translation-1.patch @@ -0,0 +1,46 @@ +From: Yosef Or Boczko +Date: Wed, 27 Apr 2022 14:19:20 +0000 +Subject: Update Hebrew translation + +Origin: upstream, 4.6.4, commit:0a23c4678f39999aaadcf168e2202ebbbfe7c784 +--- + po/he.po | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/po/he.po b/po/he.po +index 73c5d8c..16ad1d6 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -12,7 +12,7 @@ msgid "" + msgstr "" + "Project-Id-Version: gtk+.HEAD.he\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" +-"POT-Creation-Date: 2022-04-21 23:29+0000\n" ++"POT-Creation-Date: 2022-04-27 12:01+0000\n" + "PO-Revision-Date: 2022-04-27 14:58+0300\n" + "Last-Translator: Yaron Shahrabani \n" + "Language-Team: Hebrew \n" +@@ -6947,14 +6947,17 @@ msgstr "" + "אין קובץ אינדקס לערכות עיצוב „%s”.\n" + "כדי באמת ליצור דרך כאן מטמון סמלים, יש להשתמש ב־‎--ignore-theme-index.\n" + +-#~ msgid "About" +-#~ msgstr "על אודות" ++#: gtk/ui/gtkaboutdialog.ui:62 ++msgid "About" ++msgstr "על אודות" + +-#~ msgid "Credits" +-#~ msgstr "תודות" ++#: gtk/ui/gtkaboutdialog.ui:123 ++msgid "Credits" ++msgstr "תודות" + +-#~ msgid "System" +-#~ msgstr "מערכת" ++#: gtk/ui/gtkaboutdialog.ui:206 ++msgid "System" ++msgstr "מערכת" + + #~| msgid "Can't parse file: %s\n" + #~ msgid "Can't parse “%s”: %s\n" diff --git a/debian/patches/Update-Hebrew-translation.patch b/debian/patches/Update-Hebrew-translation.patch new file mode 100644 index 0000000000..9d2e28a75c --- /dev/null +++ b/debian/patches/Update-Hebrew-translation.patch @@ -0,0 +1,1081 @@ +From: Yaron Shahrabani +Date: Wed, 27 Apr 2022 12:00:13 +0000 +Subject: Update Hebrew translation + +Origin: upstream, 4.6.4, commit:edc21ef20278c560bb57e565a35e4839490f4376 +--- + po/he.po | 376 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 173 insertions(+), 203 deletions(-) + +diff --git a/po/he.po b/po/he.po +index 9ad61c9..73c5d8c 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -12,17 +12,17 @@ msgid "" + msgstr "" + "Project-Id-Version: gtk+.HEAD.he\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gtk/-/issues/\n" +-"POT-Creation-Date: 2022-03-09 10:50+0000\n" +-"PO-Revision-Date: 2022-02-22 22:21+0200\n" +-"Last-Translator: Yosef Or Boczko \n" ++"POT-Creation-Date: 2022-04-21 23:29+0000\n" ++"PO-Revision-Date: 2022-04-27 14:58+0300\n" ++"Last-Translator: Yaron Shahrabani \n" + "Language-Team: Hebrew \n" + "Language: he\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : n>10 && n%10==0 ? " +-"2 : 3)\n" +-"X-Generator: Gtranslator 40.0\n" ++"2 : 3);\n" ++"X-Generator: Poedit 3.0.1\n" + "X-Project-Style: default\n" + + #: gdk/broadway/gdkbroadway-server.c:135 +@@ -53,13 +53,13 @@ msgstr "לא ניתן לספק תוכן בתור „%s”" + msgid "Cannot provide contents as %s" + msgstr "לא ניתן לספק תוכן בתור %s" + +-#: gdk/gdkdisplay.c:154 gdk/gdkglcontext.c:430 ++#: gdk/gdkdisplay.c:154 gdk/gdkglcontext.c:436 + msgid "The current backend does not support OpenGL" + msgstr "הממשק הנוכחי אינו תומך ב־‏OpenGL" + + #: gdk/gdkdisplay.c:1246 + msgid "GL support disabled via GDK_DEBUG" +-msgstr "GL support disabled via GDK_DEBUG" ++msgstr "התמיכה ב־GL הושבתה דרך GDK_DEBUG" + + #: gdk/gdkdisplay.c:1544 + msgid "No EGL configuration available" +@@ -80,10 +80,10 @@ msgstr "לא נמצאה תצורת EGL מושלמת" + #: gdk/gdkdisplay.c:1631 + msgid "EGL implementation is missing extension %2$s" + msgid_plural "EGL implementation is missing %d extensions: %s" +-msgstr[0] "" +-msgstr[1] "" +-msgstr[2] "" +-msgstr[3] "" ++msgstr[0] "להטמעה של EGL חסרה ההרחבה %2$s" ++msgstr[1] "להטמעה של EGL חסרות %d הרחבות: %s" ++msgstr[2] "להטמעה של EGL חסרות %d הרחבות: %s" ++msgstr[3] "להטמעה של EGL חסרות %d הרחבות: %s" + + #: gdk/gdkdisplay.c:1664 + msgid "libEGL not available in this sandbox" +@@ -114,29 +114,27 @@ msgstr "אין תמיכה בגרירה והשלכה מיישומים אחרים. + msgid "No compatible formats to transfer contents." + msgstr "אין תצורות תואמות להעברת תכנים." + +-#: gdk/gdkglcontext.c:332 ++#: gdk/gdkglcontext.c:333 + msgid "The EGL implementation does not support any allowed APIs" +-msgstr "" ++msgstr "ההטמעה של EGL לא תומכת באף API מורשה" + +-#: gdk/gdkglcontext.c:413 gdk/win32/gdkglcontext-win32-wgl.c:616 ++#: gdk/gdkglcontext.c:414 gdk/win32/gdkglcontext-win32-wgl.c:616 + #: gdk/x11/gdkglcontext-glx.c:624 + msgid "Unable to create a GL context" + msgstr "Unable to create a GL context" + +-#: gdk/gdkglcontext.c:1273 +-#, fuzzy +-#| msgid "GL support disabled via GDK_DEBUG" ++#: gdk/gdkglcontext.c:1279 + msgid "Anything but OpenGL ES disabled via GDK_DEBUG" +-msgstr "GL support disabled via GDK_DEBUG" ++msgstr "הכול חוץ מ־OpenGL ES הושבת דרך GDK_DEBUG" + +-#: gdk/gdkglcontext.c:1282 ++#: gdk/gdkglcontext.c:1288 + #, c-format + msgid "Application does not support %s API" + msgstr "היישום אינו תומך ב־API ‏%s" + + #. translators: This is about OpenGL backend names, like + #. * "Trying to use X11 GLX, but EGL is already in use" +-#: gdk/gdkglcontext.c:1803 ++#: gdk/gdkglcontext.c:1809 + #, c-format + msgid "Trying to use %s, but %s is already in use" + msgstr "מתבצע ניסיון להשתמש ב־%s אך %s כבר בשימוש" +@@ -574,7 +572,7 @@ msgstr "קריאת הנתונים נכשלה בשורה %d" + #: gdk/macos/gdkmacosclipboard.c:557 gdk/wayland/gdkclipboard-wayland.c:231 + #: gdk/wayland/gdkdrop-wayland.c:203 gdk/wayland/gdkprimary-wayland.c:313 + #: gdk/win32/gdkdrop-win32.c:1006 gdk/win32/gdkdrop-win32.c:1051 +-#: gdk/x11/gdkclipboard-x11.c:787 gdk/x11/gdkdrop-x11.c:233 ++#: gdk/x11/gdkclipboard-x11.c:791 gdk/x11/gdkdrop-x11.c:233 + msgid "No compatible transfer format found" + msgstr "לא נמצאה תצורת העברה תואמת" + +@@ -586,7 +584,7 @@ msgstr "פענוח התוכן מסוג MIME‏ ‚%s’ נכשל" + #: gdk/win32/gdkclipdrop-win32.c:721 + #, c-format + msgid "Cannot claim clipboard ownership. OpenClipboard() timed out." +-msgstr "Cannot claim clipboard ownership. OpenClipboard() timed out." ++msgstr "לא ניתן לטעון בעלות על לוח הגזירים. הזמן שהוקצב ל־OpenClipboard()‎ תם." + + #: gdk/win32/gdkclipdrop-win32.c:731 + #, c-format +@@ -766,11 +764,11 @@ msgstr[1] "שני פריטים נפתחים" + msgstr[2] "‫%d פריטים נפתחים" + msgstr[3] "‫%d פריטים נפתחים" + +-#: gdk/x11/gdkclipboard-x11.c:457 ++#: gdk/x11/gdkclipboard-x11.c:461 + msgid "Clipboard manager could not store selection." + msgstr "Clipboard manager could not store selection." + +-#: gdk/x11/gdkclipboard-x11.c:637 ++#: gdk/x11/gdkclipboard-x11.c:641 + msgid "Cannot store clipboard. No clipboard manager is active." + msgstr "Cannot store clipboard. No clipboard manager is active." + +@@ -806,7 +804,7 @@ msgstr "רצף בתים שגוי בקלט ההמרה" + + #: gdk/x11/gdktextlistconverter-x11.c:242 + msgid "Invalid formats in compound text conversion." +-msgstr "" ++msgstr "תצורות שגויות בהמרת טקסט מרוכב." + + #: gdk/x11/gdktextlistconverter-x11.c:259 + #, c-format +@@ -1098,18 +1096,6 @@ msgstr "" + "תכנית זו מופצת ללא שום אחריות.\n" + "ניתן לבקר בכתובת %s לפרטים." + +-#: gtk/ui/gtkaboutdialog.ui:62 +-msgid "About" +-msgstr "על אודות" +- +-#: gtk/ui/gtkaboutdialog.ui:123 +-msgid "Credits" +-msgstr "תודות" +- +-#: gtk/ui/gtkaboutdialog.ui:206 +-msgid "System" +-msgstr "מערכת" +- + #. This is the text that should appear next to menu accelerators + #. * that use the shift key. If the text on this key isn't typically + #. * translated on keyboards used for your language, don't translate +@@ -1246,8 +1232,6 @@ msgid "command" + msgstr "פקודה" + + #: gtk/gtkaccessible.c:570 +-#, fuzzy +-#| msgid "Composited" + msgctxt "accessibility" + msgid "composite" + msgstr "מורכב" +@@ -2160,18 +2144,18 @@ msgid "A file with that name already exists" + msgstr "קובץ בשם זה כבר קיים" + + #: gtk/gtkfilechoosernative.c:509 gtk/gtkfilechoosernative.c:580 +-#: gtk/gtkfilechooserwidget.c:1209 gtk/gtkfilechooserwidget.c:5767 ++#: gtk/gtkfilechooserwidget.c:1209 gtk/gtkfilechooserwidget.c:5773 + #: gtk/gtkmessagedialog.c:166 gtk/gtkmessagedialog.c:175 + #: gtk/gtkmountoperation.c:610 gtk/gtkpagesetupunixdialog.c:283 + #: gtk/gtkprintbackend.c:642 gtk/gtkprinteroptionwidget.c:713 + #: gtk/gtkprintunixdialog.c:667 gtk/gtkprintunixdialog.c:823 +-#: gtk/gtkwindow.c:6147 gtk/inspector/css-editor.c:248 ++#: gtk/gtkwindow.c:6154 gtk/inspector/css-editor.c:248 + #: gtk/inspector/recorder.c:1706 + msgid "_Cancel" + msgstr "_ביטול" + + #: gtk/gtkfilechoosernative.c:510 gtk/gtkfilechoosernative.c:574 +-#: gtk/gtkplacessidebar.c:3127 gtk/gtkplacessidebar.c:3212 ++#: gtk/gtkplacessidebar.c:3128 gtk/gtkplacessidebar.c:3213 + #: gtk/gtkplacesview.c:1658 + msgid "_Open" + msgstr "_פתיחה" +@@ -2254,7 +2238,7 @@ msgid "If you delete an item, it will be permanently lost." + msgstr "אם פריט ימחק, הוא יאבד לצמיתות." + + #: gtk/gtkfilechooserwidget.c:1210 gtk/gtkfilechooserwidget.c:1826 +-#: gtk/gtklabel.c:5645 gtk/gtktext.c:6073 gtk/gtktextview.c:8956 ++#: gtk/gtklabel.c:5659 gtk/gtktext.c:6077 gtk/gtktextview.c:8956 + msgid "_Delete" + msgstr "מ_חיקה" + +@@ -2282,8 +2266,8 @@ msgstr "ה_עתקת מיקום" + msgid "_Add to Bookmarks" + msgstr "_הוספה לסימניות" + +-#: gtk/gtkfilechooserwidget.c:1822 gtk/gtkplacessidebar.c:2309 +-#: gtk/gtkplacessidebar.c:3248 ++#: gtk/gtkfilechooserwidget.c:1822 gtk/gtkplacessidebar.c:2310 ++#: gtk/gtkplacessidebar.c:3249 + msgid "_Rename" + msgstr "_שינוי שם" + +@@ -2333,7 +2317,7 @@ msgstr "בחיפוש" + msgid "Enter location or URL" + msgstr "הזנת מיקום או כתובת" + +-#: gtk/gtkfilechooserwidget.c:3791 gtk/gtkfilechooserwidget.c:6604 ++#: gtk/gtkfilechooserwidget.c:3791 gtk/gtkfilechooserwidget.c:6610 + msgid "Modified" + msgstr "שונה" + +@@ -2424,34 +2408,34 @@ msgstr "גליון נתונים" + msgid "Unknown" + msgstr "לא ידוע" + +-#: gtk/gtkfilechooserwidget.c:4578 gtk/gtkplacessidebar.c:1026 ++#: gtk/gtkfilechooserwidget.c:4578 gtk/gtkplacessidebar.c:1027 + msgid "Home" + msgstr "תיקיית הבית" + +-#: gtk/gtkfilechooserwidget.c:5760 gtk/gtkprintunixdialog.c:658 ++#: gtk/gtkfilechooserwidget.c:5766 gtk/gtkprintunixdialog.c:658 + #, c-format + msgid "A file named “%s” already exists. Do you want to replace it?" + msgstr "כבר קיים קובץ בשם „%s“. האם להחליפו?" + +-#: gtk/gtkfilechooserwidget.c:5763 gtk/gtkprintunixdialog.c:662 ++#: gtk/gtkfilechooserwidget.c:5769 gtk/gtkprintunixdialog.c:662 + #, c-format + msgid "" + "The file already exists in “%s”. Replacing it will overwrite its contents." + msgstr "הקובץ כבר קיים תחת „%s“. החלפתו תגרום לאיבוד תוכנו." + +-#: gtk/gtkfilechooserwidget.c:5768 gtk/gtkprintunixdialog.c:670 ++#: gtk/gtkfilechooserwidget.c:5774 gtk/gtkprintunixdialog.c:670 + msgid "_Replace" + msgstr "ה_חלפה" + +-#: gtk/gtkfilechooserwidget.c:5929 ++#: gtk/gtkfilechooserwidget.c:5935 + msgid "You do not have access to the specified folder." + msgstr "אין לך גישה לתיקייה המסוימת." + +-#: gtk/gtkfilechooserwidget.c:6533 ++#: gtk/gtkfilechooserwidget.c:6539 + msgid "Could not send the search request" + msgstr "לא ניתן לשלוח את בקשת החיפוש" + +-#: gtk/gtkfilechooserwidget.c:6843 ++#: gtk/gtkfilechooserwidget.c:6849 + msgid "Accessed" + msgstr "נצפה לאחרונה" + +@@ -2525,27 +2509,27 @@ msgstr "גרסת התו" + msgid "OpenGL context creation failed" + msgstr "יצירת הקשר OpenGL נכשלה" + +-#: gtk/gtklabel.c:5642 gtk/gtktext.c:6061 gtk/gtktextview.c:8944 ++#: gtk/gtklabel.c:5656 gtk/gtktext.c:6065 gtk/gtktextview.c:8944 + msgid "Cu_t" + msgstr "_גזירה" + +-#: gtk/gtklabel.c:5643 gtk/gtktext.c:6065 gtk/gtktextview.c:8948 ++#: gtk/gtklabel.c:5657 gtk/gtktext.c:6069 gtk/gtktextview.c:8948 + msgid "_Copy" + msgstr "ה_עתקה" + +-#: gtk/gtklabel.c:5644 gtk/gtktext.c:6069 gtk/gtktextview.c:8952 ++#: gtk/gtklabel.c:5658 gtk/gtktext.c:6073 gtk/gtktextview.c:8952 + msgid "_Paste" + msgstr "ה_דבקה" + +-#: gtk/gtklabel.c:5650 gtk/gtktext.c:6082 gtk/gtktextview.c:8977 ++#: gtk/gtklabel.c:5664 gtk/gtktext.c:6086 gtk/gtktextview.c:8977 + msgid "Select _All" + msgstr "בחירה בה_כול" + +-#: gtk/gtklabel.c:5655 ++#: gtk/gtklabel.c:5669 + msgid "_Open Link" + msgstr "_פתיחת קישור" + +-#: gtk/gtklabel.c:5659 ++#: gtk/gtklabel.c:5673 + msgid "Copy _Link Address" + msgstr "העתקת כתובת ה_קישור" + +@@ -2594,7 +2578,7 @@ msgstr "" + #. * Do *not* translate it to "predefinito:LTR", if it + #. * it isn't default:LTR or default:RTL it will not work + #. +-#: gtk/gtkmain.c:777 ++#: gtk/gtkmain.c:775 + msgid "default:LTR" + msgstr "default:RTL" + +@@ -2647,7 +2631,7 @@ msgid "%d:%02d" + msgstr "%d:%02d" + + #: gtk/gtkmessagedialog.c:158 gtk/gtkmessagedialog.c:176 +-#: gtk/gtkprintbackend.c:643 gtk/gtkwindow.c:6148 ++#: gtk/gtkprintbackend.c:643 gtk/gtkwindow.c:6155 + msgid "_OK" + msgstr "_אישור" + +@@ -2846,77 +2830,77 @@ msgstr "_הצגת טקסט" + msgid "Open %s" + msgstr "פתיחת %s" + +-#: gtk/gtkplacessidebar.c:1004 ++#: gtk/gtkplacessidebar.c:1005 + msgid "Recent" + msgstr "בשימוש לאחרונה" + +-#: gtk/gtkplacessidebar.c:1006 ++#: gtk/gtkplacessidebar.c:1007 + msgid "Recent files" + msgstr "קבצים אחרונים" + +-#: gtk/gtkplacessidebar.c:1015 ++#: gtk/gtkplacessidebar.c:1016 + msgid "Starred" + msgstr "מסומן בכוכב" + +-#: gtk/gtkplacessidebar.c:1017 ++#: gtk/gtkplacessidebar.c:1018 + msgid "Starred files" + msgstr "קבצים מסומנים בכוכב" + +-#: gtk/gtkplacessidebar.c:1028 ++#: gtk/gtkplacessidebar.c:1029 + msgid "Open your personal folder" + msgstr "פתיחת התיקייה האישית שלך" + +-#: gtk/gtkplacessidebar.c:1041 ++#: gtk/gtkplacessidebar.c:1042 + msgid "Desktop" + msgstr "שולחן עבודה" + +-#: gtk/gtkplacessidebar.c:1043 ++#: gtk/gtkplacessidebar.c:1044 + msgid "Open the contents of your desktop in a folder" + msgstr "פתיחת תכני שולחן העבודה בתיקייה" + +-#: gtk/gtkplacessidebar.c:1057 ++#: gtk/gtkplacessidebar.c:1058 + msgid "Enter Location" + msgstr "הזנת מיקום" + +-#: gtk/gtkplacessidebar.c:1059 ++#: gtk/gtkplacessidebar.c:1060 + msgid "Manually enter a location" + msgstr "הזנת מיקום באופן ידני" + +-#: gtk/gtkplacessidebar.c:1069 ++#: gtk/gtkplacessidebar.c:1070 + msgid "Trash" + msgstr "אשפה" + +-#: gtk/gtkplacessidebar.c:1071 ++#: gtk/gtkplacessidebar.c:1072 + msgid "Open the trash" + msgstr "פתיחת האשפה" + +-#: gtk/gtkplacessidebar.c:1182 gtk/gtkplacessidebar.c:1210 +-#: gtk/gtkplacessidebar.c:1410 ++#: gtk/gtkplacessidebar.c:1183 gtk/gtkplacessidebar.c:1211 ++#: gtk/gtkplacessidebar.c:1411 + #, c-format + msgid "Mount and open “%s”" + msgstr "לעגן ולפתוח את „%s”" + +-#: gtk/gtkplacessidebar.c:1305 ++#: gtk/gtkplacessidebar.c:1306 + msgid "Open the contents of the file system" + msgstr "פתיחת תכני מערכת הקבצים" + +-#: gtk/gtkplacessidebar.c:1388 ++#: gtk/gtkplacessidebar.c:1389 + msgid "New bookmark" + msgstr "סימנייה חדשה" + +-#: gtk/gtkplacessidebar.c:1390 ++#: gtk/gtkplacessidebar.c:1391 + msgid "Add a new bookmark" + msgstr "הוספת סימנייה חדשה" + +-#: gtk/gtkplacessidebar.c:1455 ++#: gtk/gtkplacessidebar.c:1456 + msgid "Other Locations" + msgstr "מיקומים אחרים" + +-#: gtk/gtkplacessidebar.c:1456 ++#: gtk/gtkplacessidebar.c:1457 + msgid "Show other locations" + msgstr "הצגת מיקומים אחרים" + +-#: gtk/gtkplacessidebar.c:1961 gtk/gtkplacessidebar.c:2962 ++#: gtk/gtkplacessidebar.c:1962 gtk/gtkplacessidebar.c:2963 + #, c-format + msgid "Unable to start “%s”" + msgstr "לא ניתן להפעיל את „%s”" +@@ -2924,125 +2908,125 @@ msgstr "לא ניתן להפעיל את „%s”" + #. Translators: This means that unlocking an encrypted storage + #. * device failed. %s is the name of the device. + #. +-#: gtk/gtkplacessidebar.c:1997 ++#: gtk/gtkplacessidebar.c:1998 + #, c-format + msgid "Error unlocking “%s”" + msgstr "שגיאה בנעילת „%s”" + +-#: gtk/gtkplacessidebar.c:1999 ++#: gtk/gtkplacessidebar.c:2000 + #, c-format + msgid "Unable to access “%s”" + msgstr "לא ניתן לגשת אל „%s“" + +-#: gtk/gtkplacessidebar.c:2230 ++#: gtk/gtkplacessidebar.c:2231 + msgid "This name is already taken" + msgstr "שם זה כבר בשימוש" + +-#: gtk/gtkplacessidebar.c:2303 gtk/inspector/actions.ui:19 ++#: gtk/gtkplacessidebar.c:2304 gtk/inspector/actions.ui:19 + #: gtk/inspector/css-node-tree.ui:35 gtk/inspector/prop-list.ui:24 + msgid "Name" + msgstr "שם" + +-#: gtk/gtkplacessidebar.c:2503 ++#: gtk/gtkplacessidebar.c:2504 + #, c-format + msgid "Unable to unmount “%s”" + msgstr "לא ניתן לנתק את „%s”" + +-#: gtk/gtkplacessidebar.c:2679 ++#: gtk/gtkplacessidebar.c:2680 + #, c-format + msgid "Unable to stop “%s”" + msgstr "לא ניתן לעצור את „%s”" + +-#: gtk/gtkplacessidebar.c:2708 ++#: gtk/gtkplacessidebar.c:2709 + #, c-format + msgid "Unable to eject “%s”" + msgstr "לא ניתן לשלוף את „%s”" + +-#: gtk/gtkplacessidebar.c:2737 gtk/gtkplacessidebar.c:2766 ++#: gtk/gtkplacessidebar.c:2738 gtk/gtkplacessidebar.c:2767 + #, c-format + msgid "Unable to eject %s" + msgstr "לא ניתן לשלוף את %s" + +-#: gtk/gtkplacessidebar.c:2914 ++#: gtk/gtkplacessidebar.c:2915 + #, c-format + msgid "Unable to poll “%s” for media changes" + msgstr "לא ניתן לתשאל את „%s” מהם השינויים במדיה" + +-#: gtk/gtkplacessidebar.c:3133 gtk/gtkplacessidebar.c:3220 ++#: gtk/gtkplacessidebar.c:3134 gtk/gtkplacessidebar.c:3221 + #: gtk/gtkplacesview.c:1662 + msgid "Open in New _Tab" + msgstr "פתיחה ב_לשונית חדשה" + +-#: gtk/gtkplacessidebar.c:3139 gtk/gtkplacessidebar.c:3229 ++#: gtk/gtkplacessidebar.c:3140 gtk/gtkplacessidebar.c:3230 + #: gtk/gtkplacesview.c:1667 + msgid "Open in New _Window" + msgstr "פתיחה ב_חלון חדש" + +-#: gtk/gtkplacessidebar.c:3240 ++#: gtk/gtkplacessidebar.c:3241 + msgid "_Add Bookmark" + msgstr "הו_ספה לסימניות" + +-#: gtk/gtkplacessidebar.c:3244 ++#: gtk/gtkplacessidebar.c:3245 + msgid "_Remove" + msgstr "_הסרה" + +-#: gtk/gtkplacessidebar.c:3260 gtk/gtkplacesview.c:1692 ++#: gtk/gtkplacessidebar.c:3261 gtk/gtkplacesview.c:1692 + msgid "_Mount" + msgstr "_עיגון" + +-#: gtk/gtkplacessidebar.c:3269 gtk/gtkplacesview.c:1681 ++#: gtk/gtkplacessidebar.c:3270 gtk/gtkplacesview.c:1681 + msgid "_Unmount" + msgstr "_ניתוק" + +-#: gtk/gtkplacessidebar.c:3276 ++#: gtk/gtkplacessidebar.c:3277 + msgid "_Eject" + msgstr "_שליפה" + +-#: gtk/gtkplacessidebar.c:3286 ++#: gtk/gtkplacessidebar.c:3287 + msgid "_Detect Media" + msgstr "_זיהוי מדיה" + +-#: gtk/gtkplacessidebar.c:3295 ++#: gtk/gtkplacessidebar.c:3296 + msgid "_Start" + msgstr "ה_תחלה" + +-#: gtk/gtkplacessidebar.c:3297 ++#: gtk/gtkplacessidebar.c:3298 + msgid "_Power On" + msgstr "לה_פעיל" + +-#: gtk/gtkplacessidebar.c:3298 ++#: gtk/gtkplacessidebar.c:3299 + msgid "_Connect Drive" + msgstr "הת_חברות לכונן" + +-#: gtk/gtkplacessidebar.c:3299 ++#: gtk/gtkplacessidebar.c:3300 + msgid "_Start Multi-disk Device" + msgstr "הפעלת התקן מ_רובה כוננים" + +-#: gtk/gtkplacessidebar.c:3300 ++#: gtk/gtkplacessidebar.c:3301 + msgid "_Unlock Device" + msgstr "_שחרור ההתקן" + +-#: gtk/gtkplacessidebar.c:3310 ++#: gtk/gtkplacessidebar.c:3311 + msgid "_Stop" + msgstr "_עצירה" + +-#: gtk/gtkplacessidebar.c:3312 ++#: gtk/gtkplacessidebar.c:3313 + msgid "_Safely Remove Drive" + msgstr "ה_סרת הכונן באופן בטוח" + +-#: gtk/gtkplacessidebar.c:3313 ++#: gtk/gtkplacessidebar.c:3314 + msgid "_Disconnect Drive" + msgstr "_ניתוק הכונן" + +-#: gtk/gtkplacessidebar.c:3314 ++#: gtk/gtkplacessidebar.c:3315 + msgid "_Stop Multi-disk Device" + msgstr "ע_צירת התקן מרובה כוננים" + +-#: gtk/gtkplacessidebar.c:3315 ++#: gtk/gtkplacessidebar.c:3316 + msgid "_Lock Device" + msgstr "_נעילת ההתקן" + +-#: gtk/gtkplacessidebar.c:3803 gtk/gtkplacesview.c:1103 ++#: gtk/gtkplacessidebar.c:3804 gtk/gtkplacesview.c:1103 + msgid "Computer" + msgstr "מחשב" + +@@ -3512,7 +3496,7 @@ msgstr "יש לנסות חיפוש שונה" + msgid "Could not show link" + msgstr "לא ניתן להציג את הקישור" + +-#: gtk/gtktext.c:6087 gtk/gtktextview.c:8982 ++#: gtk/gtktext.c:6091 gtk/gtktextview.c:8982 + msgid "Insert _Emoji" + msgstr "הכנסת _רגשון" + +@@ -3547,12 +3531,12 @@ msgctxt "volume percentage" + msgid "%d %%" + msgstr "%d %%" + +-#: gtk/gtkwindow.c:6135 ++#: gtk/gtkwindow.c:6142 + #, c-format + msgid "Do you want to use GTK Inspector?" + msgstr "להשתמש במפקח GTK‎?" + +-#: gtk/gtkwindow.c:6137 ++#: gtk/gtkwindow.c:6144 + #, c-format + msgid "" + "GTK Inspector is an interactive debugger that lets you explore and modify " +@@ -3562,7 +3546,7 @@ msgstr "" + "מפקח GTK‎ הוא מנפה שגיאות הידודי המאפשר לך לחקור ולשנות את הפנים של כל יישום " + "GTK+‎. שימוש בו יכול לגרום ליישום להישבר או לקרוס." + +-#: gtk/gtkwindow.c:6142 ++#: gtk/gtkwindow.c:6149 + msgid "Don’t show this message again" + msgstr "לא להציג הודעה זו שוב" + +@@ -3732,7 +3716,7 @@ msgstr "מחלקות סגנון" + msgid "CSS Property" + msgstr "מאפיין CSS" + +-#: gtk/inspector/general.c:330 gtk/inspector/general.c:410 ++#: gtk/inspector/general.c:330 gtk/inspector/general.c:411 + msgctxt "GL version" + msgid "None" + msgstr "ללא" +@@ -3747,36 +3731,34 @@ msgctxt "GL vendor" + msgid "Disabled" + msgstr "מושבת" + +-#: gtk/inspector/general.c:411 ++#: gtk/inspector/general.c:412 + msgctxt "GL vendor" + msgid "None" + msgstr "ללא" + +-#: gtk/inspector/general.c:462 ++#: gtk/inspector/general.c:463 + msgctxt "Vulkan device" + msgid "Disabled" + msgstr "מושבת" + +-#: gtk/inspector/general.c:463 gtk/inspector/general.c:464 ++#: gtk/inspector/general.c:464 gtk/inspector/general.c:465 + msgctxt "Vulkan version" + msgid "Disabled" + msgstr "מושבת" + +-#: gtk/inspector/general.c:520 ++#: gtk/inspector/general.c:521 + msgctxt "Vulkan device" + msgid "None" + msgstr "ללא" + +-#: gtk/inspector/general.c:521 gtk/inspector/general.c:522 ++#: gtk/inspector/general.c:522 gtk/inspector/general.c:523 + msgctxt "Vulkan version" + msgid "None" + msgstr "ללא" + +-#: gtk/inspector/general.c:792 +-#, fuzzy +-#| msgid "Theme is hardcoded by GTK_THEME" ++#: gtk/inspector/general.c:793 + msgid "IM Context is hardcoded by GTK_IM_MODULE" +-msgstr "ערכת נושא קשיחה בקוד על ידי GTK_THEME" ++msgstr "הקשר IM קשיח בקוד על ידי GTK_THEME" + + #: gtk/inspector/general.ui:32 + msgid "GTK Version" +@@ -3807,10 +3789,8 @@ msgid "Application ID" + msgstr "מזהה יישום" + + #: gtk/inspector/general.ui:228 +-#, fuzzy +-#| msgid "Resources" + msgid "Resource Path" +-msgstr "מאשבים" ++msgstr "נתיב משאב" + + #: gtk/inspector/general.ui:268 + msgid "Prefix" +@@ -3914,16 +3894,14 @@ msgid "Surface" + msgstr "משטח" + + #: gtk/inspector/misc-info.ui:405 gtk/inspector/misc-info.ui:444 +-#: gtk/inspector/misc-info.ui:483 gtk/inspector/prop-editor.c:1116 +-#: gtk/inspector/prop-editor.c:1476 gtk/inspector/window.ui:396 ++#: gtk/inspector/misc-info.ui:483 gtk/inspector/prop-editor.c:1162 ++#: gtk/inspector/prop-editor.c:1534 gtk/inspector/window.ui:396 + msgid "Properties" + msgstr "מאפיינים" + + #: gtk/inspector/misc-info.ui:425 +-#, fuzzy +-#| msgid "Rendering Mode" + msgid "Renderer" +-msgstr "מצב תִּצּוּג" ++msgstr "מעבד" + + #: gtk/inspector/misc-info.ui:464 + msgid "Frame Clock" +@@ -3959,7 +3937,7 @@ msgstr "עליון" + msgid "Child Visible" + msgstr "ילד נראה" + +-#: gtk/inspector/prop-editor.c:656 ++#: gtk/inspector/prop-editor.c:702 + #, c-format + msgid "Pointer: %p" + msgstr "מצביע: %p" +@@ -3967,7 +3945,7 @@ msgstr "מצביע: %p" + #. Translators: %s is a type name, for example + #. * GtkPropertyExpression with value \"2.5\" + #. +-#: gtk/inspector/prop-editor.c:788 ++#: gtk/inspector/prop-editor.c:834 + #, c-format + msgid "%s with value \"%s\"" + msgstr "‫%s עם ערך „%s”" +@@ -3975,7 +3953,7 @@ msgstr "‫%s עם ערך „%s”" + #. Translators: Both %s are type names, for example + #. * GtkPropertyExpression with type GObject + #. +-#: gtk/inspector/prop-editor.c:799 ++#: gtk/inspector/prop-editor.c:845 + #, c-format + msgid "%s with type %s" + msgstr "‫%s עם סוג %s" +@@ -3983,7 +3961,7 @@ msgstr "‫%s עם סוג %s" + #. Translators: Both %s are type names, for example + #. * GtkObjectExpression for GtkStringObject 0x23456789 + #. +-#: gtk/inspector/prop-editor.c:812 ++#: gtk/inspector/prop-editor.c:858 + #, c-format + msgid "%s for %s %p" + msgstr "‫%s עבור %s %p" +@@ -3991,71 +3969,71 @@ msgstr "‫%s עבור %s %p" + #. Translators: Both %s are type names, for example + #. * GtkPropertyExpression with value type: gchararray + #. +-#: gtk/inspector/prop-editor.c:842 ++#: gtk/inspector/prop-editor.c:888 + #, c-format + msgid "%s with value type %s" + msgstr "‫%s עם סוג ערך %s" + +-#: gtk/inspector/prop-editor.c:1184 ++#: gtk/inspector/prop-editor.c:1242 + #, c-format + msgid "Uneditable property type: %s" + msgstr "סוג מאפיין לא ניתן לעריכה: %s" + +-#: gtk/inspector/prop-editor.c:1328 ++#: gtk/inspector/prop-editor.c:1386 + msgctxt "column number" + msgid "None" + msgstr "ללא" + +-#: gtk/inspector/prop-editor.c:1365 ++#: gtk/inspector/prop-editor.c:1423 + msgid "Attribute:" + msgstr "תכונה:" + +-#: gtk/inspector/prop-editor.c:1368 ++#: gtk/inspector/prop-editor.c:1426 + msgid "Model" + msgstr "דגם" + +-#: gtk/inspector/prop-editor.c:1373 ++#: gtk/inspector/prop-editor.c:1431 + msgid "Column:" + msgstr "עמודה:" + + #. Translators: %s is a type name, for example + #. * Action from 0x2345678 (GtkApplicationWindow) + #. +-#: gtk/inspector/prop-editor.c:1472 ++#: gtk/inspector/prop-editor.c:1530 + #, c-format + msgid "Action from: %p (%s)" + msgstr "פעולה מתוך: %p ‏(%s)" + +-#: gtk/inspector/prop-editor.c:1527 ++#: gtk/inspector/prop-editor.c:1585 + msgid "Reset" + msgstr "איפוס" + +-#: gtk/inspector/prop-editor.c:1535 ++#: gtk/inspector/prop-editor.c:1593 + msgctxt "GtkSettings source" + msgid "Default" + msgstr "בררת מחדל" + +-#: gtk/inspector/prop-editor.c:1538 ++#: gtk/inspector/prop-editor.c:1596 + msgctxt "GtkSettings source" + msgid "Theme" + msgstr "ערכת עיצוב" + +-#: gtk/inspector/prop-editor.c:1541 ++#: gtk/inspector/prop-editor.c:1599 + msgctxt "GtkSettings source" + msgid "XSettings" + msgstr "‫XSettings" + +-#: gtk/inspector/prop-editor.c:1545 ++#: gtk/inspector/prop-editor.c:1603 + msgctxt "GtkSettings source" + msgid "Application" + msgstr "יישום" + +-#: gtk/inspector/prop-editor.c:1548 ++#: gtk/inspector/prop-editor.c:1606 + msgctxt "GtkSettings source" + msgid "Unknown" + msgstr "לא ידוע" + +-#: gtk/inspector/prop-editor.c:1551 ++#: gtk/inspector/prop-editor.c:1609 + msgid "Source:" + msgstr "מקור:" + +@@ -4266,7 +4244,7 @@ msgstr "הצגת עדכונים גרפיים" + + #: gtk/inspector/visual.ui:440 + msgid "Show Fallback Rendering" +-msgstr "" ++msgstr "הצגת עיבוד נסיגה" + + #: gtk/inspector/visual.ui:465 + msgid "Show Baselines" +@@ -4345,11 +4323,8 @@ msgid "Child object" + msgstr "עצם צאצא" + + #: gtk/inspector/window.ui:341 +-#, fuzzy +-#| msgctxt "Stock label, media" +-#| msgid "Pre_vious" + msgid "Previous sibling" +-msgstr "ה_קודם" ++msgstr "אחאי קודם" + + #: gtk/inspector/window.ui:347 + msgid "List Position" +@@ -4357,7 +4332,7 @@ msgstr "מיקום ברשימה" + + #: gtk/inspector/window.ui:356 + msgid "Next sibling" +-msgstr "" ++msgstr "האחאי הבא" + + #: gtk/inspector/window.ui:386 + msgid "Miscellaneous" +@@ -4869,12 +4844,9 @@ msgid "Reph Forms" + msgstr "צורות רף" + + #: gtk/open-type-layout.h:100 +-#, fuzzy +-#| msgctxt "output-bin" +-#| msgid "Right Bin" + msgctxt "OpenType layout" + msgid "Right Bounds" +-msgstr "מגש ימני" ++msgstr "גבולות ימניים" + + #: gtk/open-type-layout.h:101 + msgctxt "OpenType layout" +@@ -5087,11 +5059,9 @@ msgid "Alternate Vertical Metrics" + msgstr "" + + #: gtk/open-type-layout.h:143 +-#, fuzzy +-#| msgid "Dark Variant" + msgctxt "OpenType layout" + msgid "Vattu Variants" +-msgstr "הֶגְוֵן כהה" ++msgstr "הגוונים של ואטו" + + #: gtk/open-type-layout.h:144 + msgctxt "OpenType layout" +@@ -6631,7 +6601,7 @@ msgstr "לא זמין" + + #: modules/printbackends/gtkprintbackendfile.c:234 + msgid "output" +-msgstr "output" ++msgstr "פלט" + + #: modules/printbackends/gtkprintbackendfile.c:511 + msgid "Print to File" +@@ -6693,28 +6663,28 @@ msgstr "פרופיל בלתי מוגדר" + + #: tools/encodesymbolic.c:41 + msgid "Output to this directory instead of cwd" +-msgstr "Output to this directory instead of cwd" ++msgstr "לשלוח את הפלט לתיקייה הזאת במקום אל cwd" + + #: tools/encodesymbolic.c:42 + msgid "Generate debug output" + msgstr "יצירת פלט ניפוי שגיאות" + +-#: tools/encodesymbolic.c:94 ++#: tools/encodesymbolic.c:92 + #, c-format + msgid "Invalid size %s\n" +-msgstr "Invalid size %s\n" ++msgstr "הגודל %s שגוי\n" + +-#: tools/encodesymbolic.c:106 tools/encodesymbolic.c:115 ++#: tools/encodesymbolic.c:104 tools/encodesymbolic.c:113 + #, c-format + msgid "Can’t load file: %s\n" + msgstr "לא ניתן לטעון קובץ: %s\n" + +-#: tools/encodesymbolic.c:143 tools/encodesymbolic.c:149 ++#: tools/encodesymbolic.c:141 tools/encodesymbolic.c:147 + #, c-format + msgid "Can’t save file %s: %s\n" + msgstr "אי אפשר לשמור קובץ %s‏: %s\n" + +-#: tools/encodesymbolic.c:155 ++#: tools/encodesymbolic.c:153 + #, c-format + msgid "Can’t close stream" + msgstr "אי אפשר לסגור תזרים" +@@ -6761,16 +6731,14 @@ msgstr "" + "Perform various tasks on GtkBuilder .ui files.\n" + + #: tools/gtk-builder-tool-simplify.c:440 +-#, fuzzy, c-format +-#| msgid "Couldn't parse value for %s::%s: %s\n" ++#, c-format + msgid "%s:%d: Couldn’t parse value for property '%s': %s\n" +-msgstr "Couldn't parse value for %s::%s: %s\n" ++msgstr "%s:%d: לא ניתן לפענח את הערך של המאפיין ‚%s’: %s\n" + + #: tools/gtk-builder-tool-simplify.c:649 +-#, fuzzy, c-format +-#| msgid "Property %s::%s not found\n" ++#, c-format + msgid "%s:%d: %sproperty %s::%s not found\n" +-msgstr "Property %s::%s not found\n" ++msgstr "%s:%d: %sמאפיין %s::%s לא נמצא\n" + + #: tools/gtk-builder-tool-simplify.c:2286 + #, c-format +@@ -6788,12 +6756,9 @@ msgstr "" + "‬\n" + + #: tools/gtk-builder-tool-simplify.c:2309 +-#, fuzzy, c-format +-#| msgid "Can’t parse “%s”: %s\n" ++#, c-format + msgid "Can’t parse “%s”\n" +-msgstr "" +-"לא ניתן לפענח את „%s”: %s\n" +-"‬\n" ++msgstr "לא ניתן לפענח את „%s”\n" + + #: tools/gtk-builder-tool-simplify.c:2333 + #, c-format +@@ -6817,7 +6782,7 @@ msgstr "לא צוין קובץ ‎.ui\n" + #: tools/gtk-builder-tool-simplify.c:2385 + #, c-format + msgid "Can only simplify a single .ui file without --replace\n" +-msgstr "" ++msgstr "יכול לפשט רק קובץ ‎.ui בודד ללא ‎--replace\n" + + #: tools/gtk-launch.c:40 + msgid "Show program version" +@@ -6825,13 +6790,13 @@ msgstr "Show program version" + + #. Translators: this message will appear immediately after the + #. usage string - Usage: COMMAND [OPTION…] +-#: tools/gtk-launch.c:74 ++#: tools/gtk-launch.c:72 + msgid "APPLICATION [URI…] — launch an APPLICATION" + msgstr "APPLICATION [URI…] — launch an APPLICATION" + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: tools/gtk-launch.c:78 ++#: tools/gtk-launch.c:76 + msgid "" + "Launch an application (specified by its desktop file name),\n" + "optionally passing one or more URIs as arguments." +@@ -6839,38 +6804,38 @@ msgstr "" + "Launch an application (specified by its desktop file name),\n" + "optionally passing one or more URIs as arguments." + +-#: tools/gtk-launch.c:88 ++#: tools/gtk-launch.c:86 + #, c-format + msgid "Error parsing commandline options: %s\n" + msgstr "Error parsing commandline options: %s\n" + +-#: tools/gtk-launch.c:90 tools/gtk-launch.c:111 ++#: tools/gtk-launch.c:88 tools/gtk-launch.c:109 + #, c-format + msgid "Try “%s --help” for more information." + msgstr "כדאי לנסות את „‎%s --help” למידע נוסף." + + #. Translators: the %s is the program name. This error message + #. means the user is calling gtk-launch without any argument. +-#: tools/gtk-launch.c:109 ++#: tools/gtk-launch.c:107 + #, c-format + msgid "%s: missing application name" + msgstr "%s: missing application name" + +-#: tools/gtk-launch.c:138 ++#: tools/gtk-launch.c:136 + #, c-format + msgid "Creating AppInfo from id not supported on non unix operating systems" + msgstr "Creating AppInfo from id not supported on non unix operating systems" + + #. Translators: the first %s is the program name, the second one + #. is the application name. +-#: tools/gtk-launch.c:146 ++#: tools/gtk-launch.c:144 + #, c-format + msgid "%s: no such application %s" + msgstr "%s: no such application %s" + + #. Translators: the first %s is the program name, the second one + #. is the error message. +-#: tools/gtk-launch.c:164 ++#: tools/gtk-launch.c:162 + #, c-format + msgid "%s: error launching application: %s\n" + msgstr "%s: error launching application: %s\n" +@@ -6948,43 +6913,48 @@ msgstr "Include image data in the cache" + + #: tools/updateiconcache.c:1661 + msgid "Output a C header file" +-msgstr "Output a C header file" ++msgstr "הוצאת פלט בצורת קובץ כותרת של C" + + #: tools/updateiconcache.c:1662 + msgid "Turn off verbose output" +-msgstr "Turn off verbose output" ++msgstr "כיבוי פלט מפורט" + + #: tools/updateiconcache.c:1663 + msgid "Validate existing icon cache" +-msgstr "Validate existing icon cache" ++msgstr "אימות מטמון סמלים קיים" + +-#: tools/updateiconcache.c:1730 ++#: tools/updateiconcache.c:1728 + #, c-format + msgid "File not found: %s\n" + msgstr "קובץ לא נמצא: %s\n" + +-#: tools/updateiconcache.c:1736 ++#: tools/updateiconcache.c:1734 + #, c-format + msgid "Not a valid icon cache: %s\n" +-msgstr "Not a valid icon cache: %s\n" ++msgstr "לא מטמון סמלים תקני: %s\n" + +-#: tools/updateiconcache.c:1749 ++#: tools/updateiconcache.c:1747 + #, c-format + msgid "No theme index file.\n" + msgstr "No theme index file.\n" + +-#: tools/updateiconcache.c:1753 +-#, fuzzy, c-format +-#| msgid "" +-#| "No theme index file in '%s'.\n" +-#| "If you really want to create an icon cache here, use --ignore-theme-" +-#| "index.\n" ++#: tools/updateiconcache.c:1751 ++#, c-format + msgid "" + "No theme index file in “%s”.\n" + "If you really want to create an icon cache here, use --ignore-theme-index.\n" + msgstr "" +-"No theme index file in '%s'.\n" +-"If you really want to create an icon cache here, use --ignore-theme-index.\n" ++"אין קובץ אינדקס לערכות עיצוב „%s”.\n" ++"כדי באמת ליצור דרך כאן מטמון סמלים, יש להשתמש ב־‎--ignore-theme-index.\n" ++ ++#~ msgid "About" ++#~ msgstr "על אודות" ++ ++#~ msgid "Credits" ++#~ msgstr "תודות" ++ ++#~ msgid "System" ++#~ msgstr "מערכת" + + #~| msgid "Can't parse file: %s\n" + #~ msgid "Can't parse “%s”: %s\n" diff --git a/debian/patches/boxlayout-Do-not-infloop.patch b/debian/patches/boxlayout-Do-not-infloop.patch new file mode 100644 index 0000000000..51c5f4362c --- /dev/null +++ b/debian/patches/boxlayout-Do-not-infloop.patch @@ -0,0 +1,90 @@ +From: Benjamin Otte +Date: Tue, 26 Apr 2022 19:51:16 +0200 +Subject: boxlayout: Do not infloop + +if the loop for determining max width grows too big, print an error and +abort assuming that a satisfactory value was reached. + +This will cause wrong layout and might cause widgets to overlap, but it +will not infloop. + +It actually works around and doesn't really fix the primary cause of the +following bugs, but good enough to close them: + +(cherry picked from commit 515b1f52929a189b858a38aba733a3e7d2375fbc) + +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4517 +Bug-Debian: https://bugs.debian.org/1010547 +Origin: upstream, 4.6.4, commit:ae0166973795e750f08b89f9f0ef974d7ac48bc7 +--- + gtk/gtkboxlayout.c | 43 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 41 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtkboxlayout.c b/gtk/gtkboxlayout.c +index e79c5e2..5d1b631 100644 +--- a/gtk/gtkboxlayout.c ++++ b/gtk/gtkboxlayout.c +@@ -288,6 +288,12 @@ gtk_box_layout_compute_opposite_size (GtkBoxLayout *self, + *natural = largest_nat; + } + ++/* if widgets haven't reached their min opposite size at this ++ * huge value, things went massively wrong and we need to bail to not ++ * cause an infinite loop. ++ */ ++#define MAX_ALLOWED_SIZE (1 << 20) ++ + static int + distribute_remaining_size (GtkRequestedSize *sizes, + gsize n_sizes, +@@ -321,7 +327,40 @@ distribute_remaining_size (GtkRequestedSize *sizes, + { + int test; + +- if (max == G_MAXINT) ++ if (min > MAX_ALLOWED_SIZE) ++ { ++ /* sanity check! */ ++ for (i = 0; i < n_sizes; i++) ++ { ++ int check_min, check_nat; ++ gtk_widget_measure (sizes[i].data, ++ orientation, ++ MAX_ALLOWED_SIZE, ++ &sizes[i].minimum_size, &sizes[i].natural_size, ++ NULL, NULL); ++ gtk_widget_measure (sizes[i].data, ++ orientation, ++ -1, ++ &check_min, &check_nat, ++ NULL, NULL); ++ if (check_min < sizes[i].minimum_size) ++ { ++ g_critical ("%s %p reports a minimum %s of %u, but minimum %s for %s of %u is %u. Expect overlapping widgets.", ++ G_OBJECT_TYPE_NAME (sizes[i].data), sizes[i].data, ++ orientation == GTK_ORIENTATION_HORIZONTAL ? "width" : "height", ++ check_min, ++ orientation == GTK_ORIENTATION_HORIZONTAL ? "width" : "height", ++ orientation == GTK_ORIENTATION_HORIZONTAL ? "height" : "width", ++ MAX_ALLOWED_SIZE, sizes[i].minimum_size); ++ sizes[i].minimum_size = check_min; ++ sizes[i].natural_size = check_nat; ++ } ++ total_size += sizes[i].minimum_size; ++ } ++ return MAX (0, available - total_size); ++ } ++ ++ if (max == MAX_ALLOWED_SIZE) + test = min * 2; + else + test = (min + max) / 2; +@@ -465,7 +504,7 @@ gtk_box_layout_compute_opposite_size_for_size (GtkBoxLayout *self, + self->orientation, + available, + min_size, +- G_MAXINT); ++ MAX_ALLOWED_SIZE); + + /* Bring children up to size first */ + available = gtk_distribute_natural_allocation (available, nvis_children, sizes); diff --git a/debian/patches/filechooser-Small-fix-for-select-folder-mode.patch b/debian/patches/filechooser-Small-fix-for-select-folder-mode.patch new file mode 100644 index 0000000000..42cdac5e64 --- /dev/null +++ b/debian/patches/filechooser-Small-fix-for-select-folder-mode.patch @@ -0,0 +1,30 @@ +From: Sophie Herold +Date: Tue, 19 Apr 2022 00:55:05 +0200 +Subject: filechooser: Small fix for select folder mode + +When changing folders, we were making the select +button insensitive when there is no folder selected. +However, the select button should be usable to +select the current folder. + +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4020 +Origin: upstream, 4.6.4, commit:1e561035e2bc85942ae08005f4041709a15a9ce8 +--- + gtk/gtkfilechooserwidget.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c +index b365204..be084da 100644 +--- a/gtk/gtkfilechooserwidget.c ++++ b/gtk/gtkfilechooserwidget.c +@@ -2193,7 +2193,9 @@ update_default (GtkFileChooserWidget *impl) + return; + + files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (impl)); +- sensitive = (g_list_model_get_n_items (files) > 0 || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE); ++ sensitive = (g_list_model_get_n_items (files) > 0 || ++ impl->action == GTK_FILE_CHOOSER_ACTION_SAVE || ++ impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + gtk_widget_set_sensitive (button, sensitive); + + g_object_unref (files); diff --git a/debian/patches/series b/debian/patches/series index 942bdadf59..94ef853ea9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,9 @@ +boxlayout-Do-not-infloop.patch +Update-Hebrew-translation.patch +Update-Hebrew-translation-1.patch +filechooser-Small-fix-for-select-folder-mode.patch +GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch +GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch -- 2.30.2