From 9f999add9655a21427692674b4879de45b425bac Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 3 Apr 2019 16:06:52 +0200 Subject: [PATCH] Automatic title updates, and re-written command-notify patches ... and backports of yet-to-be-released patches from upstream to avoid translation conflicts. --- gnome-terminal-backports-from-upstream.patch | 3279 +++++++++++++++++ ...minal-notify-open-title-transparency.patch | 799 +++- gnome-terminal.spec | 12 +- 3 files changed, 3897 insertions(+), 193 deletions(-) create mode 100644 gnome-terminal-backports-from-upstream.patch diff --git a/gnome-terminal-backports-from-upstream.patch b/gnome-terminal-backports-from-upstream.patch new file mode 100644 index 0000000..5662b1d --- /dev/null +++ b/gnome-terminal-backports-from-upstream.patch @@ -0,0 +1,3279 @@ +From dc2ba58d4f47d06637a8ce50e82425800ed3df4c Mon Sep 17 00:00:00 2001 +From: Khaled Hosny +Date: Fri, 15 Mar 2019 23:37:17 +0200 +Subject: [PATCH 1/8] Update Arabic translation + +(cherry picked from commit e5e59c7af37856adc288166d1a7c44a0f19e5bd0) +--- + po/ar.po | 555 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 288 insertions(+), 267 deletions(-) + +diff --git a/po/ar.po b/po/ar.po +index 6f5e80cc2a66..fac62fd10680 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -6,14 +6,14 @@ + # Arafat Medini , 2003. + # Arafat Medini , 2003. + # Abdulaziz Al-Arfaj , 2004. +-# Khaled Hosny , 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. ++# Khaled Hosny , 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. + # Djihed Afifi , 2006. + msgid "" + msgstr "" + "Project-Id-Version: gnome-terminal master\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-03-25 22:58+0200\n" +-"PO-Revision-Date: 2018-03-25 23:09+0200\n" ++"POT-Creation-Date: 2019-03-15 23:34+0200\n" ++"PO-Revision-Date: 2019-03-15 23:36+0200\n" + "Last-Translator: Khaled Hosny \n" + "Language-Team: Arabic \n" + "Language: ar\n" +@@ -22,20 +22,21 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " + "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +-"X-Generator: Virtaal 1.0.0-beta1\n" ++"X-Generator: Virtaal 0.7.1\n" + "X-Project-Style: gnome\n" + ++#. VERSION=@VERSION@ + #: ../org.gnome.Terminal.appdata.xml.in.h:1 +-#: ../org.gnome.Terminal.desktop.in.in.h:1 ../src/server.c:147 +-#: ../src/terminal-accels.c:226 ../src/terminal.c:549 ++#: ../org.gnome.Terminal.desktop.in.in.h:2 ../src/server.c:147 ++#: ../src/terminal-accels.c:232 ../src/terminal.c:572 + #: ../src/terminal-menubar.ui.in.h:30 ../src/terminal-tab-label.c:81 +-#: ../src/terminal-window.c:1927 ../src/terminal-window.c:2187 +-#: ../src/terminal-window.c:2477 ++#: ../src/terminal-window.c:1885 ../src/terminal-window.c:2156 ++#: ../src/terminal-window.c:2446 + msgid "Terminal" + msgstr "الطرفية" + + #: ../org.gnome.Terminal.appdata.xml.in.h:2 +-#: ../org.gnome.Terminal.desktop.in.in.h:2 ++#: ../org.gnome.Terminal.desktop.in.in.h:3 + msgid "Use the command line" + msgstr "استعمل سطر الأوامر" + +@@ -67,10 +68,18 @@ msgid "" + "the context menu to open a terminal in the currently browsed directory." + msgstr "" + +-#: ../org.gnome.Terminal.desktop.in.in.h:3 ++#: ../org.gnome.Terminal.desktop.in.in.h:4 + msgid "shell;prompt;command;commandline;cmd;" + msgstr "طرفية;صدفة;سطر;أوامر;أمر;" + ++#: ../org.gnome.Terminal.desktop.in.in.h:5 ../src/terminal-accels.c:127 ++msgid "New Window" ++msgstr "نافذة جديدة" ++ ++#: ../org.gnome.Terminal.desktop.in.in.h:6 ../src/terminal-accels.c:146 ++msgid "Preferences" ++msgstr "التفضيلات" ++ + #. Translators: Keep single quote please! + #: ../src/org.gnome.Terminal.gschema.xml.h:2 + msgctxt "visible-name" +@@ -248,21 +257,10 @@ msgid "" + msgstr "" + + #: ../src/org.gnome.Terminal.gschema.xml.h:33 +-msgid "Whether to show menubar in new windows/tabs" +-msgstr "فيما إذا سيعرض شريط القوائم في النوافذ/الألسنة الجديدة" +- +-#: ../src/org.gnome.Terminal.gschema.xml.h:34 +-#, fuzzy +-msgid "True if the menubar should be shown in new window" +-msgstr "" +-"يضبط لـ True إذا وجب عرض شريط القوائم في النوافذ الجديدة، أو نوافذ/ألسنة " +-"بهذه الطور." +- +-#: ../src/org.gnome.Terminal.gschema.xml.h:35 + msgid "Default number of columns" + msgstr "عدد الأعمدة المبدئي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:36 ++#: ../src/org.gnome.Terminal.gschema.xml.h:34 + msgid "" + "Number of columns in newly created terminal windows. Has no effect if " + "use_custom_default_size is not enabled." +@@ -270,11 +268,11 @@ msgstr "" + "عدد الأعمدة في نوافذ الطرفية الجديدة. لا تأثير له إذا كان " + "use_custom_default_size مُفعّلا." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:37 ++#: ../src/org.gnome.Terminal.gschema.xml.h:35 + msgid "Default number of rows" + msgstr "عدد الصفوف المبدئي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:38 ++#: ../src/org.gnome.Terminal.gschema.xml.h:36 + msgid "" + "Number of rows in newly created terminal windows. Has no effect if " + "use_custom_default_size is not enabled." +@@ -282,16 +280,16 @@ msgstr "" + "عدد الصفوف في نوافذ الطرفية الجديدة. لا تأثير له إذا كان " + "use_custom_default_size مُفعّلا." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:39 ++#: ../src/org.gnome.Terminal.gschema.xml.h:37 + #, fuzzy + msgid "When to show the scrollbar" + msgstr "موقع شريط التمرير" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:40 ++#: ../src/org.gnome.Terminal.gschema.xml.h:38 + msgid "Number of lines to keep in scrollback" + msgstr "عدد السطور التي سيبقى عليها عند اللف إلى الخلف" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:41 ++#: ../src/org.gnome.Terminal.gschema.xml.h:39 + #, fuzzy + msgid "" + "Number of scrollback lines to keep around. You can scroll back in the " +@@ -302,11 +300,11 @@ msgstr "" + "ة بحسب هذا العدد من السطور. السطور الزائدة عن هذا ستُمحى. إذا ضبط سجل الرجوع " + "ليكون غير محدود فستُتجاهل هذه القيمة." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:42 ++#: ../src/org.gnome.Terminal.gschema.xml.h:40 + msgid "Whether an unlimited number of lines should be kept in scrollback" + msgstr "ما إذا كان سيُبقى على عدد لا محدود من السطور في سجل الرجوع" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:43 ++#: ../src/org.gnome.Terminal.gschema.xml.h:41 + msgid "" + "If true, scrollback lines will never be discarded. The scrollback history is " + "stored on disk temporarily, so this may cause the system to run out of disk " +@@ -315,30 +313,30 @@ msgstr "" + "إذا ضبط لصحيح، فلن تمحى أي سطور من سجل الرجوع. سيحفظ تاريخ الرجوع مؤقتا على " + "القرص مما قد يتسبب في استنفاذ المساحة الخالية في حال كان خرج الطرفية كثيرا." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:44 ++#: ../src/org.gnome.Terminal.gschema.xml.h:42 + msgid "Whether to scroll to the bottom when a key is pressed" + msgstr "فيما إذا سيقع اللف إلى الأسفل عند نقر مفتاح" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:45 ++#: ../src/org.gnome.Terminal.gschema.xml.h:43 + msgid "If true, pressing a key jumps the scrollbar to the bottom." + msgstr "إذا ضبط لصحيح فسيجعل شريط التمرير يقفز إلى الأسفل عند نقر المفتاح." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:46 ++#: ../src/org.gnome.Terminal.gschema.xml.h:44 + #, fuzzy + msgid "Whether to scroll to the bottom when there’s new output" + msgstr "فيما إذا سيقع اللف إلى الأسفل عند حصول خرْج جديد" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:47 ++#: ../src/org.gnome.Terminal.gschema.xml.h:45 + #, fuzzy + msgid "" + "If true, whenever there’s new output the terminal will scroll to the bottom." + msgstr "إذا ضبط لصحيح، ستلف الشاشة إلى الأسفل كل ما أتى خرْج جديد." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:48 ++#: ../src/org.gnome.Terminal.gschema.xml.h:46 + msgid "What to do with the terminal when the child command exits" + msgstr "ما الذي سيفعل بالطرفيّة عند خروج الأمر الإبن" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:49 ++#: ../src/org.gnome.Terminal.gschema.xml.h:47 + #, fuzzy + msgid "" + "Possible values are “close” to close the terminal, “restart” to restart the " +@@ -346,11 +344,11 @@ msgid "" + msgstr "" + "القيم الممكنة هي \"close\" لغلق الطرفيّة و \"restart\" لإعادة تشغيل الأمر." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:50 ++#: ../src/org.gnome.Terminal.gschema.xml.h:48 + msgid "Whether to launch the command in the terminal as a login shell" + msgstr "فيما إذا سيشغّل الامر في الطرفيّة كصدفة تسجيل دخول" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:51 ++#: ../src/org.gnome.Terminal.gschema.xml.h:49 + #, fuzzy + msgid "" + "If true, the command inside the terminal will be launched as a login shell " +@@ -359,21 +357,21 @@ msgstr "" + "إذا ضبط لصحيح سيطلق الأمر داخل الطرفيّة كصدفة تسجيل دخول. (سيكون لـ argv[0] " + "تلدة أمامها.)" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:52 ++#: ../src/org.gnome.Terminal.gschema.xml.h:50 + msgid "Whether to run a custom command instead of the shell" + msgstr "فيما إذا ينفذ أمر خاض عوض الصدفة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:53 ++#: ../src/org.gnome.Terminal.gschema.xml.h:51 + msgid "" + "If true, the value of the custom_command setting will be used in place of " + "running a shell." + msgstr "إذا ضبط لصحيح، فسيستعمل تعيين custom_command عوض تشغيل صدفة." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:54 ++#: ../src/org.gnome.Terminal.gschema.xml.h:52 + msgid "Whether to blink the cursor" + msgstr "فيما إذا سيومض المؤشّر" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:55 ++#: ../src/org.gnome.Terminal.gschema.xml.h:53 + #, fuzzy + msgid "" + "The possible values are “system” to use the global cursor blinking settings, " +@@ -382,212 +380,217 @@ msgstr "" + "القيم الممكنة هي \"system\" لتستخدم إعدادات وميض المؤشر العامة، أو \"on\" أو " + "\"off\" لتحدد الوضع." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:56 ++#: ../src/org.gnome.Terminal.gschema.xml.h:54 + msgid "The cursor appearance" + msgstr "مظهر المؤشر" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:57 ++#: ../src/org.gnome.Terminal.gschema.xml.h:55 + msgid "" + "Possible values are “always” or “never” allow blinking text, or only when " + "the terminal is “focused” or “unfocused”." + msgstr "" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:58 ++#: ../src/org.gnome.Terminal.gschema.xml.h:56 + msgid "Custom command to use instead of the shell" + msgstr "الأمر الخاص الذي سيستعمل عوض الصدفة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:59 ++#: ../src/org.gnome.Terminal.gschema.xml.h:57 + msgid "Run this command in place of the shell, if use_custom_command is true." + msgstr "نفّذ هذا الأمر عوض الصدفة إذا ضبط use_custom_command لصحيح." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:60 ++#: ../src/org.gnome.Terminal.gschema.xml.h:58 + msgid "Palette for terminal applications" + msgstr "لوح ألوان تطبيقات الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:61 ++#: ../src/org.gnome.Terminal.gschema.xml.h:59 + msgid "A Pango font name and size" + msgstr "" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:62 ++#: ../src/org.gnome.Terminal.gschema.xml.h:60 + #, fuzzy + msgid "The code sequence the Backspace key generates" + msgstr "مفتاح Backspace يولد:" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:63 ++#: ../src/org.gnome.Terminal.gschema.xml.h:61 + #, fuzzy + msgid "The code sequence the Delete key generates" + msgstr "زر ال_حذف يولّد:" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:64 ++#: ../src/org.gnome.Terminal.gschema.xml.h:62 + msgid "Whether to use the colors from the theme for the terminal widget" + msgstr "فيما إذا ستسعمل ألوان السِمة لقطع الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:65 ++#: ../src/org.gnome.Terminal.gschema.xml.h:63 + msgid "Whether to use the system monospace font" + msgstr "فيما إذا سيستعمل خط النظام ثابت العرض" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:66 ++#: ../src/org.gnome.Terminal.gschema.xml.h:64 + #, fuzzy + msgid "Whether to rewrap the terminal contents on window resize" + msgstr "فيما إذا سيعرض شريط القوائم في النوافذ/الألسنة الجديدة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:67 ++#: ../src/org.gnome.Terminal.gschema.xml.h:65 + msgid "Which encoding to use" + msgstr "ما الترميز الذي سيُستخدم" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:68 ++#: ../src/org.gnome.Terminal.gschema.xml.h:66 + msgid "" + "Whether ambiguous-width characters are narrow or wide when using UTF-8 " + "encoding" + msgstr "" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:69 ++#: ../src/org.gnome.Terminal.gschema.xml.h:67 + msgid "Keyboard shortcut to open a new tab" + msgstr "اختصار لوحة المفاتيح لفتح لسان جديد" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:70 ++#: ../src/org.gnome.Terminal.gschema.xml.h:68 + msgid "Keyboard shortcut to open a new window" + msgstr "اختصار لوحة المفاتيح لفتح نافذة جديدة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:71 ++#: ../src/org.gnome.Terminal.gschema.xml.h:69 + msgid "Keyboard shortcut to save the current tab contents to file" + msgstr "اختصار لوحة المفاتيح لحفظ محتويات اللسان الحالي في ملف" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:72 ++#: ../src/org.gnome.Terminal.gschema.xml.h:70 + #, fuzzy + msgid "" + "Keyboard shortcut to export the current tab contents to file in various " + "formats" + msgstr "اختصار لوحة المفاتيح لحفظ محتويات اللسان الحالي في ملف" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:73 ++#: ../src/org.gnome.Terminal.gschema.xml.h:71 + #, fuzzy + msgid "Keyboard shortcut to print the current tab contents to printer or file" + msgstr "اختصار لوحة المفاتيح لحفظ محتويات اللسان الحالي في ملف" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:74 ++#: ../src/org.gnome.Terminal.gschema.xml.h:72 + msgid "Keyboard shortcut to close a tab" + msgstr "اختصار لوحة المفاتيح لغلق لسان" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:75 ++#: ../src/org.gnome.Terminal.gschema.xml.h:73 + msgid "Keyboard shortcut to close a window" + msgstr "اختصار لوحة المفاتيح لغلق نافذة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:76 ++#: ../src/org.gnome.Terminal.gschema.xml.h:74 + msgid "Keyboard shortcut to copy text" + msgstr "اختصار لوحة المفاتيح لنسخ نص" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:77 ++#: ../src/org.gnome.Terminal.gschema.xml.h:75 + #, fuzzy + msgid "Keyboard shortcut to copy text as HTML" + msgstr "اختصار لوحة المفاتيح لنسخ نص" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:78 ++#: ../src/org.gnome.Terminal.gschema.xml.h:76 + msgid "Keyboard shortcut to paste text" + msgstr "اختصار لوحة المفاتيح للصق النص" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:79 ++#: ../src/org.gnome.Terminal.gschema.xml.h:77 + #, fuzzy + msgid "Keyboard shortcut to select all text" + msgstr "اختصار لوحة المفاتيح للصق النص" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:80 ++#: ../src/org.gnome.Terminal.gschema.xml.h:78 + #, fuzzy + msgid "Keyboard shortcut to open the Preferences dialog" + msgstr "اختصار لوحة المفاتيح لإعادة ضبط الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:81 ++#: ../src/org.gnome.Terminal.gschema.xml.h:79 + msgid "Keyboard shortcut to toggle full screen mode" + msgstr "اختصار لوحة المفاتيح للتحوّل لنمط ملأ الشاشة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:82 ++#: ../src/org.gnome.Terminal.gschema.xml.h:80 + msgid "Keyboard shortcut to toggle the visibility of the menubar" + msgstr "اختصار لوحة المفاتيح لتبديل رؤية شريط القوائم" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:83 ++#: ../src/org.gnome.Terminal.gschema.xml.h:81 + #, fuzzy + msgid "Keyboard shortcut to toggle the read-only state" + msgstr "اختصار لوحة المفاتيح لضبط عنوان الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:84 ++#: ../src/org.gnome.Terminal.gschema.xml.h:82 + msgid "Keyboard shortcut to reset the terminal" + msgstr "اختصار لوحة المفاتيح لإعادة ضبط الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:85 ++#: ../src/org.gnome.Terminal.gschema.xml.h:83 + msgid "Keyboard shortcut to reset and clear the terminal" + msgstr "اختصار لوحة المفاتيح لإعادة ضبط و مسح الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:86 ++#: ../src/org.gnome.Terminal.gschema.xml.h:84 + #, fuzzy + msgid "Keyboard shortcut to open the search dialog" + msgstr "اختصار لوحة المفاتيح لإعادة ضبط الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:87 ++#: ../src/org.gnome.Terminal.gschema.xml.h:85 + #, fuzzy + msgid "Keyboard shortcut to find the next occurrence of the search term" + msgstr "اختصار لوحة المفاتيح لنقل اللسان الحالي إلى اليمين" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:88 ++#: ../src/org.gnome.Terminal.gschema.xml.h:86 + #, fuzzy + msgid "Keyboard shortcut to find the previous occurrence of the search term" + msgstr "اختصار لوحة المفاتيح لنقل اللسان الحالي إلى اليمين" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:89 ++#: ../src/org.gnome.Terminal.gschema.xml.h:87 + #, fuzzy + msgid "Keyboard shortcut to clear the find highlighting" + msgstr "اختصار لوحة المفاتيح لضبط عنوان الطرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:90 ++#: ../src/org.gnome.Terminal.gschema.xml.h:88 + msgid "Keyboard shortcut to switch to the previous tab" + msgstr "اختصار لوحة المفاتيح للتحوّل للسان السابق" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:91 ++#: ../src/org.gnome.Terminal.gschema.xml.h:89 + msgid "Keyboard shortcut to switch to the next tab" + msgstr "اختصار لوحة المفاتيح للتحوّل للسان التالي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:92 ++#: ../src/org.gnome.Terminal.gschema.xml.h:90 + msgid "Keyboard shortcut to move the current tab to the left" + msgstr "اختصار لوحة المفاتيح لنقل اللسان الحالي إلى اليسار" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:93 ++#: ../src/org.gnome.Terminal.gschema.xml.h:91 + msgid "Keyboard shortcut to move the current tab to the right" + msgstr "اختصار لوحة المفاتيح لنقل اللسان الحالي إلى اليمين" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:94 ++#: ../src/org.gnome.Terminal.gschema.xml.h:92 + msgid "Keyboard shortcut to detach current tab" + msgstr "اختصار لوحة المفاتيح لفصل اللسان الحالي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:95 ++#: ../src/org.gnome.Terminal.gschema.xml.h:93 + #, fuzzy + msgid "Keyboard shortcut to switch to the numbered tab" + msgstr "اختصار لوحة المفاتيح للتحوّل للسان التالي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:96 ++#: ../src/org.gnome.Terminal.gschema.xml.h:94 + #, fuzzy + msgid "Keyboard shortcut to switch to the last tab" + msgstr "اختصار لوحة المفاتيح للتحوّل للسان التالي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:97 ++#: ../src/org.gnome.Terminal.gschema.xml.h:95 + msgid "Keyboard shortcut to launch help" + msgstr "اختصار لوحة المفاتيح لإطلاق المساعدة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:98 ++#: ../src/org.gnome.Terminal.gschema.xml.h:96 + msgid "Keyboard shortcut to make font larger" + msgstr "اختصار لوحة المفاتيح لجعل الخط أعرض" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:99 ++#: ../src/org.gnome.Terminal.gschema.xml.h:97 + msgid "Keyboard shortcut to make font smaller" + msgstr "اختصار لوحة المفاتيح لجعل الخط أصغر" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:100 ++#: ../src/org.gnome.Terminal.gschema.xml.h:98 + msgid "Keyboard shortcut to make font normal-size" + msgstr "اختصار لوحة المفاتيح لإرجاع الخط إلى حجمه العادي" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:101 ++#: ../src/org.gnome.Terminal.gschema.xml.h:99 ++#, fuzzy ++msgid "Keyboard shortcut to show the primary menu" ++msgstr "اختصار لوحة المفاتيح للتحوّل للسان السابق" ++ ++#: ../src/org.gnome.Terminal.gschema.xml.h:100 + msgid "Whether the menubar has access keys" + msgstr "فيما إذا كان لشريط القوائم مفاتيح وصول" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:102 ++#: ../src/org.gnome.Terminal.gschema.xml.h:101 + #, fuzzy + msgid "" + "Whether to have Alt+letter access keys for the menubar. They may interfere " +@@ -597,12 +600,12 @@ msgstr "" + "فيما إذا يمكن لـ Alt+حرف النفاذ إلى شريط القوائم. قد تتضارب مع بعض التطبيقات " + "التي شغلت داخل شاشة طرفيّة فيمكنك تعطيلها." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:103 ++#: ../src/org.gnome.Terminal.gschema.xml.h:102 + #, fuzzy + msgid "Whether shortcuts are enabled" + msgstr "فيما إذا كان اختصار GTK القياسي لشريط القوائم مفعّلا" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:104 ++#: ../src/org.gnome.Terminal.gschema.xml.h:103 + #, fuzzy + msgid "" + "Whether shortcuts are enabled. They may interfere with some applications run " +@@ -611,11 +614,11 @@ msgstr "" + "فيما إذا يمكن لـ Alt+حرف النفاذ إلى شريط القوائم. قد تتضارب مع بعض التطبيقات " + "التي شغلت داخل شاشة طرفيّة فيمكنك تعطيلها." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:105 ++#: ../src/org.gnome.Terminal.gschema.xml.h:104 + msgid "Whether the standard GTK shortcut for menubar access is enabled" + msgstr "فيما إذا كان اختصار GTK القياسي لشريط القوائم مفعّلا" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:106 ++#: ../src/org.gnome.Terminal.gschema.xml.h:105 + msgid "" + "Normally you can access the menubar with F10. This can also be customized " + "via gtkrc (gtk-menu-bar-accel = \"whatever\"). This option allows the " +@@ -625,33 +628,33 @@ msgstr "" + "gtkrc (gtk-menu-bar-accel = \"whatever\"). يسمح هذا الخيار بتعطيل مفتاح " + "اختصار شريط القوائم القياسي." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:107 ++#: ../src/org.gnome.Terminal.gschema.xml.h:106 + msgid "Whether the shell integration is enabled" + msgstr "" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:108 ++#: ../src/org.gnome.Terminal.gschema.xml.h:107 + msgid "Whether to ask for confirmation before closing a terminal" + msgstr "فيما إذا سيطلب التّأكيد عند قبل إغلاق الطّرفيّة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:109 ++#: ../src/org.gnome.Terminal.gschema.xml.h:108 + msgid "Whether to show the menubar in new windows" + msgstr "فيما إذا سيعرض شريط القوائم في النوافذ الجديدة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:110 ++#: ../src/org.gnome.Terminal.gschema.xml.h:109 + #, fuzzy + msgid "Whether to open new terminals as windows or tabs" + msgstr "فيما إذا سيعرض شريط القوائم في النوافذ/الألسنة الجديدة" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:111 ++#: ../src/org.gnome.Terminal.gschema.xml.h:110 + #, fuzzy + msgid "When to show the tabs bar" + msgstr "موقع شريط التمرير" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:112 ++#: ../src/org.gnome.Terminal.gschema.xml.h:111 + msgid "The position of the tab bar" + msgstr "" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:113 ++#: ../src/org.gnome.Terminal.gschema.xml.h:112 + #, fuzzy + msgid "Which theme variant to use" + msgstr "ما الترميز الذي سيُستخدم" +@@ -1141,26 +1144,26 @@ msgid "Error parsing command: %s" + msgstr "خطأ أثناء تحليل الأمر: %s" + + #. Translators: Appears as: [numeric entry] × width +-#: ../src/profile-editor.c:899 ++#: ../src/profile-editor.c:828 + msgid "width" + msgstr "العرض" + + #. Translators: Appears as: [numeric entry] × height +-#: ../src/profile-editor.c:904 ++#: ../src/profile-editor.c:833 + msgid "height" + msgstr "الارتفاع" + +-#: ../src/profile-editor.c:956 ++#: ../src/profile-editor.c:885 + #, c-format + msgid "Choose Palette Color %u" + msgstr "اختر لوح ألوان %u" + +-#: ../src/profile-editor.c:960 ++#: ../src/profile-editor.c:889 + #, c-format + msgid "Palette entry %u" + msgstr "خانة لوح الألوان %u" + +-#: ../src/search-popover.ui.h:1 ../src/terminal-accels.c:148 ++#: ../src/search-popover.ui.h:1 ../src/terminal-accels.c:150 + msgid "Find" + msgstr "ابحث" + +@@ -1192,197 +1195,189 @@ msgstr "طابق _تعبيرا نمطيا" + msgid "_Wrap around" + msgstr "_لف حول" + +-#: ../src/terminal-accels.c:124 ++#: ../src/terminal-accels.c:126 + msgid "New Tab" + msgstr "لسان جديد" + +-#: ../src/terminal-accels.c:125 +-msgid "New Window" +-msgstr "نافذة جديدة" +- +-#: ../src/terminal-accels.c:127 ++#: ../src/terminal-accels.c:129 + msgid "Save Contents" + msgstr "احفظ المحتويات" + +-#: ../src/terminal-accels.c:130 ++#: ../src/terminal-accels.c:132 + msgid "Export" + msgstr "صدِّر" + +-#: ../src/terminal-accels.c:133 ++#: ../src/terminal-accels.c:135 + msgid "Print" + msgstr "اطبع" + +-#: ../src/terminal-accels.c:135 ++#: ../src/terminal-accels.c:137 + msgid "Close Tab" + msgstr "أغلق اللسان" + +-#: ../src/terminal-accels.c:136 ++#: ../src/terminal-accels.c:138 + msgid "Close Window" + msgstr "أغلق النافذة" + +-#: ../src/terminal-accels.c:140 ++#: ../src/terminal-accels.c:142 + msgid "Copy" + msgstr "انسخ" + +-#: ../src/terminal-accels.c:141 ++#: ../src/terminal-accels.c:143 + msgid "Copy as HTML" + msgstr "انسخ بنسق HTML" + +-#: ../src/terminal-accels.c:142 ++#: ../src/terminal-accels.c:144 + msgid "Paste" + msgstr "ألصق" + +-#: ../src/terminal-accels.c:143 ++#: ../src/terminal-accels.c:145 + msgid "Select All" + msgstr "اختر الكل" + +-#: ../src/terminal-accels.c:144 +-msgid "Preferences" +-msgstr "التفضيلات" +- +-#: ../src/terminal-accels.c:149 ++#: ../src/terminal-accels.c:151 + msgid "Find Next" + msgstr "ابحث عن التالي" + +-#: ../src/terminal-accels.c:150 ++#: ../src/terminal-accels.c:152 + msgid "Find Previous" + msgstr "ابحث عن السابق" + +-#: ../src/terminal-accels.c:151 ++#: ../src/terminal-accels.c:153 + msgid "Clear Highlight" + msgstr "امسح الإبراز" + +-#: ../src/terminal-accels.c:155 ++#: ../src/terminal-accels.c:157 + msgid "Hide and Show Menubar" + msgstr "أخف و أظهر شريط القوائم" + +-#: ../src/terminal-accels.c:156 ++#: ../src/terminal-accels.c:158 + msgid "Full Screen" + msgstr "ملء الشاشة" + +-#: ../src/terminal-accels.c:157 ++#: ../src/terminal-accels.c:159 + msgid "Zoom In" + msgstr "قرّب" + +-#: ../src/terminal-accels.c:158 ++#: ../src/terminal-accels.c:160 + msgid "Zoom Out" + msgstr "بعّد" + +-#: ../src/terminal-accels.c:159 ++#: ../src/terminal-accels.c:161 + msgid "Normal Size" + msgstr "الحجم العادي" + +-#: ../src/terminal-accels.c:163 ++#: ../src/terminal-accels.c:165 + msgid "Read-Only" + msgstr "للقراءة فقط" + +-#: ../src/terminal-accels.c:164 ++#: ../src/terminal-accels.c:166 + msgid "Reset" + msgstr "أعد الضبط" + +-#: ../src/terminal-accels.c:165 ++#: ../src/terminal-accels.c:167 + msgid "Reset and Clear" + msgstr "أعد الضبط وامسح" + +-#: ../src/terminal-accels.c:169 ++#: ../src/terminal-accels.c:171 + msgid "Switch to Previous Tab" + msgstr "انتقل للسان السابق" + +-#: ../src/terminal-accels.c:170 ++#: ../src/terminal-accels.c:172 + msgid "Switch to Next Tab" + msgstr "انتقل للسان التالي" + +-#: ../src/terminal-accels.c:171 ++#: ../src/terminal-accels.c:173 + msgid "Move Tab to the Left" + msgstr "انقل اللسان يسارا" + +-#: ../src/terminal-accels.c:172 ++#: ../src/terminal-accels.c:174 + msgid "Move Tab to the Right" + msgstr "انقل اللسان يمينا" + +-#: ../src/terminal-accels.c:173 ++#: ../src/terminal-accels.c:175 + msgid "Detach Tab" + msgstr "افصل اللسان" + +-#: ../src/terminal-accels.c:209 ++#: ../src/terminal-accels.c:211 + msgid "Switch to Last Tab" + msgstr "انتقل للسان الأخير" + +-#: ../src/terminal-accels.c:213 ++#: ../src/terminal-accels.c:215 + msgid "Contents" + msgstr "المحتويات" + +-#: ../src/terminal-accels.c:222 ../src/terminal-menubar.ui.in.h:2 ++#: ../src/terminal-accels.c:219 ++msgid "Show Primary Menu" ++msgstr "أظهر القائمة الرئيسية" ++ ++#: ../src/terminal-accels.c:228 ../src/terminal-menubar.ui.in.h:2 + msgid "File" + msgstr "ملف" + +-#: ../src/terminal-accels.c:223 ../src/terminal-menubar.ui.in.h:9 ++#: ../src/terminal-accels.c:229 ../src/terminal-menubar.ui.in.h:9 + msgid "Edit" + msgstr "تحرير" + +-#: ../src/terminal-accels.c:224 ../src/terminal-menubar.ui.in.h:17 ++#: ../src/terminal-accels.c:230 ../src/terminal-menubar.ui.in.h:17 + msgid "View" + msgstr "عرض" + +-#: ../src/terminal-accels.c:225 ../src/terminal-menubar.ui.in.h:24 ++#: ../src/terminal-accels.c:231 ../src/terminal-menubar.ui.in.h:24 + msgid "Search" + msgstr "ابحث" + +-#: ../src/terminal-accels.c:227 ../src/terminal-menubar.ui.in.h:41 ++#: ../src/terminal-accels.c:233 ../src/terminal-menubar.ui.in.h:41 + msgid "Tabs" + msgstr "ألسنة" + +-#: ../src/terminal-accels.c:228 ../src/terminal-menubar.ui.in.h:48 ++#: ../src/terminal-accels.c:234 ../src/terminal-menubar.ui.in.h:48 + msgid "Help" + msgstr "مساعدة" + +-#: ../src/terminal-accels.c:327 ++#: ../src/terminal-accels.c:235 ../src/terminal-prefs.c:671 ++msgid "Global" ++msgstr "شامل" ++ ++#: ../src/terminal-accels.c:362 + #, c-format + msgid "Switch to Tab %u" + msgstr "انتقل للسان %u" + +-#: ../src/terminal-accels.c:535 ++#: ../src/terminal-accels.c:552 + msgid "_Action" + msgstr "الإ_جراء" + +-#: ../src/terminal-accels.c:554 ++#: ../src/terminal-accels.c:571 + msgid "Shortcut _Key" + msgstr "مفتاح الا_ختصار" + +-#: ../src/terminal-app.c:434 ../src/terminal-window.c:1838 ++#: ../src/terminal-app.c:502 ++msgid "New Terminal" ++msgstr "طرفية جديدة" ++ ++#: ../src/terminal-app.c:512 ../src/terminal-window.c:1796 + msgid "New _Terminal" + msgstr "_طرفية جديدة" + +-#: ../src/terminal-app.c:436 ../src/terminal-window.c:1847 ++#: ../src/terminal-app.c:514 ../src/terminal-window.c:1805 + msgid "New _Tab" + msgstr "_لسان جديد" + +-#: ../src/terminal-app.c:437 ../src/terminal-window.c:1843 ++#: ../src/terminal-app.c:515 ../src/terminal-headermenu.ui.h:3 ++#: ../src/terminal-window.c:1801 + msgid "New _Window" + msgstr "_نافذة جديدة" + +-#: ../src/terminal-app.c:486 ++#: ../src/terminal-app.c:564 + msgid "Change _Profile" + msgstr "غيّر ال_تشكيلة" + +-#: ../src/terminal-appmenu.ui.h:1 ../src/terminal-screen.c:1386 +-#: ../src/terminal-window.c:1831 +-msgid "_Preferences" +-msgstr "ال_تفضيلات" +- +-#: ../src/terminal-appmenu.ui.h:2 ../src/terminal-menubar.ui.in.h:47 +-msgid "_Help" +-msgstr "_مساعدة" +- +-#: ../src/terminal-appmenu.ui.h:3 ../src/terminal-menubar.ui.in.h:50 +-msgid "_About" +-msgstr "_عن" +- +-#: ../src/terminal-appmenu.ui.h:4 +-msgid "_Quit" +-msgstr "أ_نهِ" ++#: ../src/terminal-app.c:577 ++msgid "_Profile" ++msgstr "ال_تشكيلة" + +-#: ../src/terminal.c:545 ++#: ../src/terminal.c:568 + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "تعذّر تحليل المعاملات: %s\n" +@@ -1536,6 +1531,68 @@ msgstr "ترميزات ص‌ي‌ك (CJK) العتيقة" + msgid "Obsolete Encodings" + msgstr "ترميزات لاغية" + ++#: ../src/terminal-headermenu.ui.h:1 ../src/terminal-menubar.ui.in.h:22 ++msgid "Zoom _Out" ++msgstr "ب_عّد" ++ ++#: ../src/terminal-headermenu.ui.h:2 ../src/terminal-menubar.ui.in.h:20 ++msgid "Zoom _In" ++msgstr "_قرّب" ++ ++#: ../src/terminal-headermenu.ui.h:4 ../src/terminal-menubar.ui.in.h:19 ++msgid "_Full Screen" ++msgstr "_ملء الشاشة" ++ ++#: ../src/terminal-headermenu.ui.h:5 ../src/terminal-menubar.ui.in.h:33 ++#: ../src/terminal-window.c:1777 ++msgid "Read-_Only" ++msgstr "قراءة فقط" ++ ++#: ../src/terminal-headermenu.ui.h:6 ++msgid "_Advanced" ++msgstr "_متقدم" ++ ++#: ../src/terminal-headermenu.ui.h:7 ../src/terminal-menubar.ui.in.h:34 ++msgid "_Reset" ++msgstr "أعد ال_ضبط" ++ ++#: ../src/terminal-headermenu.ui.h:8 ../src/terminal-menubar.ui.in.h:35 ++msgid "Reset and C_lear" ++msgstr "أعد الضبط و ا_مسح" ++ ++#: ../src/terminal-headermenu.ui.h:9 ../src/terminal-menubar.ui.in.h:36 ++msgid "_1. 80×24" ++msgstr "_1. 80×24" ++ ++#: ../src/terminal-headermenu.ui.h:10 ../src/terminal-menubar.ui.in.h:37 ++msgid "_2. 80×43" ++msgstr "_2. 80×43" ++ ++#: ../src/terminal-headermenu.ui.h:11 ../src/terminal-menubar.ui.in.h:38 ++msgid "_3. 132×24" ++msgstr "_3. 132×24" ++ ++#: ../src/terminal-headermenu.ui.h:12 ../src/terminal-menubar.ui.in.h:39 ++msgid "_4. 132×43" ++msgstr "_4. 132×43" ++ ++#: ../src/terminal-headermenu.ui.h:13 ../src/terminal-menubar.ui.in.h:51 ++msgid "_Inspector" ++msgstr "ال_فاحص" ++ ++#: ../src/terminal-headermenu.ui.h:14 ../src/terminal-screen.c:1354 ++#: ../src/terminal-window.c:1789 ++msgid "_Preferences" ++msgstr "ال_تفضيلات" ++ ++#: ../src/terminal-headermenu.ui.h:15 ../src/terminal-menubar.ui.in.h:47 ++msgid "_Help" ++msgstr "_مساعدة" ++ ++#: ../src/terminal-headermenu.ui.h:16 ../src/terminal-menubar.ui.in.h:50 ++msgid "_About" ++msgstr "_عن" ++ + #: ../src/terminal-menubar.ui.in.h:1 + msgid "_File" + msgstr "_ملف" +@@ -1564,19 +1621,19 @@ msgstr "أغ_لق النافذة" + msgid "_Edit" + msgstr "_تحرير" + +-#: ../src/terminal-menubar.ui.in.h:10 ../src/terminal-window.c:1809 ++#: ../src/terminal-menubar.ui.in.h:10 ../src/terminal-window.c:1767 + msgid "_Copy" + msgstr "ا_نسخ" + +-#: ../src/terminal-menubar.ui.in.h:11 ../src/terminal-window.c:1810 ++#: ../src/terminal-menubar.ui.in.h:11 ../src/terminal-window.c:1768 + msgid "Copy as _HTML" + msgstr "انسخ بن_سق HTML" + +-#: ../src/terminal-menubar.ui.in.h:12 ../src/terminal-window.c:1811 ++#: ../src/terminal-menubar.ui.in.h:12 ../src/terminal-window.c:1769 + msgid "_Paste" + msgstr "أل_صق" + +-#: ../src/terminal-menubar.ui.in.h:13 ../src/terminal-window.c:1813 ++#: ../src/terminal-menubar.ui.in.h:13 ../src/terminal-window.c:1771 + msgid "Paste as _Filenames" + msgstr "ألصق كأسماء مل_فات" + +@@ -1592,26 +1649,14 @@ msgstr "الت_فضيلات" + msgid "_View" + msgstr "_عرض" + +-#: ../src/terminal-menubar.ui.in.h:18 ../src/terminal-window.c:1859 ++#: ../src/terminal-menubar.ui.in.h:18 ../src/terminal-window.c:1817 + msgid "Show _Menubar" + msgstr "أظهر _شريط القوائم" + +-#: ../src/terminal-menubar.ui.in.h:19 +-msgid "_Full Screen" +-msgstr "_ملء الشاشة" +- +-#: ../src/terminal-menubar.ui.in.h:20 +-msgid "Zoom _In" +-msgstr "_قرّب" +- + #: ../src/terminal-menubar.ui.in.h:21 + msgid "_Normal Size" + msgstr "ال_حجم العادي" + +-#: ../src/terminal-menubar.ui.in.h:22 +-msgid "Zoom _Out" +-msgstr "ب_عّد" +- + #: ../src/terminal-menubar.ui.in.h:23 + msgid "_Search" + msgstr "_بحث" +@@ -1636,7 +1681,7 @@ msgstr "ا_مسح الإبراز" + msgid "_Terminal" + msgstr "_طرفية" + +-#: ../src/terminal-menubar.ui.in.h:31 ++#: ../src/terminal-menubar.ui.in.h:31 ../src/terminal-notebook-menu.ui.h:4 + msgid "Set _Title…" + msgstr "حدد ال_عنوان…" + +@@ -1644,34 +1689,6 @@ msgstr "حدد ال_عنوان…" + msgid "Set _Character Encoding" + msgstr "اضبط ترميز ال_محارف" + +-#: ../src/terminal-menubar.ui.in.h:33 ../src/terminal-window.c:1819 +-msgid "Read-_Only" +-msgstr "قراءة فقط" +- +-#: ../src/terminal-menubar.ui.in.h:34 +-msgid "_Reset" +-msgstr "أعد ال_ضبط" +- +-#: ../src/terminal-menubar.ui.in.h:35 +-msgid "Reset and C_lear" +-msgstr "أعد الضبط و ا_مسح" +- +-#: ../src/terminal-menubar.ui.in.h:36 +-msgid "_1. 80×24" +-msgstr "_1. 80×24" +- +-#: ../src/terminal-menubar.ui.in.h:37 +-msgid "_2. 80×43" +-msgstr "_2. 80×43" +- +-#: ../src/terminal-menubar.ui.in.h:38 +-msgid "_3. 132×24" +-msgstr "_3. 132×24" +- +-#: ../src/terminal-menubar.ui.in.h:39 +-msgid "_4. 132×43" +-msgstr "_4. 132×43" +- + #: ../src/terminal-menubar.ui.in.h:40 + msgid "Ta_bs" + msgstr "أ_لسنة" +@@ -1700,10 +1717,6 @@ msgstr "ا_فصل اللسان" + msgid "_Contents" + msgstr "الم_حتويات" + +-#: ../src/terminal-menubar.ui.in.h:51 +-msgid "_Inspector" +-msgstr "ال_فاحص" +- + #: ../src/terminal-nautilus.c:534 + msgid "Open in _Remote Terminal" + msgstr "افتح في طرفيّة ب_عيدة" +@@ -1744,11 +1757,11 @@ msgstr "انقل الطرفية _يسارا" + msgid "_Detach Terminal" + msgstr "ا_فصل الطرفية" + +-#: ../src/terminal-notebook-menu.ui.h:4 ../src/terminal-window.c:3352 ++#: ../src/terminal-notebook-menu.ui.h:5 ../src/terminal-window.c:3246 + msgid "C_lose Terminal" + msgstr "أغلق ال_طرفية" + +-#: ../src/terminal-options.c:284 ++#: ../src/terminal-options.c:281 + #, c-format + msgid "" + "Option “%s” is deprecated and might be removed in a later version of gnome-" +@@ -1756,69 +1769,69 @@ msgid "" + msgstr "الخيار ”%s“ ملغى و قد يُزال في المستقبل." + + #. %s is being replaced with "-- " (without quotes), which must be used literally, not translatable +-#: ../src/terminal-options.c:295 ++#: ../src/terminal-options.c:292 + #, c-format + msgid "" + "Use “%s” to terminate the options and put the command line to execute after " + "it." + msgstr "" + +-#: ../src/terminal-options.c:305 ../src/terminal-options.c:318 ++#: ../src/terminal-options.c:302 ../src/terminal-options.c:315 + #, c-format + msgid "Option “%s” is no longer supported in this version of gnome-terminal." + msgstr "الخيار ”%s“ لم يعد مدعوما في هذه الإصدارة." + +-#: ../src/terminal-options.c:390 ++#: ../src/terminal-options.c:387 + #, c-format + msgid "Argument to “%s” is not a valid command: %s" + msgstr "المعامل ”%s“ ليس أمرا سليما: %s" + +-#: ../src/terminal-options.c:563 ++#: ../src/terminal-options.c:560 + msgid "Two roles given for one window" + msgstr "دوران لنافذة واحدة" + +-#: ../src/terminal-options.c:584 ../src/terminal-options.c:617 ++#: ../src/terminal-options.c:581 ../src/terminal-options.c:614 + #, c-format + msgid "“%s” option given twice for the same window\n" + msgstr "خيار ”%s“ معطً مرتين لنفس النافذة\n" + +-#: ../src/terminal-options.c:836 ++#: ../src/terminal-options.c:833 + #, c-format + msgid "Cannot pass FD %d twice" + msgstr "" + +-#: ../src/terminal-options.c:898 ++#: ../src/terminal-options.c:895 + #, c-format + msgid "“%s” is not a valid zoom factor" + msgstr "“%s” ليس عامل تقريب سليم" + +-#: ../src/terminal-options.c:905 ++#: ../src/terminal-options.c:902 + #, c-format + msgid "Zoom factor “%g” is too small, using %g\n" + msgstr "عامل التقريب ”%g“ منخفض جدا، سأستعمل %g\n" + +-#: ../src/terminal-options.c:913 ++#: ../src/terminal-options.c:910 + #, c-format + msgid "Zoom factor “%g” is too large, using %g\n" + msgstr "عامل التقريب ”%g“ مرتفع جدا، سأستعمل %g\n" + +-#: ../src/terminal-options.c:951 ++#: ../src/terminal-options.c:948 + #, c-format + msgid "" + "Option “%s” requires specifying the command to run on the rest of the " + "command line" + msgstr "الخيار ”%s“ يتطلب تحديد الأمر للتنفيذ عند باقي سطر الأوامر" + +-#: ../src/terminal-options.c:1100 ++#: ../src/terminal-options.c:1101 + #, fuzzy + msgid "Can only use --wait once" + msgstr "لا يمكن استخدام الخيار %s أكثر من مرة" + +-#: ../src/terminal-options.c:1135 ++#: ../src/terminal-options.c:1137 + msgid "Not a valid terminal config file." + msgstr "ليس ملف إعدادات طرفية سليم." + +-#: ../src/terminal-options.c:1148 ++#: ../src/terminal-options.c:1150 + msgid "Incompatible terminal config file version." + msgstr "إصدارة ملف إعدادات الطرفية غير متوافقة." + +@@ -2059,49 +2072,45 @@ msgstr "احذف التشكيلة" + msgid "Delete" + msgstr "احذف" + +-#: ../src/terminal-prefs.c:518 ++#: ../src/terminal-prefs.c:519 + msgid "This is the default profile" + msgstr "هذه هي التشكيلة المبدئية" + +-#: ../src/terminal-prefs.c:542 ++#: ../src/terminal-prefs.c:543 + msgid "General" + msgstr "عام" + +-#: ../src/terminal-prefs.c:547 ++#: ../src/terminal-prefs.c:548 + msgid "Shortcuts" + msgstr "الاختصارات" + +-#: ../src/terminal-prefs.c:671 +-msgid "Global" +-msgstr "شامل" +- + #: ../src/terminal-prefs.c:683 + msgid "Profiles" + msgstr "التشكيلات" + +-#: ../src/terminal-screen.c:1172 ++#: ../src/terminal-screen.c:1140 + msgid "No command supplied nor shell requested" + msgstr "" + +-#: ../src/terminal-screen.c:1387 ../src/terminal-screen.c:1717 ++#: ../src/terminal-screen.c:1355 ../src/terminal-screen.c:1681 + msgid "_Relaunch" + msgstr "أ_عد التشغيل" + +-#: ../src/terminal-screen.c:1390 ++#: ../src/terminal-screen.c:1358 + msgid "There was an error creating the child process for this terminal" + msgstr "حدث خطأ عند إنشاء العملية الفرعية لهذه الطرفيّة" + +-#: ../src/terminal-screen.c:1721 ++#: ../src/terminal-screen.c:1685 + #, c-format + msgid "The child process exited normally with status %d." + msgstr "انتهت العملية الابنة بشكل طبيعية بالحالة %d." + +-#: ../src/terminal-screen.c:1724 ++#: ../src/terminal-screen.c:1688 + #, c-format + msgid "The child process was aborted by signal %d." + msgstr "انتهت العملية الابنة بالإشارة %d." + +-#: ../src/terminal-screen.c:1727 ++#: ../src/terminal-screen.c:1691 + msgid "The child process was aborted." + msgstr "انتهت العملية الابنة." + +@@ -2178,86 +2187,98 @@ msgstr "" + msgid "“file” scheme with remote hostname not supported" + msgstr "" + +-#: ../src/terminal-window.c:458 ++#: ../src/terminal-window.c:457 + msgid "Could not save contents" + msgstr "تعذّر حفظ المحتويات." + +-#: ../src/terminal-window.c:478 ++#: ../src/terminal-window.c:477 + msgid "Save as…" + msgstr "احفظ باسم…" + +-#: ../src/terminal-window.c:481 ++#: ../src/terminal-window.c:480 + msgid "_Cancel" + msgstr "أ_لغِ" + +-#: ../src/terminal-window.c:482 ++#: ../src/terminal-window.c:481 + msgid "_Save" + msgstr "ا_حفظ" + +-#: ../src/terminal-window.c:1766 ++#: ../src/terminal-window.c:1724 + msgid "Open _Hyperlink" + msgstr "ا_فتح الرابط" + +-#: ../src/terminal-window.c:1767 ++#: ../src/terminal-window.c:1725 + msgid "Copy Hyperlink _Address" + msgstr "ا_نسخ عنوان الرابط" + +-#: ../src/terminal-window.c:1777 ++#: ../src/terminal-window.c:1735 + msgid "Send Mail _To…" + msgstr "أر_سل بريدًا إلى…" + +-#: ../src/terminal-window.c:1778 ++#: ../src/terminal-window.c:1736 + msgid "Copy Mail _Address" + msgstr "ا_نسخ عنوان البريد" + +-#: ../src/terminal-window.c:1781 ++#: ../src/terminal-window.c:1739 + msgid "Call _To…" + msgstr "ا_تّصل ب…" + +-#: ../src/terminal-window.c:1782 ++#: ../src/terminal-window.c:1740 + msgid "Copy Call _Address " + msgstr "ا_نسخ عنوان الاتصال" + +-#: ../src/terminal-window.c:1787 ++#: ../src/terminal-window.c:1745 + msgid "_Open Link" + msgstr "ا_فتح الرابط" + +-#: ../src/terminal-window.c:1788 ++#: ../src/terminal-window.c:1746 + msgid "Copy _Link" + msgstr "انسخ الراب_ط" + +-#: ../src/terminal-window.c:1826 ++#: ../src/terminal-window.c:1784 + msgid "P_rofiles" + msgstr "ال_تشكيلات" + +-#: ../src/terminal-window.c:1861 ++#: ../src/terminal-window.c:1819 + msgid "L_eave Full Screen" + msgstr "_غادر ملء الشاشة" + +-#: ../src/terminal-window.c:3339 ++#: ../src/terminal-window.c:3233 + msgid "Close this window?" + msgstr "أأغلق هذه النافذة؟" + +-#: ../src/terminal-window.c:3339 ++#: ../src/terminal-window.c:3233 + msgid "Close this terminal?" + msgstr "أأغلق هذه الطرفيّة؟" + +-#: ../src/terminal-window.c:3343 ++#: ../src/terminal-window.c:3237 + msgid "" + "There are still processes running in some terminals in this window. Closing " + "the window will kill all of them." + msgstr "ما تزال بعض العمليات عاملة في هذه النافذة. غلق النافذة سيقتلها جميعا." + +-#: ../src/terminal-window.c:3347 ++#: ../src/terminal-window.c:3241 + msgid "" + "There is still a process running in this terminal. Closing the terminal will " + "kill it." + msgstr "ما تزال بعض العمليات عاملة في هذه الطرفية. غلق الطرفية سيقتلها جميعا." + +-#: ../src/terminal-window.c:3352 ++#: ../src/terminal-window.c:3246 + msgid "C_lose Window" + msgstr "أغ_لق النافذة" + ++#~ msgid "Whether to show menubar in new windows/tabs" ++#~ msgstr "فيما إذا سيعرض شريط القوائم في النوافذ/الألسنة الجديدة" ++ ++#, fuzzy ++#~ msgid "True if the menubar should be shown in new window" ++#~ msgstr "" ++#~ "يضبط لـ True إذا وجب عرض شريط القوائم في النوافذ الجديدة، أو نوافذ/ألسنة " ++#~ "بهذه الطور." ++ ++#~ msgid "_Quit" ++#~ msgstr "أ_نهِ" ++ + #~ msgid "Verbose output" + #~ msgstr "مخرج مطول" + +-- +2.20.1 + + +From f8f7d3be9047d9ba9a56f15d9ae36cbd71b0e0be Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Tue, 26 Mar 2019 11:36:35 +0100 +Subject: [PATCH 2/8] window: Fix tabs menu + +https://gitlab.gnome.org/GNOME/gnome-terminal/issues/93 +(cherry picked from commit 58b9488a46ab4265a4b3e00e26c577bcdeccb84f) +--- + src/terminal-menu-button.c | 48 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 44 insertions(+), 4 deletions(-) + +diff --git a/src/terminal-menu-button.c b/src/terminal-menu-button.c +index fdaaffaa02d2..fbe30f27a703 100644 +--- a/src/terminal-menu-button.c ++++ b/src/terminal-menu-button.c +@@ -33,6 +33,9 @@ enum + + static guint signals[LAST_SIGNAL]; + ++static void popup_menu_selection_done_cb (GtkMenu *menu, ++ GtkMenuButton *button); ++ + /* The menu button sets itself insensitive when it has no menu. + * Work around this by using an empty menu. + */ +@@ -43,6 +46,24 @@ set_empty_menu (GtkMenuButton *button) + gtk_menu_button_set_menu_model (button, G_MENU_MODEL (menu)); + } + ++static void ++disconnect_popup_menu (GtkMenuButton *button) ++{ ++ GtkMenu *popup_menu = gtk_menu_button_get_popup (button); ++ ++ if (popup_menu) ++ g_signal_handlers_disconnect_by_func ++ (popup_menu, G_CALLBACK (popup_menu_selection_done_cb), button); ++} ++ ++static void ++popup_menu_selection_done_cb (GtkMenu *menu, ++ GtkMenuButton *button) ++{ ++ disconnect_popup_menu (button); ++ set_empty_menu (button); ++} ++ + /* Class implementation */ + + G_DEFINE_TYPE (TerminalMenuButton, terminal_menu_button, GTK_TYPE_MENU_BUTTON); +@@ -69,17 +90,36 @@ terminal_menu_button_toggled (GtkToggleButton *button) + g_signal_emit (button, signals[UPDATE_MENU], 0); + + GTK_TOGGLE_BUTTON_CLASS (terminal_menu_button_parent_class)->toggled (button); ++} + +- /* On deactivate, clear the menu */ +- if (!active) +- set_empty_menu (GTK_MENU_BUTTON (button)); ++static void ++terminal_menu_button_update_menu (TerminalMenuButton *button) ++{ ++ GtkMenuButton *gtk_button = GTK_MENU_BUTTON (button); ++ GtkMenu *popup_menu = gtk_menu_button_get_popup (gtk_button); ++ ++ if (popup_menu) ++ g_signal_connect (popup_menu, "selection-done", ++ G_CALLBACK (popup_menu_selection_done_cb), button); ++} ++ ++static void ++terminal_menu_button_dispose (GObject *object) ++{ ++ disconnect_popup_menu (GTK_MENU_BUTTON (object)); ++ ++ G_OBJECT_CLASS (terminal_menu_button_parent_class)->dispose (object); + } + + static void + terminal_menu_button_class_init (TerminalMenuButtonClass *klass) + { +- GtkToggleButtonClass *toggle_button_class = GTK_TOGGLE_BUTTON_CLASS (klass); ++ klass->update_menu = terminal_menu_button_update_menu; + ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ object_class->dispose = terminal_menu_button_dispose; ++ ++ GtkToggleButtonClass *toggle_button_class = GTK_TOGGLE_BUTTON_CLASS (klass); + toggle_button_class->toggled = terminal_menu_button_toggled; + + signals[UPDATE_MENU] = +-- +2.20.1 + + +From def50721b0b18c2276cd7da26e09ef45d03d2c14 Mon Sep 17 00:00:00 2001 +From: Egmont Koblinger +Date: Tue, 26 Mar 2019 11:46:40 +0100 +Subject: [PATCH 3/8] window: Show last tab's accel in the tab menu + +https://gitlab.gnome.org/GNOME/gnome-terminal/issues/94 +(cherry picked from commit a8ab25c16fe9cfdc96e6da411dba43e524255a8b) +--- + src/terminal-window.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 1d877a98275b..19198f49f7b5 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -1880,6 +1880,16 @@ notebook_update_tabs_menu_cb (GtkMenuButton *button, + gs_unref_object GMenuItem *item; + const char *title; + ++ if (t->next == NULL) { ++ /* Last entry. If it has no dedicated shortcut "Switch to Tab N", ++ * display the accel of "Switch to Last Tab". */ ++ GtkApplication *app = GTK_APPLICATION (g_application_get_default ()); ++ gs_free gchar *detailed_action = g_strdup_printf("win.active-tab(%d)", i); ++ gs_strfreev gchar **accels = gtk_application_get_accels_for_action (app, detailed_action); ++ if (accels[0] == NULL) ++ i = -1; ++ } ++ + title = terminal_screen_get_title (screen); + + item = g_menu_item_new (title && title[0] ? title : _("Terminal"), NULL); +-- +2.20.1 + + +From cfa61cdeb0e26d4fd6bf8c6f527d5b8569d39700 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Goran=20Vidovi=C4=87?= +Date: Tue, 26 Mar 2019 17:12:53 +0000 +Subject: [PATCH 4/8] Update Croatian translation + +--- + po/hr.po | 631 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 320 insertions(+), 311 deletions(-) + +diff --git a/po/hr.po b/po/hr.po +index aec2eaa8bac1..9722611b3bca 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -4,10 +4,9 @@ + msgid "" + msgstr "" + "Project-Id-Version: gnome-terminal 0\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +-"terminal&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2018-03-05 12:38+0000\n" +-"PO-Revision-Date: 2018-03-07 15:06+0100\n" ++"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n" ++"POT-Creation-Date: 2019-03-04 16:12+0000\n" ++"PO-Revision-Date: 2019-03-26 18:12+0100\n" + "Last-Translator: gogo \n" + "Language-Team: Croatian \n" + "Language: hr\n" +@@ -17,17 +16,18 @@ msgstr "" + "X-Launchpad-Export-Date: 2016-09-15 11:20+0000\n" + "X-Generator: Poedit 2.0.6\n" + ++#. VERSION=@VERSION@ + #: ../org.gnome.Terminal.appdata.xml.in.h:1 +-#: ../org.gnome.Terminal.desktop.in.in.h:1 ../src/server.c:147 +-#: ../src/terminal-accels.c:226 ../src/terminal.c:549 ++#: ../org.gnome.Terminal.desktop.in.in.h:2 ../src/server.c:147 ++#: ../src/terminal-accels.c:232 ../src/terminal.c:572 + #: ../src/terminal-menubar.ui.in.h:30 ../src/terminal-tab-label.c:81 +-#: ../src/terminal-window.c:1928 ../src/terminal-window.c:2188 +-#: ../src/terminal-window.c:2478 ++#: ../src/terminal-window.c:1885 ../src/terminal-window.c:2156 ++#: ../src/terminal-window.c:2446 + msgid "Terminal" + msgstr "Terminal" + + #: ../org.gnome.Terminal.appdata.xml.in.h:2 +-#: ../org.gnome.Terminal.desktop.in.in.h:2 ++#: ../org.gnome.Terminal.desktop.in.in.h:3 + msgid "Use the command line" + msgstr "Koristite naredbeni redak" + +@@ -64,18 +64,17 @@ msgstr "" + "Otvori terminal je priključak za Datoteke aplikaciju koji dodaje stavku u " + "sadržajni izbornik za otvaranje terminala u trenutno pregledanom direktoriju." + +-#: ../org.gnome.Terminal.desktop.in.in.h:3 ++#: ../org.gnome.Terminal.desktop.in.in.h:4 + msgid "shell;prompt;command;commandline;cmd;" + msgstr "ljuska;prompt;naredba;naredbeni redak;cmd;" + +-#. Cursor blink mode +-#: ../src/migration.c:403 ../src/preferences.ui.h:19 +-msgid "Default" +-msgstr "Zadano" ++#: ../org.gnome.Terminal.desktop.in.in.h:5 ../src/terminal-accels.c:127 ++msgid "New Window" ++msgstr "Novi prozor" + +-#: ../src/migration.c:403 +-msgid "Unnamed" +-msgstr "Neimenovano" ++#: ../org.gnome.Terminal.desktop.in.in.h:6 ../src/terminal-accels.c:146 ++msgid "Preferences" ++msgstr "Osobitosti" + + #. Translators: Keep single quote please! + #: ../src/org.gnome.Terminal.gschema.xml.h:2 +@@ -265,19 +264,10 @@ msgstr "" + "kada se radi mudar odabir riječi" + + #: ../src/org.gnome.Terminal.gschema.xml.h:33 +-msgid "Whether to show menubar in new windows/tabs" +-msgstr "Treba li prikazivati traku izbornika u novim prozorima/karticama" +- +-#: ../src/org.gnome.Terminal.gschema.xml.h:34 +-msgid "True if the menubar should be shown in new window" +-msgstr "" +-"Ako je odabrano, traka izbornika trebala bi biti prikazana u novom prozoru" +- +-#: ../src/org.gnome.Terminal.gschema.xml.h:35 + msgid "Default number of columns" + msgstr "Zadani broj stupaca" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:36 ++#: ../src/org.gnome.Terminal.gschema.xml.h:34 + msgid "" + "Number of columns in newly created terminal windows. Has no effect if " + "use_custom_default_size is not enabled." +@@ -285,11 +275,11 @@ msgstr "" + "Broj stupaca u novostvorenim prozorima terminala. Nema učinka ako " + "use_custom_default_size nije omogućeno." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:37 ++#: ../src/org.gnome.Terminal.gschema.xml.h:35 + msgid "Default number of rows" + msgstr "Zadani broj redaka" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:38 ++#: ../src/org.gnome.Terminal.gschema.xml.h:36 + msgid "" + "Number of rows in newly created terminal windows. Has no effect if " + "use_custom_default_size is not enabled." +@@ -297,15 +287,15 @@ msgstr "" + "Broj redaka u novostvorenim prozorima terminala. Nema učinka ako " + "use_custom_default_size nije omogućeno." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:39 ++#: ../src/org.gnome.Terminal.gschema.xml.h:37 + msgid "When to show the scrollbar" + msgstr "Kada prikazati traku klizanja" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:40 ++#: ../src/org.gnome.Terminal.gschema.xml.h:38 + msgid "Number of lines to keep in scrollback" + msgstr "Broj redaka za koji se pomiče traka klizanja" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:41 ++#: ../src/org.gnome.Terminal.gschema.xml.h:39 + msgid "" + "Number of scrollback lines to keep around. You can scroll back in the " + "terminal by this number of lines; lines that don’t fit in the scrollback are " +@@ -316,11 +306,11 @@ msgstr "" + "postavljenog ograničenja su odbačeni. Ako je mogućnost scrollback_unlimited " + "postavljena na true, ova vrijednost se zanemaruje." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:42 ++#: ../src/org.gnome.Terminal.gschema.xml.h:40 + msgid "Whether an unlimited number of lines should be kept in scrollback" + msgstr "Treba li se u klizanju unatrag sačuvati neograničen broj redaka" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:43 ++#: ../src/org.gnome.Terminal.gschema.xml.h:41 + msgid "" + "If true, scrollback lines will never be discarded. The scrollback history is " + "stored on disk temporarily, so this may cause the system to run out of disk " +@@ -331,30 +321,30 @@ msgstr "" + "prouzročiti nestajanje slobodnog prostora na disku ukoliko je mnogo redaka u " + "terminalu." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:44 ++#: ../src/org.gnome.Terminal.gschema.xml.h:42 + msgid "Whether to scroll to the bottom when a key is pressed" + msgstr "Treba li pomicati do dna kada je tipka pritisnuta" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:45 ++#: ../src/org.gnome.Terminal.gschema.xml.h:43 + msgid "If true, pressing a key jumps the scrollbar to the bottom." + msgstr "Ako je odabrano, pritisak na tipku postavlja klizač na dno." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:46 ++#: ../src/org.gnome.Terminal.gschema.xml.h:44 + msgid "Whether to scroll to the bottom when there’s new output" + msgstr "Treba li pomicati do dna kada postoji izlaz iz aplikacije" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:47 ++#: ../src/org.gnome.Terminal.gschema.xml.h:45 + msgid "" + "If true, whenever there’s new output the terminal will scroll to the bottom." + msgstr "" + "Ako je postavljeno, svaki puta kad postoji izlaz terminal će otklizati " + "klizač na dno." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:48 ++#: ../src/org.gnome.Terminal.gschema.xml.h:46 + msgid "What to do with the terminal when the child command exits" + msgstr "Što treba napraviti s terminalom kada podređena naredba izlazi" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:49 ++#: ../src/org.gnome.Terminal.gschema.xml.h:47 + msgid "" + "Possible values are “close” to close the terminal, “restart” to restart the " + "command, and “hold” to keep the terminal open with no command running inside." +@@ -363,11 +353,11 @@ msgstr "" + "ponavljanje naredbe i \"hold\" za držanje terminala bez unutar pokrenutih " + "naredbi." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:50 ++#: ../src/org.gnome.Terminal.gschema.xml.h:48 + msgid "Whether to launch the command in the terminal as a login shell" + msgstr "Treba li pokrenuti naredbu u terminalu kao ljusku za prijavu" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:51 ++#: ../src/org.gnome.Terminal.gschema.xml.h:49 + msgid "" + "If true, the command inside the terminal will be launched as a login shell " + "(argv[0] will have a hyphen in front of it)." +@@ -375,11 +365,11 @@ msgstr "" + "Ako je odabrano, naredba unutar terminala će biti pokrenuta kao ljuska " + "prijave (argv[0] će imati crticu ispred)." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:52 ++#: ../src/org.gnome.Terminal.gschema.xml.h:50 + msgid "Whether to run a custom command instead of the shell" + msgstr "Treba li pokrenuti prilalagođenu naredbu umjesto ljuske" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:53 ++#: ../src/org.gnome.Terminal.gschema.xml.h:51 + msgid "" + "If true, the value of the custom_command setting will be used in place of " + "running a shell." +@@ -387,11 +377,11 @@ msgstr "" + "Ako je odabrano, vrijednost zadane naredbe biti će korištena umjesto ljuske " + "koja radi." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:54 ++#: ../src/org.gnome.Terminal.gschema.xml.h:52 + msgid "Whether to blink the cursor" + msgstr "Treba li pokazivač žmirkati" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:55 ++#: ../src/org.gnome.Terminal.gschema.xml.h:53 + msgid "" + "The possible values are “system” to use the global cursor blinking settings, " + "or “on” or “off” to set the mode explicitly." +@@ -399,11 +389,11 @@ msgstr "" + "Moguće vrijednosti su \"system\" za korištenje globalnih postavki treptanja " + "pokazivača, ili \"on\" ili \"off\" za izričito postavljanje." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:56 ++#: ../src/org.gnome.Terminal.gschema.xml.h:54 + msgid "The cursor appearance" + msgstr "Izgled pokazivača" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:57 ++#: ../src/org.gnome.Terminal.gschema.xml.h:55 + msgid "" + "Possible values are “always” or “never” allow blinking text, or only when " + "the terminal is “focused” or “unfocused”." +@@ -411,49 +401,49 @@ msgstr "" + "Moguće vrijednosti su \"uvijek\" ili \"nikada\" za treptanje teksta, ili " + "samo kada je terminal \"pri fokusu\" ili \"nije fokusiran\"." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:58 ++#: ../src/org.gnome.Terminal.gschema.xml.h:56 + msgid "Custom command to use instead of the shell" + msgstr "Prilagođena naredba za korištenje umjesto ljuske" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:59 ++#: ../src/org.gnome.Terminal.gschema.xml.h:57 + msgid "Run this command in place of the shell, if use_custom_command is true." + msgstr "" + "Pokretanje naredbe umjesto ljuske, ako je use_custom_command postavljeno." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:60 ++#: ../src/org.gnome.Terminal.gschema.xml.h:58 + msgid "Palette for terminal applications" + msgstr "Paleta za aplikacije terminala" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:61 ++#: ../src/org.gnome.Terminal.gschema.xml.h:59 + msgid "A Pango font name and size" + msgstr "Veličina i naziv Pango slova" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:62 ++#: ../src/org.gnome.Terminal.gschema.xml.h:60 + msgid "The code sequence the Backspace key generates" + msgstr "Slijed kôda koji generira Backspace tipka" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:63 ++#: ../src/org.gnome.Terminal.gschema.xml.h:61 + msgid "The code sequence the Delete key generates" + msgstr "Slijed kôda koji generira Delete tipka" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:64 ++#: ../src/org.gnome.Terminal.gschema.xml.h:62 + msgid "Whether to use the colors from the theme for the terminal widget" + msgstr "Treba li koristiti boje iz teme za elemente terminala" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:65 ++#: ../src/org.gnome.Terminal.gschema.xml.h:63 + msgid "Whether to use the system monospace font" + msgstr "Treba li koristiti monospace slova sustava" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:66 ++#: ../src/org.gnome.Terminal.gschema.xml.h:64 + msgid "Whether to rewrap the terminal contents on window resize" + msgstr "" + "Treba li ponvono prelomiti sadržaj terminala pri promjeni veličine prozora" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:67 ++#: ../src/org.gnome.Terminal.gschema.xml.h:65 + msgid "Which encoding to use" + msgstr "Koje kôdiranje koristiti" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:68 ++#: ../src/org.gnome.Terminal.gschema.xml.h:66 + msgid "" + "Whether ambiguous-width characters are narrow or wide when using UTF-8 " + "encoding" +@@ -461,19 +451,19 @@ msgstr "" + "Trebaju li neodređeno široki znakovi biti uski ili široki kada se koristi " + "UTF-8 kôdiranje" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:69 ++#: ../src/org.gnome.Terminal.gschema.xml.h:67 + msgid "Keyboard shortcut to open a new tab" + msgstr "Prečac tipkovnice za otvaranje nove kartice" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:70 ++#: ../src/org.gnome.Terminal.gschema.xml.h:68 + msgid "Keyboard shortcut to open a new window" + msgstr "Prečac tipkovnice za otvaranje novog prozora" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:71 ++#: ../src/org.gnome.Terminal.gschema.xml.h:69 + msgid "Keyboard shortcut to save the current tab contents to file" + msgstr "Prečac tipkovnice za spremanje sadržaja trenutne kartice u datoteku" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:72 ++#: ../src/org.gnome.Terminal.gschema.xml.h:70 + msgid "" + "Keyboard shortcut to export the current tab contents to file in various " + "formats" +@@ -481,125 +471,129 @@ msgstr "" + "Prečac tipkovnice za izvoz sadržaja trenutne kartice u datoteku raznih " + "formata" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:73 ++#: ../src/org.gnome.Terminal.gschema.xml.h:71 + msgid "Keyboard shortcut to print the current tab contents to printer or file" + msgstr "" + "Prečac tipkovnice za ispis sadržaja trenutne kartice u pisaču ili datototeci" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:74 ++#: ../src/org.gnome.Terminal.gschema.xml.h:72 + msgid "Keyboard shortcut to close a tab" + msgstr "Prečac tipkovnice za zatvaranje kartice" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:75 ++#: ../src/org.gnome.Terminal.gschema.xml.h:73 + msgid "Keyboard shortcut to close a window" + msgstr "Prečac tipkovnice za zatvaranje prozora" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:76 ++#: ../src/org.gnome.Terminal.gschema.xml.h:74 + msgid "Keyboard shortcut to copy text" + msgstr "Prečac tipkovnice za kopiranje teksta" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:77 ++#: ../src/org.gnome.Terminal.gschema.xml.h:75 + msgid "Keyboard shortcut to copy text as HTML" + msgstr "Prečac tipkovnice za kopiranje teksta kao HTML-a" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:78 ++#: ../src/org.gnome.Terminal.gschema.xml.h:76 + msgid "Keyboard shortcut to paste text" + msgstr "Prečac tipkovnice za umetanje teksta" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:79 ++#: ../src/org.gnome.Terminal.gschema.xml.h:77 + msgid "Keyboard shortcut to select all text" + msgstr "Prečac tipkovnice za odabir svega teksta" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:80 ++#: ../src/org.gnome.Terminal.gschema.xml.h:78 + msgid "Keyboard shortcut to open the Preferences dialog" + msgstr "Prečac tipkovnice za otvaranje dijaloga osobitosti" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:81 ++#: ../src/org.gnome.Terminal.gschema.xml.h:79 + msgid "Keyboard shortcut to toggle full screen mode" + msgstr "Prečac tipkovnice za aktivaciju cjelozaslonskog prikaza" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:82 ++#: ../src/org.gnome.Terminal.gschema.xml.h:80 + msgid "Keyboard shortcut to toggle the visibility of the menubar" + msgstr "" + "Prečac tipkovnice za uključivanje/isključivanje vidljivosti trake izbornika" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:83 ++#: ../src/org.gnome.Terminal.gschema.xml.h:81 + msgid "Keyboard shortcut to toggle the read-only state" + msgstr "Prečac tipkovnice za uključivanje/isključivanje samo-za-čitanje stanja" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:84 ++#: ../src/org.gnome.Terminal.gschema.xml.h:82 + msgid "Keyboard shortcut to reset the terminal" + msgstr "Prečac tipkovnice za vraćanje izvornih postavka terminala" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:85 ++#: ../src/org.gnome.Terminal.gschema.xml.h:83 + msgid "Keyboard shortcut to reset and clear the terminal" + msgstr "Prečac tipkovnice za vraćanje izvornih postavki i brisanje terminala" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:86 ++#: ../src/org.gnome.Terminal.gschema.xml.h:84 + msgid "Keyboard shortcut to open the search dialog" + msgstr "Prečac tipkovnice za otvaranje dijaloga pretrage" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:87 ++#: ../src/org.gnome.Terminal.gschema.xml.h:85 + msgid "Keyboard shortcut to find the next occurrence of the search term" + msgstr "Prečac tipkovnice za pronalazak sljedećeg podudaranja izraza pretrage" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:88 ++#: ../src/org.gnome.Terminal.gschema.xml.h:86 + msgid "Keyboard shortcut to find the previous occurrence of the search term" + msgstr "Prečac tipkovnice za pronalazak prijašnjeg podudaranja izraza pretrage" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:89 ++#: ../src/org.gnome.Terminal.gschema.xml.h:87 + msgid "Keyboard shortcut to clear the find highlighting" + msgstr "Prečac tipkovnice za brisanje pretrage" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:90 ++#: ../src/org.gnome.Terminal.gschema.xml.h:88 + msgid "Keyboard shortcut to switch to the previous tab" + msgstr "Prečac tipkovnice za prebacivanje na prijašnju karticu" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:91 ++#: ../src/org.gnome.Terminal.gschema.xml.h:89 + msgid "Keyboard shortcut to switch to the next tab" + msgstr "Prečac tipkovnice za prebacivanje na sljedeću karticu" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:92 ++#: ../src/org.gnome.Terminal.gschema.xml.h:90 + msgid "Keyboard shortcut to move the current tab to the left" + msgstr "Prečac tipkovnice za prebacivanje trenutne kartice ulijevo" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:93 ++#: ../src/org.gnome.Terminal.gschema.xml.h:91 + msgid "Keyboard shortcut to move the current tab to the right" + msgstr "Prečac tipkovnice za prebacivanje trenutne kartice udesno" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:94 ++#: ../src/org.gnome.Terminal.gschema.xml.h:92 + msgid "Keyboard shortcut to detach current tab" + msgstr "Prečac tipkovnice za odvajanje trenutne kartice" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:95 ++#: ../src/org.gnome.Terminal.gschema.xml.h:93 + msgid "Keyboard shortcut to switch to the numbered tab" + msgstr "Prečac tipkovnice za prebacivanje na karticu s brojevima" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:96 ++#: ../src/org.gnome.Terminal.gschema.xml.h:94 + msgid "Keyboard shortcut to switch to the last tab" + msgstr "Prečac tipkovnice za prebacivanje na posljednju karticu" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:97 ++#: ../src/org.gnome.Terminal.gschema.xml.h:95 + msgid "Keyboard shortcut to launch help" + msgstr "Prečac tipkovnice za pokretanje pomoći" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:98 ++#: ../src/org.gnome.Terminal.gschema.xml.h:96 + msgid "Keyboard shortcut to make font larger" + msgstr "Prečac tipkovnice za povećanje slova" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:99 ++#: ../src/org.gnome.Terminal.gschema.xml.h:97 + msgid "Keyboard shortcut to make font smaller" + msgstr "Prečac tipkovnice za smanjenje slova" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:100 ++#: ../src/org.gnome.Terminal.gschema.xml.h:98 + msgid "Keyboard shortcut to make font normal-size" + msgstr "Prečac tipkovnice za vraćanje slova na uobičajenu veličinu" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:101 ++#: ../src/org.gnome.Terminal.gschema.xml.h:99 ++msgid "Keyboard shortcut to show the primary menu" ++msgstr "Prečac tipkovnice za prikaz glavnog izbornika" ++ ++#: ../src/org.gnome.Terminal.gschema.xml.h:100 + msgid "Whether the menubar has access keys" + msgstr "Treba li traka izbornika imati pristupne tipke" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:102 ++#: ../src/org.gnome.Terminal.gschema.xml.h:101 + msgid "" + "Whether to have Alt+letter access keys for the menubar. They may interfere " + "with some applications run inside the terminal so it’s possible to turn them " +@@ -608,11 +602,11 @@ msgstr "" + "Treba li traka izbornika imati prečac Atl+slovo. Mogle bi dolaziti u sukob s " + "aplikacijama koje su pokrenute u terminalu, pa ih je moguće isključiti." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:103 ++#: ../src/org.gnome.Terminal.gschema.xml.h:102 + msgid "Whether shortcuts are enabled" + msgstr "Treba li omogućiti prečace" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:104 ++#: ../src/org.gnome.Terminal.gschema.xml.h:103 + msgid "" + "Whether shortcuts are enabled. They may interfere with some applications run " + "inside the terminal so it’s possible to turn them off." +@@ -620,11 +614,11 @@ msgstr "" + "Treba li omogućiti prečace. Mogli bi dolaziti u sukob s aplikacijama koje su " + "pokrenute u terminalu, pa ih je moguće isključiti." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:105 ++#: ../src/org.gnome.Terminal.gschema.xml.h:104 + msgid "Whether the standard GTK shortcut for menubar access is enabled" + msgstr "Treba li standardne GTK prečace za pristup traci izbornika omogućiti" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:106 ++#: ../src/org.gnome.Terminal.gschema.xml.h:105 + msgid "" + "Normally you can access the menubar with F10. This can also be customized " + "via gtkrc (gtk-menu-bar-accel = \"whatever\"). This option allows the " +@@ -634,31 +628,31 @@ msgstr "" + "prilagođeno kroz gtkrc (gtk-menu-bar-accel = \"whatever\"). Ova postavka " + "dopušta onemogućavanje standardnog prečaca za traku izbornika." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:107 ++#: ../src/org.gnome.Terminal.gschema.xml.h:106 + msgid "Whether the shell integration is enabled" + msgstr "Treba li omogućiti integraciju ljuske" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:108 ++#: ../src/org.gnome.Terminal.gschema.xml.h:107 + msgid "Whether to ask for confirmation before closing a terminal" + msgstr "Treba li upitati za potvrdu prije zatvaranja terminala" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:109 ++#: ../src/org.gnome.Terminal.gschema.xml.h:108 + msgid "Whether to show the menubar in new windows" + msgstr "Treba li prikazati traku izbornika u novim prozorima" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:110 ++#: ../src/org.gnome.Terminal.gschema.xml.h:109 + msgid "Whether to open new terminals as windows or tabs" + msgstr "Treba li otvoriti terminale u prozoru ili karticama" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:111 ++#: ../src/org.gnome.Terminal.gschema.xml.h:110 + msgid "When to show the tabs bar" + msgstr "Kada prikazati traku kartica" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:112 ++#: ../src/org.gnome.Terminal.gschema.xml.h:111 + msgid "The position of the tab bar" + msgstr "Položaj trake kartica" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:113 ++#: ../src/org.gnome.Terminal.gschema.xml.h:112 + msgid "Which theme variant to use" + msgstr "Koju varijantu teme koristiti" + +@@ -712,6 +706,11 @@ msgstr "I-Beam" + msgid "Underline" + msgstr "Podcrtano" + ++#. Cursor blink mode ++#: ../src/preferences.ui.h:19 ++msgid "Default" ++msgstr "Zadano" ++ + #. Cursor blink mode + #: ../src/preferences.ui.h:21 + msgid "Enabled" +@@ -1142,26 +1141,26 @@ msgid "Error parsing command: %s" + msgstr "Greška obrade naredbe: %s" + + #. Translators: Appears as: [numeric entry] × width +-#: ../src/profile-editor.c:899 ++#: ../src/profile-editor.c:828 + msgid "width" + msgstr "širina" + + #. Translators: Appears as: [numeric entry] × height +-#: ../src/profile-editor.c:904 ++#: ../src/profile-editor.c:833 + msgid "height" + msgstr "visina" + +-#: ../src/profile-editor.c:956 ++#: ../src/profile-editor.c:885 + #, c-format + msgid "Choose Palette Color %u" + msgstr "Odaberi paletu boje %u" + +-#: ../src/profile-editor.c:960 ++#: ../src/profile-editor.c:889 + #, c-format + msgid "Palette entry %u" + msgstr "Stavka palete %u" + +-#: ../src/search-popover.ui.h:1 ../src/terminal-accels.c:148 ++#: ../src/search-popover.ui.h:1 ../src/terminal-accels.c:150 + msgid "Find" + msgstr "Pretraži" + +@@ -1193,197 +1192,189 @@ msgstr "Podudaranje s _običnim izrazom" + msgid "_Wrap around" + msgstr "_Omotaj oko" + +-#: ../src/terminal-accels.c:124 ++#: ../src/terminal-accels.c:126 + msgid "New Tab" + msgstr "Nova kartica" + +-#: ../src/terminal-accels.c:125 +-msgid "New Window" +-msgstr "Novi prozor" +- +-#: ../src/terminal-accels.c:127 ++#: ../src/terminal-accels.c:129 + msgid "Save Contents" + msgstr "Spremi sadržaj" + +-#: ../src/terminal-accels.c:130 ++#: ../src/terminal-accels.c:132 + msgid "Export" + msgstr "Izvoz" + +-#: ../src/terminal-accels.c:133 ++#: ../src/terminal-accels.c:135 + msgid "Print" + msgstr "Ispis" + +-#: ../src/terminal-accels.c:135 ++#: ../src/terminal-accels.c:137 + msgid "Close Tab" + msgstr "Zatvori karticu" + +-#: ../src/terminal-accels.c:136 ++#: ../src/terminal-accels.c:138 + msgid "Close Window" + msgstr "Zatvori prozor" + +-#: ../src/terminal-accels.c:140 ++#: ../src/terminal-accels.c:142 + msgid "Copy" + msgstr "Kopiraj" + +-#: ../src/terminal-accels.c:141 ++#: ../src/terminal-accels.c:143 + msgid "Copy as HTML" + msgstr "Kopiraj kao HTML" + +-#: ../src/terminal-accels.c:142 ++#: ../src/terminal-accels.c:144 + msgid "Paste" + msgstr "Zalijepi" + +-#: ../src/terminal-accels.c:143 ++#: ../src/terminal-accels.c:145 + msgid "Select All" + msgstr "Odaberi sve" + +-#: ../src/terminal-accels.c:144 +-msgid "Preferences" +-msgstr "Osobitosti" +- +-#: ../src/terminal-accels.c:149 ++#: ../src/terminal-accels.c:151 + msgid "Find Next" + msgstr "Pretraži sljedeće" + +-#: ../src/terminal-accels.c:150 ++#: ../src/terminal-accels.c:152 + msgid "Find Previous" + msgstr "Pretraži prijašnje" + +-#: ../src/terminal-accels.c:151 ++#: ../src/terminal-accels.c:153 + msgid "Clear Highlight" + msgstr "Ukloni isticanje" + +-#: ../src/terminal-accels.c:155 ++#: ../src/terminal-accels.c:157 + msgid "Hide and Show Menubar" + msgstr "Prikaži i sakrij traku izbornika" + +-#: ../src/terminal-accels.c:156 ++#: ../src/terminal-accels.c:158 + msgid "Full Screen" + msgstr "Cijeli zaslon" + +-#: ../src/terminal-accels.c:157 ++#: ../src/terminal-accels.c:159 + msgid "Zoom In" + msgstr "Približi" + +-#: ../src/terminal-accels.c:158 ++#: ../src/terminal-accels.c:160 + msgid "Zoom Out" + msgstr "Udalji" + +-#: ../src/terminal-accels.c:159 ++#: ../src/terminal-accels.c:161 + msgid "Normal Size" + msgstr "Normalna veličina" + +-#: ../src/terminal-accels.c:163 ++#: ../src/terminal-accels.c:165 + msgid "Read-Only" + msgstr "Samo za čitanje" + +-#: ../src/terminal-accels.c:164 ++#: ../src/terminal-accels.c:166 + msgid "Reset" + msgstr "Vrati izvorno" + +-#: ../src/terminal-accels.c:165 ++#: ../src/terminal-accels.c:167 + msgid "Reset and Clear" + msgstr "Vračanje izvornog i čišćenje" + +-#: ../src/terminal-accels.c:169 ++#: ../src/terminal-accels.c:171 + msgid "Switch to Previous Tab" + msgstr "Prebaci na prijašnju karticu" + +-#: ../src/terminal-accels.c:170 ++#: ../src/terminal-accels.c:172 + msgid "Switch to Next Tab" + msgstr "Prebaci na sljedeću karticu" + +-#: ../src/terminal-accels.c:171 ++#: ../src/terminal-accels.c:173 + msgid "Move Tab to the Left" + msgstr "Pomakni karticu ulijevo" + +-#: ../src/terminal-accels.c:172 ++#: ../src/terminal-accels.c:174 + msgid "Move Tab to the Right" + msgstr "Pomakni karticu udesno" + +-#: ../src/terminal-accels.c:173 ++#: ../src/terminal-accels.c:175 + msgid "Detach Tab" + msgstr "Odvoji karticu" + +-#: ../src/terminal-accels.c:209 ++#: ../src/terminal-accels.c:211 + msgid "Switch to Last Tab" + msgstr "Prebaci na posljednju karticu" + +-#: ../src/terminal-accels.c:213 ++#: ../src/terminal-accels.c:215 + msgid "Contents" + msgstr "Priručnik" + +-#: ../src/terminal-accels.c:222 ../src/terminal-menubar.ui.in.h:2 ++#: ../src/terminal-accels.c:219 ++msgid "Show Primary Menu" ++msgstr "Prikaži glavni izbornik" ++ ++#: ../src/terminal-accels.c:228 ../src/terminal-menubar.ui.in.h:2 + msgid "File" + msgstr "Datoteka" + +-#: ../src/terminal-accels.c:223 ../src/terminal-menubar.ui.in.h:9 ++#: ../src/terminal-accels.c:229 ../src/terminal-menubar.ui.in.h:9 + msgid "Edit" + msgstr "Uredi" + +-#: ../src/terminal-accels.c:224 ../src/terminal-menubar.ui.in.h:17 ++#: ../src/terminal-accels.c:230 ../src/terminal-menubar.ui.in.h:17 + msgid "View" + msgstr "Pogled" + +-#: ../src/terminal-accels.c:225 ../src/terminal-menubar.ui.in.h:24 ++#: ../src/terminal-accels.c:231 ../src/terminal-menubar.ui.in.h:24 + msgid "Search" + msgstr "Pretraga" + +-#: ../src/terminal-accels.c:227 ../src/terminal-menubar.ui.in.h:41 ++#: ../src/terminal-accels.c:233 ../src/terminal-menubar.ui.in.h:41 + msgid "Tabs" + msgstr "Kartice" + +-#: ../src/terminal-accels.c:228 ../src/terminal-menubar.ui.in.h:48 ++#: ../src/terminal-accels.c:234 ../src/terminal-menubar.ui.in.h:48 + msgid "Help" + msgstr "Pomoć" + +-#: ../src/terminal-accels.c:327 ++#: ../src/terminal-accels.c:235 ../src/terminal-prefs.c:671 ++msgid "Global" ++msgstr "Globalno" ++ ++#: ../src/terminal-accels.c:362 + #, c-format + msgid "Switch to Tab %u" + msgstr "Prebaci na %u karticu" + +-#: ../src/terminal-accels.c:535 ++#: ../src/terminal-accels.c:552 + msgid "_Action" + msgstr "_Radnja" + +-#: ../src/terminal-accels.c:554 ++#: ../src/terminal-accels.c:571 + msgid "Shortcut _Key" + msgstr "Tipka _prečaca" + +-#: ../src/terminal-app.c:491 ../src/terminal-window.c:1839 ++#: ../src/terminal-app.c:502 ++msgid "New Terminal" ++msgstr "Novi terminal" ++ ++#: ../src/terminal-app.c:512 ../src/terminal-window.c:1796 + msgid "New _Terminal" + msgstr "Novi _terminal" + +-#: ../src/terminal-app.c:493 ../src/terminal-window.c:1848 ++#: ../src/terminal-app.c:514 ../src/terminal-window.c:1805 + msgid "New _Tab" + msgstr "Nova _kartica" + +-#: ../src/terminal-app.c:494 ../src/terminal-window.c:1844 ++#: ../src/terminal-app.c:515 ../src/terminal-headermenu.ui.h:3 ++#: ../src/terminal-window.c:1801 + msgid "New _Window" + msgstr "Novi _prozor" + +-#: ../src/terminal-app.c:543 ++#: ../src/terminal-app.c:564 + msgid "Change _Profile" + msgstr "Promijeni _profil" + +-#: ../src/terminal-appmenu.ui.h:1 ../src/terminal-screen.c:1386 +-#: ../src/terminal-window.c:1832 +-msgid "_Preferences" +-msgstr "_Osobitosti" +- +-#: ../src/terminal-appmenu.ui.h:2 ../src/terminal-menubar.ui.in.h:47 +-msgid "_Help" +-msgstr "_Priručnik" ++#: ../src/terminal-app.c:577 ++msgid "_Profile" ++msgstr "_Profil" + +-#: ../src/terminal-appmenu.ui.h:3 ../src/terminal-menubar.ui.in.h:50 +-msgid "_About" +-msgstr "_O programu" +- +-#: ../src/terminal-appmenu.ui.h:4 +-msgid "_Quit" +-msgstr "_Zatvori" +- +-#: ../src/terminal.c:545 ++#: ../src/terminal.c:568 + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Greška u obradi argumenata: %s\n" +@@ -1537,6 +1528,68 @@ msgstr "Zastarjelo CJK kôdiranje" + msgid "Obsolete Encodings" + msgstr "Zastarjelo kôdiranje" + ++#: ../src/terminal-headermenu.ui.h:1 ../src/terminal-menubar.ui.in.h:22 ++msgid "Zoom _Out" ++msgstr "Uda_lji" ++ ++#: ../src/terminal-headermenu.ui.h:2 ../src/terminal-menubar.ui.in.h:20 ++msgid "Zoom _In" ++msgstr "Pribli_ži" ++ ++#: ../src/terminal-headermenu.ui.h:4 ../src/terminal-menubar.ui.in.h:19 ++msgid "_Full Screen" ++msgstr "_Cijeli zaslon" ++ ++#: ../src/terminal-headermenu.ui.h:5 ../src/terminal-menubar.ui.in.h:33 ++#: ../src/terminal-window.c:1777 ++msgid "Read-_Only" ++msgstr "_Samo-za-čitanje" ++ ++#: ../src/terminal-headermenu.ui.h:6 ++msgid "_Advanced" ++msgstr "_Napredno" ++ ++#: ../src/terminal-headermenu.ui.h:7 ../src/terminal-menubar.ui.in.h:34 ++msgid "_Reset" ++msgstr "_Vrati izvorno" ++ ++#: ../src/terminal-headermenu.ui.h:8 ../src/terminal-menubar.ui.in.h:35 ++msgid "Reset and C_lear" ++msgstr "Vraćanje izvornog i b_risanje" ++ ++#: ../src/terminal-headermenu.ui.h:9 ../src/terminal-menubar.ui.in.h:36 ++msgid "_1. 80×24" ++msgstr "_1. 80×24" ++ ++#: ../src/terminal-headermenu.ui.h:10 ../src/terminal-menubar.ui.in.h:37 ++msgid "_2. 80×43" ++msgstr "_2. 80×43" ++ ++#: ../src/terminal-headermenu.ui.h:11 ../src/terminal-menubar.ui.in.h:38 ++msgid "_3. 132×24" ++msgstr "_3. 132×24" ++ ++#: ../src/terminal-headermenu.ui.h:12 ../src/terminal-menubar.ui.in.h:39 ++msgid "_4. 132×43" ++msgstr "_4. 132×43" ++ ++#: ../src/terminal-headermenu.ui.h:13 ../src/terminal-menubar.ui.in.h:51 ++msgid "_Inspector" ++msgstr "_Nadzornik" ++ ++#: ../src/terminal-headermenu.ui.h:14 ../src/terminal-screen.c:1354 ++#: ../src/terminal-window.c:1789 ++msgid "_Preferences" ++msgstr "_Osobitosti" ++ ++#: ../src/terminal-headermenu.ui.h:15 ../src/terminal-menubar.ui.in.h:47 ++msgid "_Help" ++msgstr "_Priručnik" ++ ++#: ../src/terminal-headermenu.ui.h:16 ../src/terminal-menubar.ui.in.h:50 ++msgid "_About" ++msgstr "_O programu" ++ + #: ../src/terminal-menubar.ui.in.h:1 + msgid "_File" + msgstr "_Datoteka" +@@ -1565,19 +1618,19 @@ msgstr "_Zatvori prozor" + msgid "_Edit" + msgstr "_Uredi" + +-#: ../src/terminal-menubar.ui.in.h:10 ../src/terminal-window.c:1810 ++#: ../src/terminal-menubar.ui.in.h:10 ../src/terminal-window.c:1767 + msgid "_Copy" + msgstr "_Kopiraj" + +-#: ../src/terminal-menubar.ui.in.h:11 ../src/terminal-window.c:1811 ++#: ../src/terminal-menubar.ui.in.h:11 ../src/terminal-window.c:1768 + msgid "Copy as _HTML" + msgstr "Kopiraj kao _HTML" + +-#: ../src/terminal-menubar.ui.in.h:12 ../src/terminal-window.c:1812 ++#: ../src/terminal-menubar.ui.in.h:12 ../src/terminal-window.c:1769 + msgid "_Paste" + msgstr "_Zalijepi" + +-#: ../src/terminal-menubar.ui.in.h:13 ../src/terminal-window.c:1814 ++#: ../src/terminal-menubar.ui.in.h:13 ../src/terminal-window.c:1771 + msgid "Paste as _Filenames" + msgstr "Zalijepi kao _naziv datoteke" + +@@ -1593,26 +1646,14 @@ msgstr "O_sobitosti" + msgid "_View" + msgstr "_Pogled" + +-#: ../src/terminal-menubar.ui.in.h:18 ../src/terminal-window.c:1860 ++#: ../src/terminal-menubar.ui.in.h:18 ../src/terminal-window.c:1817 + msgid "Show _Menubar" + msgstr "Prikaži traku _izbornika" + +-#: ../src/terminal-menubar.ui.in.h:19 +-msgid "_Full Screen" +-msgstr "_Cijeli zaslon" +- +-#: ../src/terminal-menubar.ui.in.h:20 +-msgid "Zoom _In" +-msgstr "Pribli_ži" +- + #: ../src/terminal-menubar.ui.in.h:21 + msgid "_Normal Size" + msgstr "_Normalna veličina" + +-#: ../src/terminal-menubar.ui.in.h:22 +-msgid "Zoom _Out" +-msgstr "Uda_lji" +- + #: ../src/terminal-menubar.ui.in.h:23 + msgid "_Search" + msgstr "_Pretraži" +@@ -1637,7 +1678,7 @@ msgstr "_Ukloni isticanje" + msgid "_Terminal" + msgstr "_Terminal" + +-#: ../src/terminal-menubar.ui.in.h:31 ++#: ../src/terminal-menubar.ui.in.h:31 ../src/terminal-notebook-menu.ui.h:4 + msgid "Set _Title…" + msgstr "Postavi _naslov…" + +@@ -1645,34 +1686,6 @@ msgstr "Postavi _naslov…" + msgid "Set _Character Encoding" + msgstr "Postavi _kôdiranje znakova" + +-#: ../src/terminal-menubar.ui.in.h:33 ../src/terminal-window.c:1820 +-msgid "Read-_Only" +-msgstr "_Samo-za-čitanje" +- +-#: ../src/terminal-menubar.ui.in.h:34 +-msgid "_Reset" +-msgstr "_Vrati izvorno" +- +-#: ../src/terminal-menubar.ui.in.h:35 +-msgid "Reset and C_lear" +-msgstr "Vraćanje izvornog i b_risanje" +- +-#: ../src/terminal-menubar.ui.in.h:36 +-msgid "_1. 80×24" +-msgstr "_1. 80×24" +- +-#: ../src/terminal-menubar.ui.in.h:37 +-msgid "_2. 80×43" +-msgstr "_2. 80×43" +- +-#: ../src/terminal-menubar.ui.in.h:38 +-msgid "_3. 132×24" +-msgstr "_3. 132×24" +- +-#: ../src/terminal-menubar.ui.in.h:39 +-msgid "_4. 132×43" +-msgstr "_4. 132×43" +- + #: ../src/terminal-menubar.ui.in.h:40 + msgid "Ta_bs" + msgstr "_Kartice" +@@ -1701,67 +1714,34 @@ msgstr "_Otkvači karticu" + msgid "_Contents" + msgstr "_Priručnik" + +-#: ../src/terminal-menubar.ui.in.h:51 +-msgid "_Inspector" +-msgstr "_Nadzornik" +- +-#: ../src/terminal-nautilus.c:592 ++#: ../src/terminal-nautilus.c:534 + msgid "Open in _Remote Terminal" + msgstr "Otvori u _udaljenom terminalu" + +-#: ../src/terminal-nautilus.c:594 ++#: ../src/terminal-nautilus.c:536 + msgid "Open in _Local Terminal" + msgstr "Otvori u _lokalnom terminalu" + +-#: ../src/terminal-nautilus.c:598 ../src/terminal-nautilus.c:609 ++#: ../src/terminal-nautilus.c:540 ../src/terminal-nautilus.c:551 + msgid "Open the currently selected folder in a terminal" + msgstr "Otvori trenutno odabranu mapu u terminalu" + +-#: ../src/terminal-nautilus.c:600 ../src/terminal-nautilus.c:611 +-#: ../src/terminal-nautilus.c:621 ++#: ../src/terminal-nautilus.c:542 ../src/terminal-nautilus.c:553 + msgid "Open the currently open folder in a terminal" + msgstr "Otvori trenutno otvorenu mapu u terminalu" + +-#: ../src/terminal-nautilus.c:606 ../src/terminal-nautilus.c:620 ++#: ../src/terminal-nautilus.c:548 + msgid "Open in T_erminal" + msgstr "Otvori u t_erminalu" + +-#: ../src/terminal-nautilus.c:617 ++#: ../src/terminal-nautilus.c:558 + msgid "Open T_erminal" + msgstr "Otvori t_erminal" + +-#: ../src/terminal-nautilus.c:618 ++#: ../src/terminal-nautilus.c:559 + msgid "Open a terminal" + msgstr "Otvori terminal" + +-#: ../src/terminal-nautilus.c:636 ../src/terminal-nautilus.c:649 +-msgid "Open in _Midnight Commander" +-msgstr "Otvori u _Midnight upravitelju" +- +-#: ../src/terminal-nautilus.c:638 +-msgid "" +-"Open the currently selected folder in the terminal file manager Midnight " +-"Commander" +-msgstr "" +-"Otvori trenutno odabaranu mapu u terminalnom upravitelju datoteka Midnight " +-"upravitelju" +- +-#: ../src/terminal-nautilus.c:640 ../src/terminal-nautilus.c:650 +-msgid "" +-"Open the currently open folder in the terminal file manager Midnight " +-"Commander" +-msgstr "" +-"Otvori trenutno otvorenu mapu u terminalnom upravitelju datoteka Midnight " +-"upravitelju" +- +-#: ../src/terminal-nautilus.c:646 +-msgid "Open _Midnight Commander" +-msgstr "Otvori _Midnight upravitelja" +- +-#: ../src/terminal-nautilus.c:647 +-msgid "Open the terminal file manager Midnight Commander" +-msgstr "Otvori terminalni upravitelj datoteka Midnight upravitelj" +- + #: ../src/terminal-notebook-menu.ui.h:1 + msgid "Move Terminal _Left" + msgstr "Pomakni terminal _ulijevo" +@@ -1774,11 +1754,11 @@ msgstr "Pomakni terminal _udesno" + msgid "_Detach Terminal" + msgstr "_Otkvači terminal" + +-#: ../src/terminal-notebook-menu.ui.h:4 ../src/terminal-window.c:3353 ++#: ../src/terminal-notebook-menu.ui.h:5 ../src/terminal-window.c:3246 + msgid "C_lose Terminal" + msgstr "Z_atvori terminal" + +-#: ../src/terminal-options.c:284 ++#: ../src/terminal-options.c:281 + #, c-format + msgid "" + "Option “%s” is deprecated and might be removed in a later version of gnome-" +@@ -1788,53 +1768,53 @@ msgstr "" + "gnome-terminala." + + #. %s is being replaced with "-- " (without quotes), which must be used literally, not translatable +-#: ../src/terminal-options.c:295 ++#: ../src/terminal-options.c:292 + #, c-format + msgid "" + "Use “%s” to terminate the options and put the command line to execute after " + "it." + msgstr "Koristi \"%s\" za prekidanje mogućnosti i nakon toga pokreni naredbu." + +-#: ../src/terminal-options.c:305 ../src/terminal-options.c:318 ++#: ../src/terminal-options.c:302 ../src/terminal-options.c:315 + #, c-format + msgid "Option “%s” is no longer supported in this version of gnome-terminal." + msgstr "Mogućnost \"%s\" više nije podržana u ovoj inačici gnome-terminala." + +-#: ../src/terminal-options.c:390 ++#: ../src/terminal-options.c:387 + #, c-format + msgid "Argument to “%s” is not a valid command: %s" + msgstr "Argument za \"%s\" nije valjana naredba: %s" + +-#: ../src/terminal-options.c:563 ++#: ../src/terminal-options.c:560 + msgid "Two roles given for one window" + msgstr "Dvije namjene dane jednom prozoru" + +-#: ../src/terminal-options.c:584 ../src/terminal-options.c:617 ++#: ../src/terminal-options.c:581 ../src/terminal-options.c:614 + #, c-format + msgid "“%s” option given twice for the same window\n" + msgstr "\"%s\" mogućnost je data dvaput za isti prozor\n" + +-#: ../src/terminal-options.c:836 ++#: ../src/terminal-options.c:833 + #, c-format + msgid "Cannot pass FD %d twice" + msgstr "Nemoguć FD prolaz %d dva puta" + +-#: ../src/terminal-options.c:898 ++#: ../src/terminal-options.c:895 + #, c-format + msgid "“%s” is not a valid zoom factor" + msgstr "\"%s\" nije valjan faktor približenja" + +-#: ../src/terminal-options.c:905 ++#: ../src/terminal-options.c:902 + #, c-format + msgid "Zoom factor “%g” is too small, using %g\n" + msgstr "Faktor uvećanja \"%g\" je premalen, koristim %g\n" + +-#: ../src/terminal-options.c:913 ++#: ../src/terminal-options.c:910 + #, c-format + msgid "Zoom factor “%g” is too large, using %g\n" + msgstr "Faktor uvećanja \"%g\" je prevelik, koristim %g\n" + +-#: ../src/terminal-options.c:951 ++#: ../src/terminal-options.c:948 + #, c-format + msgid "" + "Option “%s” requires specifying the command to run on the rest of the " +@@ -1843,15 +1823,15 @@ msgstr "" + "Mogućnost \"%s\" zahtjeva navođenje naredbe za pokretanje na ostataku " + "naredbenog retka" + +-#: ../src/terminal-options.c:1100 ++#: ../src/terminal-options.c:1101 + msgid "Can only use --wait once" + msgstr "Može koristiti --wait samo jednom" + +-#: ../src/terminal-options.c:1135 ++#: ../src/terminal-options.c:1137 + msgid "Not a valid terminal config file." + msgstr "Nevaljana config datoteka terminala." + +-#: ../src/terminal-options.c:1148 ++#: ../src/terminal-options.c:1150 + msgid "Incompatible terminal config file version." + msgstr "Nekompatabilna inačica datoteke podešavanja terminala." + +@@ -2097,50 +2077,46 @@ msgstr "Obriši profil" + msgid "Delete" + msgstr "Obriši" + +-#: ../src/terminal-prefs.c:518 ++#: ../src/terminal-prefs.c:519 + msgid "This is the default profile" + msgstr "Ovo je zadani profil" + +-#: ../src/terminal-prefs.c:542 ++#: ../src/terminal-prefs.c:543 + msgid "General" + msgstr "Općenito" + +-#: ../src/terminal-prefs.c:547 ++#: ../src/terminal-prefs.c:548 + msgid "Shortcuts" + msgstr "Prečaci" + +-#: ../src/terminal-prefs.c:671 +-msgid "Global" +-msgstr "Globalno" +- + #: ../src/terminal-prefs.c:683 + msgid "Profiles" + msgstr "Profili" + +-#: ../src/terminal-screen.c:1172 ++#: ../src/terminal-screen.c:1140 + msgid "No command supplied nor shell requested" + msgstr "Nema isporučene naredbe ili zahtjevane ljuske" + +-#: ../src/terminal-screen.c:1387 ../src/terminal-screen.c:1717 ++#: ../src/terminal-screen.c:1355 ../src/terminal-screen.c:1681 + msgid "_Relaunch" + msgstr "_Pokreni ponovno" + +-#: ../src/terminal-screen.c:1390 ++#: ../src/terminal-screen.c:1358 + msgid "There was an error creating the child process for this terminal" + msgstr "" + "Došlo je do greške prilikom stvaranja podređenog procesa za ovaj terminal" + +-#: ../src/terminal-screen.c:1721 ++#: ../src/terminal-screen.c:1685 + #, c-format + msgid "The child process exited normally with status %d." + msgstr "Podproces se normalno okončao sa stanjem %d." + +-#: ../src/terminal-screen.c:1724 ++#: ../src/terminal-screen.c:1688 + #, c-format + msgid "The child process was aborted by signal %d." + msgstr "Podređeni proces je prekinuo signal %d." + +-#: ../src/terminal-screen.c:1727 ++#: ../src/terminal-screen.c:1691 + msgid "The child process was aborted." + msgstr "Podređeni proces je prekinut." + +@@ -2225,71 +2201,71 @@ msgstr "" + msgid "“file” scheme with remote hostname not supported" + msgstr "“datoteka” shema s udaljenim nazivom računala nije podržana" + +-#: ../src/terminal-window.c:460 ++#: ../src/terminal-window.c:457 + msgid "Could not save contents" + msgstr "Nemoguće spremanje sadržaja" + +-#: ../src/terminal-window.c:480 ++#: ../src/terminal-window.c:477 + msgid "Save as…" + msgstr "Spremi kao…" + +-#: ../src/terminal-window.c:483 ++#: ../src/terminal-window.c:480 + msgid "_Cancel" + msgstr "_Odustani" + +-#: ../src/terminal-window.c:484 ++#: ../src/terminal-window.c:481 + msgid "_Save" + msgstr "_Spremi" + +-#: ../src/terminal-window.c:1767 ++#: ../src/terminal-window.c:1724 + msgid "Open _Hyperlink" + msgstr "Otvori _hiperpoveznicu" + +-#: ../src/terminal-window.c:1768 ++#: ../src/terminal-window.c:1725 + msgid "Copy Hyperlink _Address" + msgstr "Kopiraj adresu _hiperpoveznice" + +-#: ../src/terminal-window.c:1778 ++#: ../src/terminal-window.c:1735 + msgid "Send Mail _To…" + msgstr "Pošalji _e-poštu…" + +-#: ../src/terminal-window.c:1779 ++#: ../src/terminal-window.c:1736 + msgid "Copy Mail _Address" + msgstr "Kopiraj adresu _e-pošte" + +-#: ../src/terminal-window.c:1782 ++#: ../src/terminal-window.c:1739 + msgid "Call _To…" + msgstr "P_ozovi…" + +-#: ../src/terminal-window.c:1783 ++#: ../src/terminal-window.c:1740 + msgid "Copy Call _Address " + msgstr "Kopiraj adresu _poziva " + +-#: ../src/terminal-window.c:1788 ++#: ../src/terminal-window.c:1745 + msgid "_Open Link" + msgstr "Otvori _poveznicu" + +-#: ../src/terminal-window.c:1789 ++#: ../src/terminal-window.c:1746 + msgid "Copy _Link" + msgstr "Kopiraj _poveznicu" + +-#: ../src/terminal-window.c:1827 ++#: ../src/terminal-window.c:1784 + msgid "P_rofiles" + msgstr "_Profili" + +-#: ../src/terminal-window.c:1862 ++#: ../src/terminal-window.c:1819 + msgid "L_eave Full Screen" + msgstr "N_apusti cjelozaslonski prikaz" + +-#: ../src/terminal-window.c:3340 ++#: ../src/terminal-window.c:3233 + msgid "Close this window?" + msgstr "Želite li zatvoriti ovaj prozor?" + +-#: ../src/terminal-window.c:3340 ++#: ../src/terminal-window.c:3233 + msgid "Close this terminal?" + msgstr "Želite li zatvoriti ovaj terminal?" + +-#: ../src/terminal-window.c:3344 ++#: ../src/terminal-window.c:3237 + msgid "" + "There are still processes running in some terminals in this window. Closing " + "the window will kill all of them." +@@ -2297,7 +2273,7 @@ msgstr "" + "Neki procesi su još uvijek pokrenuti u nekim terminalima ovog prozora. " + "Zatvaranje ovog prozora će ugasiti procese." + +-#: ../src/terminal-window.c:3348 ++#: ../src/terminal-window.c:3241 + msgid "" + "There is still a process running in this terminal. Closing the terminal will " + "kill it." +@@ -2305,10 +2281,46 @@ msgstr "" + "Neki procesi su još uvijek pokrenuti u ovom terminau. Zatvaranje ovog " + "prozora će ugasiti procese." + +-#: ../src/terminal-window.c:3353 ++#: ../src/terminal-window.c:3246 + msgid "C_lose Window" + msgstr "_Zatvori prozor" + ++#~ msgid "Unnamed" ++#~ msgstr "Neimenovano" ++ ++#~ msgid "Whether to show menubar in new windows/tabs" ++#~ msgstr "Treba li prikazivati traku izbornika u novim prozorima/karticama" ++ ++#~ msgid "True if the menubar should be shown in new window" ++#~ msgstr "" ++#~ "Ako je odabrano, traka izbornika trebala bi biti prikazana u novom prozoru" ++ ++#~ msgid "_Quit" ++#~ msgstr "_Zatvori" ++ ++#~ msgid "Open in _Midnight Commander" ++#~ msgstr "Otvori u _Midnight upravitelju" ++ ++#~ msgid "" ++#~ "Open the currently selected folder in the terminal file manager Midnight " ++#~ "Commander" ++#~ msgstr "" ++#~ "Otvori trenutno odabaranu mapu u terminalnom upravitelju datoteka " ++#~ "Midnight upravitelju" ++ ++#~ msgid "" ++#~ "Open the currently open folder in the terminal file manager Midnight " ++#~ "Commander" ++#~ msgstr "" ++#~ "Otvori trenutno otvorenu mapu u terminalnom upravitelju datoteka Midnight " ++#~ "upravitelju" ++ ++#~ msgid "Open _Midnight Commander" ++#~ msgstr "Otvori _Midnight upravitelja" ++ ++#~ msgid "Open the terminal file manager Midnight Commander" ++#~ msgstr "Otvori terminalni upravitelj datoteka Midnight upravitelj" ++ + #~ msgid "Keyboard shortcut to create a new profile" + #~ msgstr "Prečac tipkovnice za stavaranje novog profila" + +@@ -2494,9 +2506,6 @@ msgstr "_Zatvori prozor" + #~ msgid "User Defined" + #~ msgstr "Korisnički definirano" + +-#~ msgid "_New Terminal" +-#~ msgstr "_Novi terminal" +- + #~ msgid "Show" + #~ msgstr "Prikaži" + +-- +2.20.1 + + +From 3d74551c21721c9877ab3a7b1812285b13965649 Mon Sep 17 00:00:00 2001 +From: Andre Klapper +Date: Sun, 31 Mar 2019 14:02:37 +0200 +Subject: [PATCH 5/8] help: Fix pref-profiles.page to validate + +--- + help/C/pref-profiles.page | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/help/C/pref-profiles.page b/help/C/pref-profiles.page +index 31e600fd3af4..bf10519df080 100644 +--- a/help/C/pref-profiles.page ++++ b/help/C/pref-profiles.page +@@ -255,13 +255,13 @@ + + + +-

