From 98c895613031c08567165e07b9709da950605ad5 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 20 Mar 2017 23:42:13 +0100 Subject: [PATCH 01/12] GIT_SILENT Upgrade KDE Applications version to 17.03.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 737cb3f7..b095dbc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 931a33e2dd288f9fd7a9fb9e0fa3adf3a60743bf Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 5 Apr 2017 21:50:45 +0200 Subject: [PATCH 02/12] GIT_SILENT Upgrade KDE Applications version to 17.03.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b095dbc1..00dda394 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 6d545ed44cb7603cd350be58646130179a6da79d Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 12 Apr 2017 13:35:42 +0200 Subject: [PATCH 03/12] GIT_SILENT Upgrade KDE Applications version to 17.04.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00dda394..033e0b4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") -set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "90") +set (KDE_APPLICATIONS_VERSION_MINOR "04") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 355ca4063ced46ea990e68e5abdda62826386f2c Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Mon, 24 Apr 2017 23:28:01 -0400 Subject: [PATCH 04/12] Correct ANSI string terminator Use the correct decimal value 27 In bash, PS1="\e]0;\e\\" or PS1="\e]0;<title>\033" BUG: 231405 Differential Revision: https://phabricator.kde.org/D5576 (cherry picked from commit 7a41b73b46d1f774e82eb64a8b66920e411ccd3c) --- src/Vt102Emulation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp index e71567ea..51fb59f2 100644 --- a/src/Vt102Emulation.cpp +++ b/src/Vt102Emulation.cpp @@ -280,7 +280,7 @@ void Vt102Emulation::initTokenizer() #define epe( ) (p >= 3 && s[2] == '!') #define egt( ) (p >= 3 && s[2] == '>') #define Xpe (tokenBufferPos >= 2 && tokenBuffer[1] == ']') -#define Xte (Xpe && (cc == 7 || cc == 33)) +#define Xte (Xpe && (cc == 7 || cc == 27)) #define ces(C) (cc < 256 && (charClass[cc] & (C)) == (C) && !Xte) #define CNTL(c) ((c)-'@') From 4e1f489e3437adf150780c424c03aa129ff41aab Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg <kurt.hindenburg@gmail.com> Date: Fri, 21 Apr 2017 21:40:32 -0400 Subject: [PATCH 05/12] Add check for valid container (possible crash fix) Possible fix for crashes from ambiguous shortcuts. I have been unable to duplicate the crashes. CCBUG: 375540 (cherry picked from commit a2b6a81b45680deaa0dca62f502d52ef49b359bd) --- src/ViewManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index 68dc6ac6..fa45babb 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -914,6 +914,9 @@ void ViewManager::saveSessions(KConfigGroup& group) // first: sessions in the active container, preserving the order ViewContainer* container = _viewSplitter->activeContainer(); Q_ASSERT(container); + if (container == nullptr) { + return; + } TerminalDisplay* activeview = qobject_cast<TerminalDisplay*>(container->activeView()); QListIterator<QWidget*> viewIter(container->views()); From 4f3540f88a86cd011bda7b6f4da2cae3e805734b Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <aacid@kde.org> Date: Mon, 8 May 2017 12:55:23 +0200 Subject: [PATCH 06/12] GIT_SILENT Upgrade KDE Applications version to 17.04.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 033e0b4f..ed78cb69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 33c8b1c2280446f1c14213450a6f0f24c203ff84 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Fri, 12 May 2017 05:40:22 +0200 Subject: [PATCH 07/12] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 14aecc9b..84af429d 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -440,6 +440,7 @@ Name[es]=Actividad en sesión oculta monitorizada Name[et]=Aktiivsus peidetud jälgitavas seansis Name[fa]=فعالیت در جلسه مخفی تحت نظارت Name[fi]=Aktiivisuutta tarkkailtavassa piiloistunnossa +Name[fr]=Activité dans la session surveillée cachée Name[hu]=Aktivitás egy rejtett, figyelt munkamenetben Name[ia]=Activitate in session monitorate celate Name[it]=Attività in sessione sorvegliata nascosta @@ -473,6 +474,7 @@ Comment[es]=Actividad detectada en una sesión oculta monitorizada Comment[et]=Tuvastati aktiivsus peidetud jälgitavas seansis Comment[fa]=فعالیت‌های یافته شده در یک جلسه مخفی تحت نظارت Comment[fi]=Aktiivisuutta havaittu tarkkailtavassa piiloistunnossa +Comment[fr]=Activité détectée dans une session surveillée cachée Comment[hu]=Aktivitás észlelve egy rejtett, figyelt munkamenetben Comment[ia]=Activitate relevate in un session monitorate celate Comment[it]=Attività rilevata in una sessione sorvegliata nascosta @@ -674,6 +676,7 @@ Name[es]=Silencio en sesión oculta monitorizada Name[et]=Vaikus peidetud jälgitavas seansis Name[fa]=سکوت در جلسه مخفی تحت نظارت Name[fi]=Hiljaisuus valvotussa piiloistunnossa +Name[fr]=Inactivité dans la session surveillée cachée Name[hu]=Üresjárat egy rejtett, figyelt munkamenetben Name[ia]=Silentio in session monitorate celate Name[it]=Silenzio in una sessione sorvegliata nascosta @@ -707,6 +710,7 @@ Comment[es]=Silencio detectado en una sesión oculta monitorizada Comment[et]=Tuvastati vaikus peidetud jälgitavas seansis Comment[fa]=سکوت یافته شده در یک جلسه مخفی تحت نظارت Comment[fi]=Hiljaisuutta havaittu tarkkailtavassa piiloistunnossa +Comment[fr]=Inactivité détectée dans une session surveillée cachée Comment[hu]=Üresjárat észlelve egy rejtett, figyelt munkamenetben Comment[ia]=Silentio relevate in un session monitorate celate Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta From b7590f9915086a84942785eccc5ef2337db1642e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <aacid@kde.org> Date: Mon, 5 Jun 2017 20:51:54 +0200 Subject: [PATCH 08/12] GIT_SILENT Upgrade KDE Applications version to 17.04.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed78cb69..760d490f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements From 680d9046b574d687882ca01106af9a0bf0641be7 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Tue, 13 Jun 2017 05:08:46 +0200 Subject: [PATCH 09/12] GIT_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index 9e532e10..4fec8604 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -92,6 +92,7 @@ <p xml:lang="el">Το Konsole είναι ένας εξομοιωτής τερματικού, το οποίο συχνά αναφέρεται ως τερματικό ή κέλυφος. Εξομοιώνει ένα περιβάλλον χρήστη γραμμής εντολών σε ένα παράθυρο για κείμενο μόνο.</p> <p xml:lang="en-GB">Konsole is an X terminal emulator, often referred to as a terminal or a shell. It emulates a command line interface in a text only window.</p> <p xml:lang="es">Konsole es un emulador de terminal X, al que se le suele llamar terminal o shell. Emula in interfaz de línea de órdenes en una ventana solo de texto.</p> + <p xml:lang="fi">Konsole on X-pääte-emulaattori eli pääte eli komentotulkki. Se mukailee tekstitilan komentorivikäyttöliittymää.</p> <p xml:lang="hu">A Konsole egy X terminálemulátor, más néven terminál vagy parancsértelmező. Parancssori felületet emulál egy szöveges ablakba,</p> <p xml:lang="it">Konsole è un emulatore di terminale per X, spesso indicato come un terminale o una shell. Emula un'interfaccia a riga di comando in una finestra di solo testo.</p> <p xml:lang="nl">Konsole is een X-terminalemulator, vaak een terminal of shell genoemd. Het emuleert een opdrachtprompt in een venster met alleen tekst.</p> From 938f9c0652b0017b6469ad9d6e9c7f1a47585e6f Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Wed, 14 Jun 2017 09:33:23 +0200 Subject: [PATCH 10/12] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- desktop/konsole.notifyrc | 2 +- desktop/konsolerun.desktop | 4 ++-- desktop/org.kde.konsole.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 84af429d..76a5e5f3 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -81,7 +81,7 @@ Comment[ta]=கான்சோல் Comment[te]=కాన్సొల్ Comment[tg]=Консол Comment[th]=คอนโซล-K -Comment[tr]=Konsol +Comment[tr]=Konsole Comment[ug]=Konsole Comment[uk]=Konsole Comment[uz]=Terminal diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index 3cd7fc98..d50a1531 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -51,7 +51,7 @@ Name[sr@ijekavian]=Изврши у Конзоли Name[sr@ijekavianlatin]=Izvrši u Konsoli Name[sr@latin]=Izvrši u Konsoli Name[sv]=Kör i Terminal -Name[tr]=Konsolda Çalıştır +Name[tr]=Konsole'da Çalıştır Name[uk]=Запустити у Konsole Name[x-test]=xxRun In Konsolexx Name[zh_CN]=在 Konsole 中运行 @@ -90,7 +90,7 @@ Comment[sr@ijekavian]=Изврши у Конзоли Comment[sr@ijekavianlatin]=Izvrši u Konsoli Comment[sr@latin]=Izvrši u Konsoli Comment[sv]=Kör i Terminal -Comment[tr]=Konsolda Çalıştır +Comment[tr]=Konsol İçinde Çalıştır Comment[uk]=Запустити у Konsole Comment[x-test]=xxRun within Konsolexx Comment[zh_CN]=在 Konsole 中运行 diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index 81baadd9..5174266c 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -92,7 +92,7 @@ Name[ta]=கான்சோல் Name[te]=కాన్సోల్ Name[tg]=Консол Name[th]=คอนโซล-K -Name[tr]=Konsol +Name[tr]=Konsole Name[ug]=Konsole Name[uk]=Konsole Name[uz]=Konsole From 8210717f5cdbddce50012795deb4df06de9ed3e4 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Sat, 1 Jul 2017 05:02:43 +0200 Subject: [PATCH 11/12] GIT_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index 4fec8604..6c27ec90 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -93,6 +93,7 @@ <p xml:lang="en-GB">Konsole is an X terminal emulator, often referred to as a terminal or a shell. It emulates a command line interface in a text only window.</p> <p xml:lang="es">Konsole es un emulador de terminal X, al que se le suele llamar terminal o shell. Emula in interfaz de línea de órdenes en una ventana solo de texto.</p> <p xml:lang="fi">Konsole on X-pääte-emulaattori eli pääte eli komentotulkki. Se mukailee tekstitilan komentorivikäyttöliittymää.</p> + <p xml:lang="fr">Konsole est un émulateur de terminal, souvent utilisé appelé console ou shell. Il émule une interface de ligne de commande dans une fenêtre de texte seulement.</p> <p xml:lang="hu">A Konsole egy X terminálemulátor, más néven terminál vagy parancsértelmező. Parancssori felületet emulál egy szöveges ablakba,</p> <p xml:lang="it">Konsole è un emulatore di terminale per X, spesso indicato come un terminale o una shell. Emula un'interfaccia a riga di comando in una finestra di solo testo.</p> <p xml:lang="nl">Konsole is een X-terminalemulator, vaak een terminal of shell genoemd. Het emuleert een opdrachtprompt in een venster met alleen tekst.</p> From 49879d11191a1d27192d23f7899ed0646f0f40d9 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <aacid@kde.org> Date: Mon, 10 Jul 2017 00:33:08 +0200 Subject: [PATCH 12/12] GIT_SILENT Upgrade KDE Applications version to 17.04.3. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 760d490f..f31ad20b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Konsole) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements