From d6ca6c92e8bff0d1c8bdbac90db38831998e1e1a Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 13 Nov 2017 01:02:38 +0100 Subject: [PATCH 1/9] GIT_SILENT Upgrade KDE Applications version to 17.11.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02f5e82a..f21a32dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "11") -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 5504bf756e4fc6dca3c8d4410d98ce09fadbea00 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Wed, 22 Nov 2017 10:01:59 -0500 Subject: [PATCH 2/9] Fix 2 issues with Profile->Edit Environment dialog 1. Correctly handle when user removes all lines 2. Correctly handle when user OKs Edit Env dialog and then reopens same dialog before closing Edit Profile dialog. Thanks to ahmadsamir for patch. Differential Revision: https://phabricator.kde.org/D8921 (cherry picked from commit eaccb7dc612e385f38ed5ca01281f28f151120fc) --- src/EditProfileDialog.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index 5c36143c..cd0a1d2b 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -328,7 +328,17 @@ void EditProfileDialog::showEnvironmentEditor() { bool ok; const Profile::Ptr profile = lookupProfile(); - QStringList currentEnvironment = profile->environment(); + + QStringList currentEnvironment; + + // the user could re-open the environment editor before clicking OK/Apply + // in the parent edit profile dialog, so we make sure to show the the new + // environment vars + if (_tempProfile->isPropertySet(Profile::Environment)) { + currentEnvironment = _tempProfile->environment(); + } else { + currentEnvironment = profile->environment(); + } QString text = QInputDialog::getMultiLineText(this, i18n("Edit Environment"), @@ -336,9 +346,16 @@ void EditProfileDialog::showEnvironmentEditor() currentEnvironment.join(QStringLiteral("\n")), &ok); - if (ok && !text.isEmpty()) { - QStringList newEnvironment = text.split(QLatin1Char('\n')); - updateTempProfileProperty(Profile::Environment, newEnvironment); + QStringList newEnvironment; + + if (ok) { + if(!text.isEmpty()) { + newEnvironment = text.split(QLatin1Char('\n')); + updateTempProfileProperty(Profile::Environment, newEnvironment); + } else { + // the user could have removed all entries so we return an empty list + updateTempProfileProperty(Profile::Environment, newEnvironment); + } } } From 3d4e4116d3e8d12780122edd4225c71bc82d2934 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Thu, 23 Nov 2017 16:09:49 -0500 Subject: [PATCH 3/9] fix spelling issue/reformat comment (cherry picked from commit dcf413bbee76d697163f174aff2f02744afe4947) --- src/EditProfileDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index cd0a1d2b..1c170c97 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -331,9 +331,9 @@ void EditProfileDialog::showEnvironmentEditor() QStringList currentEnvironment; - // the user could re-open the environment editor before clicking OK/Apply - // in the parent edit profile dialog, so we make sure to show the the new - // environment vars + // The user could re-open the environment editor before clicking + // OK/Apply in the parent edit profile dialog, so we make sure + // to show the new environment vars if (_tempProfile->isPropertySet(Profile::Environment)) { currentEnvironment = _tempProfile->environment(); } else { From e8e2e6e49c42524764b8c141841739f09cbcdcd5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Nov 2017 05:46:02 +0100 Subject: [PATCH 4/9] GIT_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index 33eeb0c9..2a03dd58 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -90,6 +90,7 @@

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.