The default profile is loaded when a new terminal is opened unless you +- have selected another profile. Any changes that you make to the settings will +- be stored in the currently selected profile.

+- +
+ Set a default profile + ++

The default profile is loaded when a new terminal is opened unless you ++ have selected another profile. Any changes that you make to the settings will ++ be stored in the currently selected profile.

++ +

The default profile is used when Terminal could not + otherwise decide which profile to use. For example, Terminal is + started up freshly and opens its first terminal window. In contrast, when +-- +2.20.1 + + +From 48beab448d28e63059272bf2ccc3c19ee2d4ad1d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20Dr=C4=85g?= +Date: Sun, 31 Mar 2019 15:25:14 +0200 +Subject: [PATCH 6/8] Update Polish translation + +--- + help/pl/pl.po | 84 +++++++++++---------------------------------------- + 1 file changed, 18 insertions(+), 66 deletions(-) + +diff --git a/help/pl/pl.po b/help/pl/pl.po +index ddb5bb905a38..9dadebc56afe 100644 +--- a/help/pl/pl.po ++++ b/help/pl/pl.po +@@ -1,14 +1,14 @@ + # Polish translation for gnome-terminal help. +-# Copyright © 2017-2018 the gnome-terminal authors. ++# Copyright © 2017-2019 the gnome-terminal authors. + # This file is distributed under the same license as the gnome-terminal help. +-# Piotr Drąg , 2017-2018. +-# Aviary.pl , 2017-2018. ++# Piotr Drąg , 2017-2019. ++# Aviary.pl , 2017-2019. + # + msgid "" + msgstr "" + "Project-Id-Version: gnome-terminal-help\n" +-"POT-Creation-Date: 2018-09-02 18:00+0000\n" +-"PO-Revision-Date: 2018-10-19 22:37+0200\n" ++"POT-Creation-Date: 2019-03-31 12:40+0000\n" ++"PO-Revision-Date: 2019-03-31 15:24+0200\n" + "Last-Translator: Piotr Drąg \n" + "Language-Team: Polish \n" + "Language: pl\n" +@@ -22,8 +22,8 @@ msgstr "" + msgctxt "_" + msgid "translator-credits" + msgstr "" +-"Piotr Drąg , 2017-2018\n" +-"Aviary.pl , 2017-2018" ++"Piotr Drąg , 2017-2019\n" ++"Aviary.pl , 2017-2019" + + #. (itstool) path: credit/name + #: C/adv-keyboard-shortcuts.page:13 C/app-colors.page:11 C/app-cursor.page:12 +@@ -1574,7 +1574,7 @@ msgid "To change the ordering of tabs in a window:" + msgstr "Aby zmienić kolejność kart w oknie:" + + #. (itstool) path: item/p +-#: C/gs-tabs.page:109 C/gs-tabs.page:136 C/gs-tabs.page:164 ++#: C/gs-tabs.page:109 + msgid "Click and hold the left mouse button on the tab." + msgstr "Kliknij kartę i przytrzymaj lewy przycisk myszy." + +@@ -1584,7 +1584,7 @@ msgid "Drag the tab to the desired position among the other tabs." + msgstr "Przeciągnij kartę do wybranego miejsca między pozostałymi kartami." + + #. (itstool) path: item/p +-#: C/gs-tabs.page:115 C/gs-tabs.page:145 C/gs-tabs.page:170 ++#: C/gs-tabs.page:115 + msgid "Release the mouse button." + msgstr "Zwolnij przycisk myszy." + +@@ -1611,54 +1611,6 @@ msgstr "" + "przenieść kartę w lewo lub Przesuń terminal w prawo, aby przenieść kartę w prawo. Przesunie to kartę o jedno miejsce." + +-#. (itstool) path: section/title +-#: C/gs-tabs.page:131 +-msgid "Move a tab to another Terminal window" +-msgstr "Przenoszenie karty do innego okna Terminala" +- +-#. (itstool) path: section/p +-#: C/gs-tabs.page:133 +-msgid "If you want to move a tab from one window to another:" +-msgstr "Aby przenieść kartę z jednego okna do drugiego:" +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:139 +-msgid "Drag the tab to the new window." +-msgstr "Przeciągnij kartę do nowego okna." +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:142 +-msgid "Place it beside other tabs in the new window." +-msgstr "Umieść ją między pozostałymi kartami w nowym oknie." +- +-#. (itstool) path: note/p +-#: C/gs-tabs.page:150 +-msgid "" +-"You can move a tab from one window to another by dragging the tab to the " +-"Activities hot-corner of the GNOME Shell. This will " +-"reveal each of the open Terminal windows. You can release the tab " +-"that you are holding over the desired Terminal window." +-msgstr "" +-"Można przenieść kartę z jednego okna do drugiego przeciągając ją do rogu " +-"Podgląd Powłoki GNOME. Wyświetli to wszystkie otwarte " +-"okna Terminala. Można zwolnić przytrzymywaną kartę nad wybranym " +-"oknem Terminala." +- +-#. (itstool) path: section/title +-#: C/gs-tabs.page:159 +-msgid "Move a tab to create a new Terminal window" +-msgstr "Przenoszenie karty, aby utworzyć nowe okno Terminala" +- +-#. (itstool) path: section/p +-#: C/gs-tabs.page:161 +-msgid "To create a new window from an existing tab:" +-msgstr "Aby utworzyć nowe okno z istniejącej karty:" +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:167 +-msgid "Drag the tab out of the current Terminal window." +-msgstr "Przeciągnij kartę z obecnego okna Terminala." +- + #. (itstool) path: info/title + #: C/index.page:8 + msgctxt "link" +@@ -1764,10 +1716,10 @@ msgstr "Zrzut ekranu Terminala GNOME" + msgctxt "_" + msgid "" + "external ref='figures/gnome-terminal.png' " +-"md5='835c028558c16a9c263aaacfe5a1f81d'" ++"md5='9d9d04e06438b67ca403f9e56a6d28cc'" + msgstr "" + "external ref='figures/gnome-terminal.png' " +-"md5='835c028558c16a9c263aaacfe5a1f81d'" ++"md5='9d9d04e06438b67ca403f9e56a6d28cc'" + + #. (itstool) path: p/link + #: C/legal.xml:4 +@@ -2880,8 +2832,13 @@ msgstr "" + "Nie można usunąć domyślnego profilu. Aby usunąć ten profil, najpierw ustaw " + "inny jako domyślny." + +-#. (itstool) path: page/p +-#: C/pref-profiles.page:258 ++#. (itstool) path: section/title ++#: C/pref-profiles.page:259 ++msgid "Set a default profile" ++msgstr "Ustawianie domyślnego profilu" ++ ++#. (itstool) path: section/p ++#: C/pref-profiles.page:261 + msgid "" + "The default profile is loaded when a new terminal is opened unless you have " + "selected another profile. Any changes that you make to the settings will be " +@@ -2891,11 +2848,6 @@ msgstr "" + "że wybrano inny profil. Wszystkie wprowadzone zmiany ustawień zostaną " + "zapisane w obecnie wybranym profilu." + +-#. (itstool) path: section/title +-#: C/pref-profiles.page:263 +-msgid "Set a default profile" +-msgstr "Ustawianie domyślnego profilu" +- + #. (itstool) path: section/p + #: C/pref-profiles.page:265 + msgid "" +-- +2.20.1 + + +From adccbaac61c9e5c0d682ff2b7a78cd962878f285 Mon Sep 17 00:00:00 2001 +From: Anders Jonsson +Date: Sun, 31 Mar 2019 19:34:32 +0000 +Subject: [PATCH 7/8] Update Swedish translation + +--- + help/sv/sv.po | 119 +++++++++++++++++++++++--------------------------- + 1 file changed, 54 insertions(+), 65 deletions(-) + +diff --git a/help/sv/sv.po b/help/sv/sv.po +index 1b5e89edd924..4715b67afc39 100644 +--- a/help/sv/sv.po ++++ b/help/sv/sv.po +@@ -1,22 +1,22 @@ + # Swedish translation for gnome-terminal-help. +-# Copyright © 2015, 2016, 2018 gnome-terminal's COPYRIGHT HOLDER ++# Copyright © 2015, 2016, 2018, 2019 gnome-terminal's COPYRIGHT HOLDER + # This file is distributed under the same license as the gnome-terminal package. +-# Anders Jonsson , 2015, 2016, 2018. ++# Anders Jonsson , 2015, 2016, 2018, 2019. + # Sebastian Rasmussen , 2018. + # + msgid "" + msgstr "" + "Project-Id-Version: gnome-terminal master\n" +-"POT-Creation-Date: 2018-03-17 22:09+0000\n" +-"PO-Revision-Date: 2018-03-28 13:31+0200\n" +-"Last-Translator: Sebastian Rasmussen \n" ++"POT-Creation-Date: 2019-03-31 12:40+0000\n" ++"PO-Revision-Date: 2019-03-31 21:33+0200\n" ++"Last-Translator: Anders Jonsson \n" + "Language-Team: Swedish \n" + "Language: sv\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Poedit 2.0.6\n" ++"X-Generator: Poedit 2.2.1\n" + + #. Put one translator per line, in the form NAME , YEAR1, YEAR2 + msgctxt "_" +@@ -1583,7 +1583,7 @@ msgid "To change the ordering of tabs in a window:" + msgstr "För att ändra ordningen på flikar i ett fönster:" + + #. (itstool) path: item/p +-#: C/gs-tabs.page:109 C/gs-tabs.page:136 C/gs-tabs.page:164 ++#: C/gs-tabs.page:109 + msgid "Click and hold the left mouse button on the tab." + msgstr "Klicka och håll ner vänster musknapp på fliken." + +@@ -1593,7 +1593,7 @@ msgid "Drag the tab to the desired position among the other tabs." + msgstr "Dra fliken till den önskade positionen bland de andra flikarna." + + #. (itstool) path: item/p +-#: C/gs-tabs.page:115 C/gs-tabs.page:145 C/gs-tabs.page:170 ++#: C/gs-tabs.page:115 + msgid "Release the mouse button." + msgstr "Släpp musknappen." + +@@ -1625,54 +1625,6 @@ msgstr "" + "terminal till höger för att flytta fliken till höger. Detta kommer " + "ändra flikpositionen genom att flytta den en placering i taget." + +-#. (itstool) path: section/title +-#: C/gs-tabs.page:131 +-msgid "Move a tab to another Terminal window" +-msgstr "Flytta en flik till ett annat Terminal-fönster" +- +-#. (itstool) path: section/p +-#: C/gs-tabs.page:133 +-msgid "If you want to move a tab from one window to another:" +-msgstr "Om du vill flytta en flik från ett fönster till ett annat:" +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:139 +-msgid "Drag the tab to the new window." +-msgstr "Dra fliken till det nya fönstret." +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:142 +-msgid "Place it beside other tabs in the new window." +-msgstr "Placera den bredvid andra flikar i det nya fönstret." +- +-#. (itstool) path: note/p +-#: C/gs-tabs.page:150 +-msgid "" +-"You can move a tab from one window to another by dragging the tab to the " +-"Activities hot-corner of the GNOME Shell. This will " +-"reveal each of the open Terminal windows. You can release the tab " +-"that you are holding over the desired Terminal window." +-msgstr "" +-"Du kan flytta en flik från ett fönster till ett annat genom att dra fliken " +-"till Aktiviteter-hörnet i GNOME-skalet. Detta kommer " +-"att visa vart och ett av de öppna Terminal-fönstren. Du kan " +-"släppa fliken som du håller över det önskade Terminal-fönstret." +- +-#. (itstool) path: section/title +-#: C/gs-tabs.page:159 +-msgid "Move a tab to create a new Terminal window" +-msgstr "Flytta en flik för att skapa ett nytt Terminal-fönster" +- +-#. (itstool) path: section/p +-#: C/gs-tabs.page:161 +-msgid "To create a new window from an existing tab:" +-msgstr "För att skapa ett nytt fönster från en befintlig flik:" +- +-#. (itstool) path: item/p +-#: C/gs-tabs.page:167 +-msgid "Drag the tab out of the current Terminal window." +-msgstr "Dra fliken ut ur det aktuella Terminal-fönstret." +- + #. (itstool) path: info/title + #: C/index.page:8 + msgctxt "link" +@@ -1775,13 +1727,17 @@ msgstr "Skärmbild av GNOME Terminal" + #. update your localized copy. The msgstr is not used at all. Set it to + #. whatever you like once you have updated your copy of the file. + #: C/introduction.page:44 ++#| msgctxt "_" ++#| msgid "" ++#| "external ref='figures/gnome-terminal.png' " ++#| "md5='835c028558c16a9c263aaacfe5a1f81d'" + msgctxt "_" + msgid "" + "external ref='figures/gnome-terminal.png' " +-"md5='835c028558c16a9c263aaacfe5a1f81d'" ++"md5='9d9d04e06438b67ca403f9e56a6d28cc'" + msgstr "" + "external ref='figures/gnome-terminal.png' " +-"md5='835c028558c16a9c263aaacfe5a1f81d'" ++"md5='9d9d04e06438b67ca403f9e56a6d28cc'" + + #. (itstool) path: p/link + #: C/legal.xml:4 +@@ -2907,8 +2863,13 @@ msgstr "" + "Standardprofilen kan inte tas bort. Om du vill ta bort den profilen måste du " + "först sätta en annan profil som standard." + +-#. (itstool) path: page/p +-#: C/pref-profiles.page:258 ++#. (itstool) path: section/title ++#: C/pref-profiles.page:259 ++msgid "Set a default profile" ++msgstr "Ställa in en standardprofil" ++ ++#. (itstool) path: section/p ++#: C/pref-profiles.page:261 + msgid "" + "The default profile is loaded when a new terminal is opened unless you have " + "selected another profile. Any changes that you make to the settings will be " +@@ -2918,11 +2879,6 @@ msgstr "" + "annan profil. Alla ändringar som du gör till inställningarna kommer lagras i " + "den profil som för tillfället är vald." + +-#. (itstool) path: section/title +-#: C/pref-profiles.page:263 +-msgid "Set a default profile" +-msgstr "Ställa in en standardprofil" +- + #. (itstool) path: section/p + #: C/pref-profiles.page:265 + msgid "" +@@ -3847,6 +3803,39 @@ msgstr "" + "kommer du behöva använda modifieraren Skift för att " + "Terminal ska fånga musinmatningen." + ++#~ msgid "Move a tab to another Terminal window" ++#~ msgstr "Flytta en flik till ett annat Terminal-fönster" ++ ++#~ msgid "If you want to move a tab from one window to another:" ++#~ msgstr "Om du vill flytta en flik från ett fönster till ett annat:" ++ ++#~ msgid "Drag the tab to the new window." ++#~ msgstr "Dra fliken till det nya fönstret." ++ ++#~ msgid "Place it beside other tabs in the new window." ++#~ msgstr "Placera den bredvid andra flikar i det nya fönstret." ++ ++#~ msgid "" ++#~ "You can move a tab from one window to another by dragging the tab to the " ++#~ "Activities hot-corner of the GNOME Shell. This will " ++#~ "reveal each of the open Terminal windows. You can release the " ++#~ "tab that you are holding over the desired Terminal window." ++#~ msgstr "" ++#~ "Du kan flytta en flik från ett fönster till ett annat genom att dra " ++#~ "fliken till Aktiviteter-hörnet i GNOME-skalet. " ++#~ "Detta kommer att visa vart och ett av de öppna Terminal-" ++#~ "fönstren. Du kan släppa fliken som du håller över det önskade " ++#~ "Terminal-fönstret." ++ ++#~ msgid "Move a tab to create a new Terminal window" ++#~ msgstr "Flytta en flik för att skapa ett nytt Terminal-fönster" ++ ++#~ msgid "To create a new window from an existing tab:" ++#~ msgstr "För att skapa ett nytt fönster från en befintlig flik:" ++ ++#~ msgid "Drag the tab out of the current Terminal window." ++#~ msgstr "Dra fliken ut ur det aktuella Terminal-fönstret." ++ + #~ msgid "CtrlShiftC" + #~ msgstr "CtrlSkiftC" + +-- +2.20.1 + + +From 901c85f861f318939cd8338765f44c996eed8d95 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 29 Mar 2019 18:36:02 +0100 +Subject: [PATCH 8/8] headermenu: Add placeholder item for win.set-title + +... to match the ones in the main menubar and the notebook-menus. + +https://gitlab.gnome.org/GNOME/gnome-terminal/issues/97 +(cherry picked from commit 79beb57a5f3e9f644ea3f3c78b2da277a5a349d4) +--- + src/terminal-headermenu.ui | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/terminal-headermenu.ui b/src/terminal-headermenu.ui +index 0176e4c584ad..42d5296993f0 100644 +--- a/src/terminal-headermenu.ui ++++ b/src/terminal-headermenu.ui +@@ -50,6 +50,11 @@ + Read-_Only + win.read-only + ++ ++ Set _Title… ++ win.set-title ++ action-missing ++ +

+ + _Advanced +-- +2.20.1 + diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch index df06578..b9b9a26 100644 --- a/gnome-terminal-notify-open-title-transparency.patch +++ b/gnome-terminal-notify-open-title-transparency.patch @@ -1,7 +1,7 @@ -From 8f5870fcc2a63b4ea64c6fc9aa245564bc281ad7 Mon Sep 17 00:00:00 2001 +From 68b3fecbba942616a19eafb2821c208828ef305e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH 01/15] Restore transparency +Subject: [PATCH 01/17] Restore transparency The transparency settings were removed as a side effect of 2bff4b63ed3ceef6055e35563e9b0b33ad57349d @@ -206,10 +206,10 @@ index a85fcefd40e1..26202e4555ea 100644 static void diff --git a/src/terminal-window.c b/src/terminal-window.c -index 1d877a98275b..be6463b6b1b7 100644 +index 19198f49f7b5..5ba767c5fc87 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2115,6 +2115,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2125,6 +2125,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -218,7 +218,7 @@ index 1d877a98275b..be6463b6b1b7 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2130,6 +2132,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2140,6 +2142,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -234,10 +234,10 @@ index 1d877a98275b..be6463b6b1b7 100644 2.20.1 -From 7c18738498c84c522b14262d6b8669f337ebe729 Mon Sep 17 00:00:00 2001 +From 9dbba1eefd691c0e81e64df465e3f92176b3bf16 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 -Subject: [PATCH 02/15] window: Make the drawing robust across all themes +Subject: [PATCH 02/17] window: Make the drawing robust across all themes There are lots of themes out there in the wild that do not specify a background-color for all widgets and the default is transparent. This @@ -254,10 +254,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016 1 file changed, 21 insertions(+) diff --git a/src/terminal-window.c b/src/terminal-window.c -index be6463b6b1b7..7d87c2461e36 100644 +index 5ba767c5fc87..cdd69f9f4f52 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1969,6 +1969,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -1979,6 +1979,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } @@ -284,7 +284,7 @@ index be6463b6b1b7..7d87c2461e36 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2291,6 +2311,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2301,6 +2321,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -296,10 +296,10 @@ index be6463b6b1b7..7d87c2461e36 100644 2.20.1 -From 20ebad148e7e1fa1bb180daec5449d1a15effe60 Mon Sep 17 00:00:00 2001 +From 4521b3a8c6288a339950290bcc1ab39a12279980 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 -Subject: [PATCH 03/15] screen, window: Extra padding around transparent +Subject: [PATCH 03/17] screen, window: Extra padding around transparent terminals in Wayland https://bugzilla.redhat.com/show_bug.cgi?id=1207943 @@ -388,10 +388,10 @@ index 26202e4555ea..c0ce8a89126c 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 7d87c2461e36..2aba397fe922 100644 +index cdd69f9f4f52..6028ca8700d7 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1975,15 +1975,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -1985,15 +1985,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -423,10 +423,10 @@ index 7d87c2461e36..2aba397fe922 100644 2.20.1 -From d2c5bd5309e2b4171469784a4923e3c8d2c97b0e Mon Sep 17 00:00:00 2001 +From b7f6782abe84d0ceb42bb12ea734ab93ecc78c8e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 27 Feb 2017 16:53:51 +0100 -Subject: [PATCH 04/15] screen: Silence -Wunused variable +Subject: [PATCH 04/17] screen: Silence -Wunused variable https://bugzilla.redhat.com/show_bug.cgi?id=1207943 --- @@ -449,18 +449,307 @@ index c0ce8a89126c..1b763a3890dd 100644 2.20.1 -From 25f6d4f2c771440abf3623e001cfd2eca9f7b5f0 Mon Sep 17 00:00:00 2001 +From 6e7c40c2afd31c7db85a040284920e473716c49c Mon Sep 17 00:00:00 2001 From: Debarshi Ray -Date: Tue, 27 Jan 2015 18:40:13 +0100 -Subject: [PATCH 05/15] Support desktop notifications from OSC 777 +Date: Fri, 18 May 2018 20:15:34 +0200 +Subject: [PATCH 05/17] screen: Try harder to find a foreground process group + member + +For pipelined commands, it's possible that the process group leader, +whose PID is used as the group ID, has terminated but not the entire +group. eg., $ cat | less. Sadly, there's no nice user-space +API to list the members of a group, and crawling the entire /proc like +pgrep might be overkill if the system is overloaded. + +Therefore, the next 20 PIDs after the group ID and the first 20 PIDs +starting from 2 are checked in the hope that one of them would belong +to the foreground process group. + +Subsequent commits will use this to track the current foreground +process, instead of using the shell's history, to notify when a +long-running foreground process group terminates. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 1b763a3890dd..db281cbf13c5 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -2136,7 +2136,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, + #else + g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid); + if (!g_file_get_contents (filename, &data_buf, &len, NULL)) +- return TRUE; ++ { ++ int j; ++ ++ for (j = 0; j < 20; j++) ++ { ++ pid_t pgid; ++ pid_t pid; ++ ++ pid = (pid_t) (fgpid + 1 + j); ++ pgid = getpgid (pid); ++ if (pgid != fgpid) ++ { ++ pid = (pid_t) (2 + j); ++ pgid = getpgid (pid); ++ if (pgid != fgpid) ++ continue; ++ } ++ ++ g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", (int) pid); ++ ++ g_clear_pointer (&data_buf, g_free); ++ if (g_file_get_contents (filename, &data_buf, &len, NULL)) ++ break; ++ } ++ ++ if (j == 20) ++ return TRUE; ++ } ++ + data = data_buf; + #endif + +-- +2.20.1 + + +From 970a17996958ce1dda69e27fef5557d1893ae91c Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 3 May 2018 16:49:28 +0200 +Subject: [PATCH 06/17] screen: Track the current foreground process + +... using the interactive shell's precmd and preexec hooks, by +monitoring the contents of the terminal, and a combination of +tcgetpgrp(3) and /proc, instead of relying on the shell's history. + +The shell's history cannot be reliably used to find out the current +foreground process. The history can be optionally turned off, and when +job control is in play, it will mistakenly record 'fg' as the current +process. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-screen.c | 130 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 130 insertions(+) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index db281cbf13c5..d03f82b092aa 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -87,13 +87,17 @@ struct _TerminalScreenPrivate + GSettings *profile; /* never NULL */ + guint profile_changed_id; + guint profile_forgotten_id; ++ char *current_cmdline; + char *initial_working_directory; + char **initial_env; + char **override_command; ++ gboolean between_preexec_and_precmd; + gboolean shell; + int child_pid; + GSList *match_tags; ++ guint contents_changed_source_id; + guint launch_child_source_id; ++ guint shell_preexec_source_id; + }; + + enum +@@ -147,6 +151,12 @@ static gboolean terminal_screen_do_exec (TerminalScreen *screen, + static void terminal_screen_child_exited (VteTerminal *terminal, + int status); + ++static void terminal_screen_contents_changed (VteTerminal *terminal); ++ ++static void terminal_screen_shell_precmd (VteTerminal *terminal); ++ ++static void terminal_screen_shell_preexec (VteTerminal *terminal); ++ + static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, + TerminalScreen *screen); + +@@ -480,6 +490,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) + widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; + + terminal_class->child_exited = terminal_screen_child_exited; ++ terminal_class->contents_changed = terminal_screen_contents_changed; ++ terminal_class->shell_precmd = terminal_screen_shell_precmd; ++ terminal_class->shell_preexec = terminal_screen_shell_preexec; + + signals[PROFILE_SET] = + g_signal_new (I_("profile-set"), +@@ -586,12 +599,24 @@ terminal_screen_dispose (GObject *object) + 0, 0, NULL, NULL, + screen); + ++ if (priv->contents_changed_source_id != 0) ++ { ++ g_source_remove (priv->contents_changed_source_id); ++ priv->contents_changed_source_id = 0; ++ } ++ + if (priv->launch_child_source_id != 0) + { + g_source_remove (priv->launch_child_source_id); + priv->launch_child_source_id = 0; + } + ++ if (priv->shell_preexec_source_id != 0) ++ { ++ g_source_remove (priv->shell_preexec_source_id); ++ priv->shell_preexec_source_id = 0; ++ } ++ + G_OBJECT_CLASS (terminal_screen_parent_class)->dispose (object); + + /* Unregister *after* chaining up to the parent's dispose, +@@ -617,6 +642,7 @@ terminal_screen_finalize (GObject *object) + + terminal_screen_set_profile (screen, NULL); + ++ g_free (priv->current_cmdline); + g_free (priv->initial_working_directory); + g_strfreev (priv->override_command); + g_strfreev (priv->initial_env); +@@ -1760,6 +1786,110 @@ terminal_screen_child_exited (VteTerminal *terminal, + } + } + ++static gboolean ++terminal_screen_contents_changed_cb (TerminalScreen *screen) ++{ ++ TerminalScreenPrivate *priv = screen->priv; ++ gs_free char *cmdline = NULL; ++ ++ g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); ++ g_return_val_if_fail (priv->shell_preexec_source_id == 0, G_SOURCE_REMOVE); ++ ++ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ goto out; ++ ++ if (g_strcmp0 (priv->current_cmdline, cmdline) == 0) ++ goto out; ++ ++ g_free (priv->current_cmdline); ++ priv->current_cmdline = g_steal_pointer (&cmdline); ++ ++ out: ++ priv->contents_changed_source_id = 0; ++ return G_SOURCE_REMOVE; ++} ++ ++static void ++terminal_screen_contents_changed (VteTerminal *terminal) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (terminal); ++ TerminalScreenPrivate *priv = screen->priv; ++ ++ if (!priv->between_preexec_and_precmd) ++ return; ++ ++ if (priv->shell_preexec_source_id != 0) ++ return; ++ ++ if (priv->contents_changed_source_id != 0) ++ return; ++ ++ priv->contents_changed_source_id = g_timeout_add (500, ++ (GSourceFunc) terminal_screen_contents_changed_cb, ++ screen); ++} ++ ++static void ++terminal_screen_shell_precmd (VteTerminal *terminal) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (terminal); ++ TerminalScreenPrivate *priv = screen->priv; ++ ++ priv->between_preexec_and_precmd = FALSE; ++ ++ if (priv->contents_changed_source_id != 0) ++ { ++ g_source_remove (priv->contents_changed_source_id); ++ priv->contents_changed_source_id = 0; ++ } ++ ++ if (priv->shell_preexec_source_id != 0) ++ { ++ g_source_remove (priv->shell_preexec_source_id); ++ priv->shell_preexec_source_id = 0; ++ } ++ ++ g_clear_pointer (&priv->current_cmdline, g_free); ++} ++ ++static gboolean ++terminal_screen_shell_preexec_cb (TerminalScreen *screen) ++{ ++ TerminalScreenPrivate *priv = screen->priv; ++ gboolean retval = G_SOURCE_CONTINUE; ++ gs_free char *cmdline = NULL; ++ ++ g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); ++ g_return_val_if_fail (priv->current_cmdline == NULL, G_SOURCE_REMOVE); ++ ++ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ goto out; ++ ++ priv->current_cmdline = g_steal_pointer (&cmdline); ++ ++ priv->shell_preexec_source_id = 0; ++ retval = G_SOURCE_REMOVE; ++ ++ out: ++ return retval; ++} ++ ++static void ++terminal_screen_shell_preexec (VteTerminal *terminal) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (terminal); ++ TerminalScreenPrivate *priv = screen->priv; ++ ++ g_return_if_fail (!priv->between_preexec_and_precmd); ++ g_return_if_fail (priv->contents_changed_source_id == 0); ++ g_return_if_fail (priv->current_cmdline == NULL); ++ g_return_if_fail (priv->shell_preexec_source_id == 0); ++ ++ priv->between_preexec_and_precmd = TRUE; ++ ++ priv->shell_preexec_source_id = g_timeout_add (200, (GSourceFunc) terminal_screen_shell_preexec_cb, screen); ++} ++ + static void + terminal_screen_drag_data_received (GtkWidget *widget, + GdkDragContext *context, +-- +2.20.1 + + +From 55f2a5242b59c6f55c077d611a22921a0e15b8b5 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 10 May 2018 19:23:16 +0200 +Subject: [PATCH 07/17] Notify when a long-running foreground process group + terminates + +Notifications are only sent if the VteTerminal in which the process +was running doesn't have the keyboard focus. If it's a tab in the +currently active window then the dialog-information-symbolic icon is +used to highlight the tab's label; otherwise a desktop-wide +notification is sent. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- src/terminal-app.c | 32 ++++++++++++ - src/terminal-screen.c | 108 +++++++++++++++++++++++++++++++++++++++ - src/terminal-tab-label.c | 28 +++++++++- + src/terminal-screen.c | 102 +++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.c | 30 +++++++++++- src/terminal-tab-label.h | 4 ++ - 4 files changed, 171 insertions(+), 1 deletion(-) + 4 files changed, 167 insertions(+), 1 deletion(-) diff --git a/src/terminal-app.c b/src/terminal-app.c index ab1c81a6b554..34c53f40904b 100644 @@ -520,7 +809,7 @@ index ab1c81a6b554..34c53f40904b 100644 app_load_css (application); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 1b763a3890dd..ced2cdfe8a30 100644 +index d03f82b092aa..94b077cc7141 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -55,6 +55,7 @@ @@ -531,32 +820,21 @@ index 1b763a3890dd..ced2cdfe8a30 100644 #include "terminal-util.h" #include "terminal-window.h" #include "terminal-info-bar.h" -@@ -91,6 +92,7 @@ struct _TerminalScreenPrivate - char **initial_env; - char **override_command; - gboolean shell; -+ gboolean shell_prompt_shown; - int child_pid; - GSList *match_tags; - guint launch_child_source_id; -@@ -141,11 +143,16 @@ static gboolean terminal_screen_button_press (GtkWidget *widget, +@@ -143,8 +144,13 @@ static void terminal_screen_system_font_changed_cb (GSettings *, + static gboolean terminal_screen_popup_menu (GtkWidget *widget); + static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event); - static void terminal_screen_hierarchy_changed (GtkWidget *widget, - GtkWidget *previous_toplevel); ++ +static gboolean terminal_screen_focus_in (GtkWidget *widget, + GdkEventFocus *event); ++ + static void terminal_screen_hierarchy_changed (GtkWidget *widget, + GtkWidget *previous_toplevel); ++ static gboolean terminal_screen_do_exec (TerminalScreen *screen, FDSetupData *data, GError **error); - static void terminal_screen_child_exited (VteTerminal *terminal, - int status); -+static void terminal_screen_notification_received (VteTerminal *terminal, -+ const char *summary, -+ const char *body); - - static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, - TerminalScreen *screen); -@@ -472,6 +479,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -482,6 +488,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) object_class->get_property = terminal_screen_get_property; object_class->set_property = terminal_screen_set_property; @@ -564,15 +842,7 @@ index 1b763a3890dd..ced2cdfe8a30 100644 widget_class->realize = terminal_screen_realize; widget_class->style_updated = terminal_screen_style_updated; widget_class->drag_data_received = terminal_screen_drag_data_received; -@@ -480,6 +488,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) - widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; - - terminal_class->child_exited = terminal_screen_child_exited; -+ terminal_class->notification_received = terminal_screen_notification_received; - - signals[PROFILE_SET] = - g_signal_new (I_("profile-set"), -@@ -575,6 +584,10 @@ terminal_screen_dispose (GObject *object) +@@ -588,6 +595,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -583,7 +853,7 @@ index 1b763a3890dd..ced2cdfe8a30 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1664,6 +1677,43 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1690,6 +1701,43 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -627,25 +897,16 @@ index 1b763a3890dd..ced2cdfe8a30 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1760,6 +1810,64 @@ terminal_screen_child_exited (VteTerminal *terminal, - } +@@ -1829,6 +1877,57 @@ terminal_screen_contents_changed (VteTerminal *terminal) + screen); } +static void -+terminal_screen_notification_received (VteTerminal *terminal, -+ const char *summary, -+ const char *body) ++terminal_screen_show_notification (TerminalScreen *screen) +{ -+ TerminalScreen *screen = TERMINAL_SCREEN (terminal); + TerminalScreenPrivate *priv = screen->priv; + TerminalWindow *window; + -+ if (G_UNLIKELY (!priv->shell_prompt_shown)) -+ { -+ priv->shell_prompt_shown = TRUE; -+ return; -+ } -+ + window = terminal_screen_get_window (screen); + if (window == NULL) + return; @@ -670,7 +931,9 @@ index 1b763a3890dd..ced2cdfe8a30 100644 + + tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); + terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); -+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), ++ "dialog-information-symbolic", ++ _("Command completed")); + } + } + else @@ -679,8 +942,8 @@ index 1b763a3890dd..ced2cdfe8a30 100644 + TerminalApp *app; + gs_free char *detailed_action = NULL; + -+ notification = g_notification_new (summary); -+ g_notification_set_body (notification, body); ++ notification = g_notification_new (_("Command completed")); ++ g_notification_set_body (notification, priv->current_cmdline); + detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid); + g_notification_set_default_action (notification, detailed_action); + @@ -690,10 +953,20 @@ index 1b763a3890dd..ced2cdfe8a30 100644 +} + static void - terminal_screen_drag_data_received (GtkWidget *widget, - GdkDragContext *context, + terminal_screen_shell_precmd (VteTerminal *terminal) + { +@@ -1849,6 +1948,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) + priv->shell_preexec_source_id = 0; + } + ++ if (priv->current_cmdline != NULL) ++ terminal_screen_show_notification (screen); ++ + g_clear_pointer (&priv->current_cmdline, g_free); + } + diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c -index cdd73d0653be..d6909a13ca65 100644 +index cdd73d0653be..7f2026952510 100644 --- a/src/terminal-tab-label.c +++ b/src/terminal-tab-label.c @@ -34,6 +34,7 @@ @@ -724,7 +997,7 @@ index cdd73d0653be..d6909a13ca65 100644 priv->label = label = gtk_label_new (NULL); gtk_widget_set_halign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); -@@ -376,6 +381,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, +@@ -376,6 +381,29 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, pango_attr_list_unref (attr_list); } @@ -744,6 +1017,8 @@ index cdd73d0653be..d6909a13ca65 100644 +{ + TerminalTabLabelPrivate *priv = tab_label->priv; + ++ g_return_if_fail (TERMINAL_IS_TAB_LABEL (tab_label)); ++ + gtk_widget_set_visible (priv->icon, icon_name != NULL); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip); @@ -771,20 +1046,20 @@ index 20cfbceb36b0..a987025e0524 100644 2.20.1 -From 2083a7c75377bc66d8ab697c63a0195a446f7b8c Mon Sep 17 00:00:00 2001 +From 50167b56cc2a1f80329ca74957e6dcb3bb5dac69 Mon Sep 17 00:00:00 2001 From: Debarshi Ray -Date: Thu, 29 Jan 2015 11:47:21 +0100 -Subject: [PATCH 06/15] Sprinkle debug messages for notifications +Date: Tue, 2 Apr 2019 16:37:48 +0200 +Subject: [PATCH 08/17] Sprinkle debug messages for notifications This can be useful for finding out whether the escape sequence wasn't emitted or the filtering was faulty. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-debug.c | 1 + - src/terminal-debug.h | 3 ++- - src/terminal-screen.c | 6 ++++++ - 3 files changed, 9 insertions(+), 1 deletion(-) + src/terminal-debug.c | 1 + + src/terminal-debug.h | 3 ++- + src/terminal-screen.c | 10 ++++++++++ + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/terminal-debug.c b/src/terminal-debug.c index d08829e93ff4..3748e7edebe7 100644 @@ -813,10 +1088,10 @@ index 0fafcc3a846c..af1358683994 100644 void _terminal_debug_init(void); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index ced2cdfe8a30..36a9afa3ded9 100644 +index 94b077cc7141..e58c69741c37 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1685,6 +1685,8 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1709,6 +1709,8 @@ terminal_screen_focus_in (GtkWidget *widget, TerminalApp *app; TerminalWindow *window; @@ -825,24 +1100,25 @@ index ced2cdfe8a30..36a9afa3ded9 100644 window = terminal_screen_get_window (screen); if (window != NULL) { -@@ -1819,6 +1821,8 @@ terminal_screen_notification_received (VteTerminal *terminal, - TerminalScreenPrivate *priv = screen->priv; - TerminalWindow *window; +@@ -1851,6 +1853,9 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) -+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body); -+ - if (G_UNLIKELY (!priv->shell_prompt_shown)) - { - priv->shell_prompt_shown = TRUE; -@@ -1850,6 +1854,7 @@ terminal_screen_notification_received (VteTerminal *terminal, - tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); - terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); - terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); + g_free (priv->current_cmdline); + priv->current_cmdline = g_steal_pointer (&cmdline); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, ++ "Current foreground command-line: %s\n", ++ priv->current_cmdline); + + out: + priv->contents_changed_source_id = 0; +@@ -1910,6 +1915,7 @@ terminal_screen_show_notification (TerminalScreen *screen) + terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), + "dialog-information-symbolic", + _("Command completed")); + _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n"); } } else -@@ -1865,6 +1870,7 @@ terminal_screen_notification_received (VteTerminal *terminal, +@@ -1925,6 +1931,7 @@ terminal_screen_show_notification (TerminalScreen *screen) app = terminal_app_get (); g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); @@ -850,14 +1126,24 @@ index ced2cdfe8a30..36a9afa3ded9 100644 } } +@@ -1968,6 +1975,9 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) + goto out; + + priv->current_cmdline = g_steal_pointer (&cmdline); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, ++ "Current foreground command-line: %s\n", ++ priv->current_cmdline); + + priv->shell_preexec_source_id = 0; + retval = G_SOURCE_REMOVE; -- 2.20.1 -From e304bd989e75e9299c62bcbae51b1313a94f10f8 Mon Sep 17 00:00:00 2001 +From 6748a25e2c04fecb567eddb732518949fd042630 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 -Subject: [PATCH 07/15] profile: Split the Command tab into two nested GtkGrids +Subject: [PATCH 09/17] profile: Split the Command tab into two nested GtkGrids This will let the subsequent patch add a "Command" sub-heading to keep the command settings separate from the to-be-restored title settings. @@ -1061,10 +1347,10 @@ index 47f1cf8abce2..b35cf5e8999a 100644 2.20.1 -From 78dfc50211cc2628fb5a6602fc00bdcb3558ccff Mon Sep 17 00:00:00 2001 +From 96a4c8fe7b39193de0e12a79c2230af9e5a82a93 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 -Subject: [PATCH 08/15] Revert "profile: Remove the "Command" sub-heading" +Subject: [PATCH 10/17] Revert "profile: Remove the "Command" sub-heading" This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c. @@ -1285,10 +1571,10 @@ index b35cf5e8999a..a4b2027ff300 100644 2.20.1 -From c99b0a0e8d7ea0b10140c3cd2fcc74265e626c73 Mon Sep 17 00:00:00 2001 +From d8328fa5c20612a0c4eec0577ab27a8e82e6a566 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 -Subject: [PATCH 09/15] Revert "screen: Remove unused description and +Subject: [PATCH 11/17] Revert "screen: Remove unused description and user_title API" This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. @@ -1300,18 +1586,18 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 2 files changed, 68 insertions(+) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 36a9afa3ded9..8e6f2e935ba4 100644 +index e58c69741c37..4e3f7606b85a 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -88,6 +88,7 @@ struct _TerminalScreenPrivate - GSettings *profile; /* never NULL */ +@@ -89,6 +89,7 @@ struct _TerminalScreenPrivate guint profile_changed_id; guint profile_forgotten_id; + char *current_cmdline; + char *title; char *initial_working_directory; char **initial_env; char **override_command; -@@ -111,6 +112,7 @@ enum { +@@ -114,6 +115,7 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -1319,7 +1605,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 PROP_INITIAL_ENVIRONMENT }; -@@ -435,6 +437,9 @@ terminal_screen_get_property (GObject *object, +@@ -444,6 +446,9 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -1329,7 +1615,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -458,6 +463,7 @@ terminal_screen_set_property (GObject *object, +@@ -467,6 +472,7 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_initial_environment (screen, g_value_get_boxed (value)); break; case PROP_TITLE: @@ -1337,7 +1623,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -545,6 +551,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -556,6 +562,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); @@ -1351,15 +1637,15 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 g_object_class_install_property (object_class, PROP_INITIAL_ENVIRONMENT, -@@ -630,6 +643,7 @@ terminal_screen_finalize (GObject *object) - +@@ -654,6 +667,7 @@ terminal_screen_finalize (GObject *object) terminal_screen_set_profile (screen, NULL); + g_free (priv->current_cmdline); + g_free (priv->title); g_free (priv->initial_working_directory); g_strfreev (priv->override_command); g_strfreev (priv->initial_env); -@@ -758,6 +772,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -782,6 +796,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1381,7 +1667,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1075,6 +1104,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1099,6 +1128,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1389,7 +1675,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 } GSettings* -@@ -1405,6 +1435,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1429,6 +1459,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1398,7 +1684,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 if (error) { GtkWidget *info_bar; -@@ -1716,6 +1748,35 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1740,6 +1772,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1434,7 +1720,7 @@ index 36a9afa3ded9..8e6f2e935ba4 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1769,6 +1830,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1793,6 +1854,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -1464,10 +1750,10 @@ index ff77fcf78947..af9583e7cbaf 100644 2.20.1 -From c6b1a7d08c2b7730c82515af6a1d89ee849d9716 Mon Sep 17 00:00:00 2001 +From f5d8758854f1e90d756b451745adc05264f92376 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 -Subject: [PATCH 10/15] Revert "Remove the static title setting from profile +Subject: [PATCH 12/17] Revert "Remove the static title setting from profile preferences" This reverts commit e9cb8fea14a849704074c5d69f173bcf4dc2fb27. @@ -1608,10 +1894,10 @@ index a386938b64c5..f9222855b231 100644 #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 8e6f2e935ba4..bf3618cb41b0 100644 +index 4e3f7606b85a..077f6b5fa042 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -776,11 +776,14 @@ char * +@@ -800,11 +800,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; @@ -1626,7 +1912,7 @@ index 8e6f2e935ba4..bf3618cb41b0 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -825,6 +828,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -849,6 +852,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); } @@ -1643,10 +1929,10 @@ index 8e6f2e935ba4..bf3618cb41b0 100644 2.20.1 -From cd51ab2d849fad93f796abad338da19aa4ec05b7 Mon Sep 17 00:00:00 2001 +From 5f2d8477699c3e67f90fda9b6dde95c33c813344 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 -Subject: [PATCH 11/15] Restore translations for setting a title and +Subject: [PATCH 13/17] Restore translations for setting a title and transparency --- @@ -1808,10 +2094,10 @@ index fcec2668aa11..9e07cb682c57 100644 #~ msgid "Keyboard Shortcuts" #~ msgstr "Alcorces de teclau" diff --git a/po/ar.po b/po/ar.po -index 6f5e80cc2a66..53e15b97f312 100644 +index fac62fd10680..f77804d8aec4 100644 --- a/po/ar.po +++ b/po/ar.po -@@ -2553,11 +2553,11 @@ msgstr "أغ_لق النافذة" +@@ -2574,11 +2574,11 @@ msgstr "أغ_لق النافذة" #~ msgid "Default size:" #~ msgstr "الحجم المبدئي:" @@ -1827,7 +2113,7 @@ index 6f5e80cc2a66..53e15b97f312 100644 #~ msgid "Title and Command" #~ msgstr "العنوان والأمر" -@@ -2565,8 +2565,8 @@ msgstr "أغ_لق النافذة" +@@ -2586,8 +2586,8 @@ msgstr "أغ_لق النافذة" #~ msgid "_Unlimited" #~ msgstr "_غير محدود" @@ -1838,7 +2124,7 @@ index 6f5e80cc2a66..53e15b97f312 100644 #~ msgid "Current Locale" #~ msgstr "المحليّة الحالية" -@@ -3309,8 +3309,8 @@ msgstr "أغ_لق النافذة" +@@ -3330,8 +3330,8 @@ msgstr "أغ_لق النافذة" #~ msgid "Background image _scrolls" #~ msgstr "صورة الخلفية ت_لتف" @@ -2786,10 +3072,10 @@ index 2d7dc5b14008..8d3d0529df61 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" diff --git a/po/hr.po b/po/hr.po -index aec2eaa8bac1..207b5c774b32 100644 +index 9722611b3bca..28c07301cb7e 100644 --- a/po/hr.po +++ b/po/hr.po -@@ -2565,3 +2565,13 @@ msgstr "_Zatvori prozor" +@@ -2574,3 +2574,13 @@ msgstr "_Zatvori prozor" #~ msgid "Use transparency from system theme" #~ msgstr "Koristi prozirnost iz teme sustava" @@ -4442,10 +4728,10 @@ index e740ebc6df0b..2fa8c3236b8f 100644 2.20.1 -From 036613a31dee236b01c3a6cdc14c93824c8faa5e Mon Sep 17 00:00:00 2001 +From bca0bdaebcab6cedfd086c2febf0533abaa1ddf6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 -Subject: [PATCH 12/15] Restore the action and shortcut to set a static title +Subject: [PATCH 14/17] Restore the action and shortcut to set a static title from the menus This reverts 9bbe19e98f62aa3c9020913a3a5a8080a5177505 with various @@ -4494,7 +4780,7 @@ index 75ac3a1e4b65..b39e80b5533d 100644 static KeyEntry tabs_entries[] = { diff --git a/src/terminal-window.c b/src/terminal-window.c -index 2aba397fe922..8d3ddd6f790b 100644 +index 6028ca8700d7..7fda0fe5128e 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -747,6 +747,80 @@ action_select_all_cb (GSimpleAction *action, @@ -4578,7 +4864,7 @@ index 2aba397fe922..8d3ddd6f790b 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2106,6 +2180,7 @@ terminal_window_init (TerminalWindow *window) +@@ -2116,6 +2190,7 @@ terminal_window_init (TerminalWindow *window) { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL }, { "reset", action_reset_cb, "b", NULL, NULL }, { "select-all", action_select_all_cb, NULL, NULL, NULL }, @@ -4590,10 +4876,10 @@ index 2aba397fe922..8d3ddd6f790b 100644 2.20.1 -From 8a2e5b834121adc8d24774e387f2f976ddefc5fc Mon Sep 17 00:00:00 2001 +From f173007ab444d745e058b60d11920b5d1faf9fd7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 -Subject: [PATCH 13/15] screen: Style fix +Subject: [PATCH 15/17] screen: Style fix This brings the code in line with how it was before de0dc7c2649c42e2aa02a66e4be27d262b34452d @@ -4604,10 +4890,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index bf3618cb41b0..6caa002ddece 100644 +index 077f6b5fa042..3a49baa07a3f 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -693,7 +693,7 @@ terminal_screen_new (GSettings *profile, +@@ -717,7 +717,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ @@ -4620,10 +4906,10 @@ index bf3618cb41b0..6caa002ddece 100644 2.20.1 -From 70c1eab1690d7b21f3ce8091d4171a6f2bf70496 Mon Sep 17 00:00:00 2001 +From 7f8811275cd23ef51fb8b0fb6c1507f8798502c9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 -Subject: [PATCH 14/15] Restore the rest of the title handling options and make +Subject: [PATCH 16/17] Restore the rest of the title handling options and make it all work This reverts commit f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8 and makes @@ -4774,13 +5060,13 @@ index f9222855b231..c5682c5eac83 100644 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 6caa002ddece..c5f3656bf321 100644 +index 3a49baa07a3f..c6062d78edf6 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -88,13 +88,16 @@ struct _TerminalScreenPrivate - GSettings *profile; /* never NULL */ +@@ -89,13 +89,16 @@ struct _TerminalScreenPrivate guint profile_changed_id; guint profile_forgotten_id; + char *current_cmdline; - char *title; + char *raw_title; + char *cooked_title; @@ -4788,14 +5074,14 @@ index 6caa002ddece..c5f3656bf321 100644 char *initial_working_directory; char **initial_env; char **override_command; + gboolean between_preexec_and_precmd; gboolean shell; - gboolean shell_prompt_shown; int child_pid; + gboolean user_title; /* title was manually set */ GSList *match_tags; + guint contents_changed_source_id; guint launch_child_source_id; - }; -@@ -112,7 +115,6 @@ enum { +@@ -115,7 +118,6 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -4803,7 +5089,7 @@ index 6caa002ddece..c5f3656bf321 100644 PROP_INITIAL_ENVIRONMENT }; -@@ -161,8 +163,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal +@@ -170,8 +172,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal static void update_color_scheme (TerminalScreen *screen); @@ -4817,7 +5103,7 @@ index 6caa002ddece..c5f3656bf321 100644 static void terminal_screen_check_extra (TerminalScreen *screen, GdkEvent *event, char **number_info); -@@ -401,6 +408,9 @@ terminal_screen_init (TerminalScreen *screen) +@@ -410,6 +417,9 @@ terminal_screen_init (TerminalScreen *screen) gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); @@ -4827,7 +5113,7 @@ index 6caa002ddece..c5f3656bf321 100644 g_signal_connect (screen, "window-title-changed", G_CALLBACK (terminal_screen_window_title_changed), screen); -@@ -437,9 +447,6 @@ terminal_screen_get_property (GObject *object, +@@ -446,9 +456,6 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -4837,7 +5123,7 @@ index 6caa002ddece..c5f3656bf321 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -463,7 +470,6 @@ terminal_screen_set_property (GObject *object, +@@ -472,7 +479,6 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_initial_environment (screen, g_value_get_boxed (value)); break; case PROP_TITLE: @@ -4845,7 +5131,7 @@ index 6caa002ddece..c5f3656bf321 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -551,13 +557,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -562,13 +568,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); @@ -4859,10 +5145,10 @@ index 6caa002ddece..c5f3656bf321 100644 g_object_class_install_property (object_class, PROP_INITIAL_ENVIRONMENT, -@@ -643,7 +642,9 @@ terminal_screen_finalize (GObject *object) - +@@ -667,7 +666,9 @@ terminal_screen_finalize (GObject *object) terminal_screen_set_profile (screen, NULL); + g_free (priv->current_cmdline); - g_free (priv->title); + g_free (priv->raw_title); + g_free (priv->cooked_title); @@ -4870,7 +5156,7 @@ index 6caa002ddece..c5f3656bf321 100644 g_free (priv->initial_working_directory); g_strfreev (priv->override_command); g_strfreev (priv->initial_env); -@@ -690,28 +691,8 @@ terminal_screen_new (GSettings *profile, +@@ -714,28 +715,8 @@ terminal_screen_new (GSettings *profile, g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS_KEY), g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY)); @@ -4901,7 +5187,7 @@ index 6caa002ddece..c5f3656bf321 100644 priv->initial_working_directory = g_strdup (working_dir); -@@ -766,34 +747,145 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -790,34 +771,145 @@ terminal_screen_exec (TerminalScreen *screen, return terminal_screen_do_exec (screen, data, error); } @@ -4996,7 +5282,10 @@ index 6caa002ddece..c5f3656bf321 100644 + for (arg = format; *arg; arg += 2) + { + const char *text_to_append = NULL; -+ + +- return g_strdup_printf ("%s — %d", +- title && title[0] ? title : _("Terminal"), +- screen->priv->child_pid); + g_assert (arg[0] == '%'); + + switch (arg[1]) @@ -5017,15 +5306,12 @@ index 6caa002ddece..c5f3656bf321 100644 + default: + g_assert_not_reached (); + } - -- return g_strdup_printf ("%s — %d", -- title && title[0] ? title : _("Terminal"), -- screen->priv->child_pid); ++ + if (!text_to_append || !text_to_append[0]) + continue; + + if (add_sep && title->len > 0) -+ g_string_append (title, " - "); ++ g_string_append (title, " — "); + + g_string_append (title, text_to_append); + add_sep = FALSE; @@ -5059,7 +5345,7 @@ index 6caa002ddece..c5f3656bf321 100644 { TerminalScreenPrivate *priv = screen->priv; GObject *object = G_OBJECT (screen); -@@ -829,9 +921,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -853,9 +945,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5071,7 +5357,7 @@ index 6caa002ddece..c5f3656bf321 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1113,7 +1206,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1137,7 +1230,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5079,7 +5365,7 @@ index 6caa002ddece..c5f3656bf321 100644 } GSettings* -@@ -1444,8 +1536,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1468,8 +1560,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5088,7 +5374,7 @@ index 6caa002ddece..c5f3656bf321 100644 if (error) { GtkWidget *info_bar; -@@ -1757,33 +1847,45 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1781,33 +1871,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5150,7 +5436,7 @@ index 6caa002ddece..c5f3656bf321 100644 } /** -@@ -1816,7 +1918,9 @@ static void +@@ -1840,7 +1942,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5161,7 +5447,7 @@ index 6caa002ddece..c5f3656bf321 100644 } static void -@@ -1839,8 +1943,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1863,8 +1967,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -5170,7 +5456,7 @@ index 6caa002ddece..c5f3656bf321 100644 action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); switch (action) -@@ -1884,6 +1986,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1908,6 +2010,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5191,9 +5477,9 @@ index 6caa002ddece..c5f3656bf321 100644 + } +} + - static void - terminal_screen_notification_received (VteTerminal *terminal, - const char *summary, + static gboolean + terminal_screen_contents_changed_cb (TerminalScreen *screen) + { diff --git a/src/terminal-screen.h b/src/terminal-screen.h index af9583e7cbaf..a75bd4f06659 100644 --- a/src/terminal-screen.h @@ -5219,7 +5505,7 @@ index af9583e7cbaf..a75bd4f06659 100644 void terminal_screen_get_size (TerminalScreen *screen, diff --git a/src/terminal-window.c b/src/terminal-window.c -index 8d3ddd6f790b..74af1c649f34 100644 +index 7fda0fe5128e..6f81c7da4a66 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -765,6 +765,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, @@ -5235,7 +5521,7 @@ index 8d3ddd6f790b..74af1c649f34 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2545,14 +2551,11 @@ sync_screen_title (TerminalScreen *screen, +@@ -2555,14 +2561,11 @@ sync_screen_title (TerminalScreen *screen, TerminalWindow *window) { TerminalWindowPrivate *priv = window->priv; @@ -5255,32 +5541,161 @@ index 8d3ddd6f790b..74af1c649f34 100644 2.20.1 -From 4b427ab8939ad20dacbed6bd1f98fdd8d0a1bb19 Mon Sep 17 00:00:00 2001 +From 341b1bf6da9d3ccaa062ffac59da4ca6ba79ecc8 Mon Sep 17 00:00:00 2001 From: Debarshi Ray -Date: Fri, 29 Mar 2019 18:36:02 +0100 -Subject: [PATCH 15/15] headermenu: Add placeholder item for win.set-title +Date: Wed, 3 Apr 2019 15:38:09 +0200 +Subject: [PATCH 17/17] Update the title with the current foreground process -... to match the ones in the main menubar and the notebook-menus. +https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- - src/terminal-headermenu.ui | 5 +++++ - 1 file changed, 5 insertions(+) + src/org.gnome.Terminal.gschema.xml | 5 +++++ + src/terminal-schemas.h | 1 + + src/terminal-screen.c | 33 +++++++++++++++++++++++++++++- + 3 files changed, 38 insertions(+), 1 deletion(-) -diff --git a/src/terminal-headermenu.ui b/src/terminal-headermenu.ui -index 0176e4c584ad..42d5296993f0 100644 ---- a/src/terminal-headermenu.ui -+++ b/src/terminal-headermenu.ui -@@ -50,6 +50,11 @@ - Read-_Only - win.read-only - -+ -+ Set _Title… -+ win.set-title -+ action-missing -+ -
- - _Advanced +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index 641e0203b045..ea0398b77dfe 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -254,6 +254,11 @@ + Whether to scroll to the bottom when there’s new output + If true, whenever there’s new output the terminal will scroll to the bottom. + ++ ++ true ++ Whether to show the current foreground process in the title ++ If true, the current foreground process will be shown in the window and tab titles. ++ + + 'close' + What to do with the terminal when the child command exits +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index c5682c5eac83..c894b38e4eca 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -65,6 +65,7 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy" + #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" + #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" ++#define TERMINAL_PROFILE_SHOW_FOREGROUND_PROCESS_IN_TITLE "show-foreground-process-in-title" + #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" + #define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode" + #define TERMINAL_PROFILE_TITLE_KEY "title" +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index c6062d78edf6..9b7a1b50f0c7 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -97,7 +97,9 @@ struct _TerminalScreenPrivate + char **override_command; + gboolean between_preexec_and_precmd; + gboolean shell; ++ gboolean show_foreground_process; + int child_pid; ++ gboolean application_title; /* title was set by an application */ + gboolean user_title; /* title was manually set */ + GSList *match_tags; + guint contents_changed_source_id; +@@ -886,6 +888,15 @@ terminal_screen_format_title (TerminalScreen *screen, + add_sep = FALSE; + } + ++ if (priv->show_foreground_process && ++ !priv->application_title && ++ !priv->user_title && ++ priv->current_cmdline != NULL && ++ priv->current_cmdline[0] != '\0') ++ { ++ g_string_append_printf (title, " — %s", priv->current_cmdline); ++ } ++ + if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) + { + g_free (*titleptr); +@@ -915,6 +926,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, + GObject *object = G_OBJECT (screen); + VteTerminal *vte_terminal = VTE_TERMINAL (screen); + TerminalWindow *window; ++ gboolean cook_title = FALSE; + + g_object_freeze_notify (object); + +@@ -948,7 +960,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) || + prop_name == I_(TERMINAL_PROFILE_TITLE_KEY)) + { +- terminal_screen_cook_title (screen); ++ cook_title = TRUE; + } + + if (gtk_widget_get_realized (GTK_WIDGET (screen)) && +@@ -976,6 +988,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) + update_color_scheme (screen); + ++ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SHOW_FOREGROUND_PROCESS_IN_TITLE)) ++ { ++ priv->show_foreground_process = g_settings_get_boolean (profile, ++ TERMINAL_PROFILE_SHOW_FOREGROUND_PROCESS_IN_TITLE); ++ cook_title = TRUE; ++ } ++ + if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) + vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY)); + +@@ -1032,6 +1051,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, + vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); + } + ++ if (cook_title) ++ terminal_screen_cook_title (screen); ++ + g_object_thaw_notify (object); + } + +@@ -1942,6 +1964,9 @@ static void + terminal_screen_window_title_changed (VteTerminal *vte_terminal, + TerminalScreen *screen) + { ++ TerminalScreenPrivate *priv = screen->priv; ++ ++ priv->application_title = priv->between_preexec_and_precmd; + terminal_screen_set_dynamic_title (screen, + vte_terminal_get_window_title (vte_terminal), + FALSE); +@@ -2048,6 +2073,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) + "Current foreground command-line: %s\n", + priv->current_cmdline); + ++ terminal_screen_cook_title (screen); ++ + out: + priv->contents_changed_source_id = 0; + return G_SOURCE_REMOVE; +@@ -2132,6 +2159,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) + TerminalScreen *screen = TERMINAL_SCREEN (terminal); + TerminalScreenPrivate *priv = screen->priv; + ++ priv->application_title = FALSE; + priv->between_preexec_and_precmd = FALSE; + + if (priv->contents_changed_source_id != 0) +@@ -2150,6 +2178,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) + terminal_screen_show_notification (screen); + + g_clear_pointer (&priv->current_cmdline, g_free); ++ terminal_screen_cook_title (screen); + } + + static gboolean +@@ -2170,6 +2199,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) + "Current foreground command-line: %s\n", + priv->current_cmdline); + ++ terminal_screen_cook_title (screen); ++ + priv->shell_preexec_source_id = 0; + retval = G_SOURCE_REMOVE; + -- 2.20.1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 984f2dc..9c513cd 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,7 +7,7 @@ Name: gnome-terminal Version: 3.32.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ @@ -15,6 +15,8 @@ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/gnome-terminal/3.32/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override +Patch0: gnome-terminal-backports-from-upstream.patch + Patch100: gnome-terminal-notify-open-title-transparency.patch Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch @@ -59,6 +61,7 @@ option to the right-click context menu in Nautilus. %prep %setup -q +%patch0 -p1 -b .backports %patch100 -p1 -b .notify-open-title-transparency %patch101 -p1 -b .warnings @@ -106,6 +109,13 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Wed Apr 03 2019 Debarshi Ray - 3.32.0-2 +- Automatically update the title with the current foreground process. +- Rewrite the command-notify patches to use the interactive shell's precmd and + preexec hooks, instead of only the precmd hook and the history. +- Backport yet-to-be-released patches from upstream to avoid translation + conflicts. + * Fri Mar 29 2019 Debarshi Ray - 3.32.0-1 - Update to 3.32.0