El Konsole és un emulador de terminal X, sovint referit com un terminal o una shell (intèrpret d'ordres). Emula una interfície de línia d'ordres en una finestra de només text.

El Konsole és un emulador de terminal X, sovint referit com un terminal o una shell (intèrpret d'ordes). Emula una interfície de línia d'ordes en una finestra de només text.

+

Konsole er en X-terminalemulator, ofte omtal som en terminal eller en skal. Den emulerer en kommandolinjegrænseflade i et vindue kun med tekst.

Konsole ist ein X-Terminal-Emulator, oftmals auch einfach nur als Terminal oder Shell bezeichnet. Es emuliert die Befehlszeile in einem Textfenster.

Το Konsole είναι ένας εξομοιωτής τερματικού, το οποίο συχνά αναφέρεται ως τερματικό ή κέλυφος. Εξομοιώνει ένα περιβάλλον χρήστη γραμμής εντολών σε ένα παράθυρο για κείμενο μόνο.

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.

@@ -205,6 +206,7 @@
  • Perfils múltiples
  • Perfils múltiples
  • Možnost mít několik profilů
    • +
  • Flere profiler
  • Mehrere Profile
  • Πολλαπλά προφίλ
  • Multiple profiles
    • @@ -244,6 +246,7 @@
  • Monitoratge del silenci i de l'activitat
  • Monitoratge del silenci i de l'activitat
  • Monitorování nečinnosti a aktivity
    • +
  • Overvågning af stilhed og aktivitet
  • Überwachung auf Aktivität und Inaktivität
  • Παρακολούθηση κατάστασης αδράνειας και δραστηριοτήτων
  • Silence and Activity monitoring
    • @@ -282,6 +285,7 @@
  • Implementació de punts
  • Implementació de punts
  • Podpora záložek
    • +
  • Understøttelse af bogmærker
  • Lesezeichen-Unterstützung
  • υποστήριξη σελιδοδεικτών
  • Bookmark support
    • From 121c47b63c8a0e0a5050f7a31cdf66ca20db3b18 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Nov 2017 06:51:22 +0100 Subject: [PATCH 5/9] 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, 2 insertions(+), 2 deletions(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 6fa086e5..4f0ef0ae 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -726,7 +726,7 @@ Comment[ia]=Silentio relevate in un session monitorate celate Comment[is]=Ekkert er að gerast í földu setunni sem fylgst er með Comment[it]=Silenzio rilevato in una sessione sorvegliata nascosta Comment[ko]=숨겨진 관찰하는 세션에서 침묵 감지됨 -Comment[nl]=Stilte ontdekt in eeb verborgen gevolgde sessie +Comment[nl]=Stilte ontdekt in een verborgen gevolgde sessie Comment[nn]=Stille oppdaga i gøymd overvaka økt Comment[pl]=Wykryto ciszę w ukrytej monitorowanej sesji Comment[pt]=Silêncio detectado numa sessão vigiada que esteja escondida @@ -880,7 +880,7 @@ Comment[ms]=Senyap dikesan dalam sesi yang dipantau Comment[nb]=Det er oppdaget stillhet i en økt som er overvåket Comment[nds]=Still binnen en beluurt Törn opdeckt Comment[ne]=अनुगमन गरिएको सत्रमा मौन पत्ता लागाइयो -Comment[nl]=Stilte ontdekt in gevolgde sessie +Comment[nl]=Stilte ontdekt in een gevolgde sessie Comment[nn]=Stille oppdaga i overvaka økt Comment[or]=ଯାଞ୍ଚକୃତ ଅଧିବେଶନରେ ଚିହ୍ନଟ ହୋଇଥିବା ନିରବତା Comment[pa]=ਇੱਕ ਨਿਗਰਾਨੀ ਅਧੀਨ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਚੁੱਪ ਹੋਈ From 7d1acad6eaada912fbb9f7661d6aa52ee9e5fc97 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Thu, 30 Nov 2017 22:15:53 +0100 Subject: [PATCH 6/9] GIT_SILENT Upgrade KDE Applications version to 17.11.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f21a32dd..19365f5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "11") -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 72c3433c37e75c793bbb0db5e9c13027bf49e131 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Dec 2017 05:15:49 +0100 Subject: [PATCH 7/9] GIT_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index 2a03dd58..bfaff569 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -101,6 +101,7 @@

    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,

    Konsole es un emulator de terminal de X, sovente referite como unterminal o un shell. Illo emula uninterfacie de linea de commando in un fenestra de sol texto.

    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.

    +

    Konsole은 X 터미널 에뮬레이터입니다. 텍스트 창의 명령행 인터페이스를 제공합니다.

    Konsole is een X-terminalemulator, vaak een terminal of shell genoemd. Het emuleert een opdrachtprompt in een venster met alleen tekst.

    Konsole er ein såkalla terminalemulator for X, gjerne kalla ein «terminal» eller eit «skal». Han emulerer eit tekstbasert kommandolinjegrensesnitt.

    Konsola jest emulatorem terminala dla X, częściej nazwyana po prostu terminalem ub powłoką. Emuluje interfejs wiersza poleceń w oknie zawierającym wyłącznie tekst.

    @@ -361,7 +362,7 @@
  • 搜尋
  • Saving output
  • حفظ الخرج
    • -
  • Desat de la sortida
    • +
  • Desament de la sortida
  • Guardat de l'eixida
  • Ukládání výstupu
  • Gemning af output
    • From 3ef3a756482f43eaadeb52c3e081fe6a0e1847ad Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Tue, 5 Dec 2017 00:00:42 +0100 Subject: [PATCH 8/9] GIT_SILENT Upgrade KDE Applications version to 17.12.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19365f5c..aac9abd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") -set (KDE_APPLICATIONS_VERSION_MINOR "11") -set (KDE_APPLICATIONS_VERSION_MICRO "90") +set (KDE_APPLICATIONS_VERSION_MINOR "12") +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 4596c9983a63b5782d4cb6cab4aec0123f0848b5 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 5 Dec 2017 01:25:27 +0100 Subject: [PATCH 9/9] appdata: update doc URL, more https - use the more generic URL for dolphin documentation; - use https for all links. --- desktop/org.kde.konsole.appdata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index bfaff569..a81f306b 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -402,12 +402,12 @@
  • 儲存輸出
    • - http://konsole.kde.org/ + https://konsole.kde.org/ https://bugs.kde.org/enter_bug.cgi?format=guided&product=konsole - http://docs.kde.org/stable/en/applications/konsole/index.html + https://docs.kde.org/?application=konsole - http://kde.org/images/screenshots/konsole.png + https://kde.org/images/screenshots/konsole.png KDE