From 126f3edfedd6bbc379d6021e7a822e25501e1fef Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 18 Nov 2015 00:38:36 +0100 Subject: [PATCH 1/8] GIT_SILENT Upgrade KDE Applications version to 15.11.80. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3095b1c..1f5a6152 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 "15") -set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "999") +set (KDE_APPLICATIONS_VERSION_MINOR "11") +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 740675243c0e573dd25fc65ae329b08be4538d58 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 29 Nov 2015 19:39:04 +0100 Subject: [PATCH 2/8] Call KLocalizedString::setApplicationDomain("konsole"); konsole is using -DTRANSLATION_DOMAIN=\"konsole\" that is wrong for applications, apps need to use KLocalizedString::setApplicationDomain since that is needed for some things like the transltators tab in the about dialog. I have not removed -DTRANSLATION_DOMAIN=\"konsole\" because on the other hand this code is also a library (i.e. the konsole kpart). The "being pedanticly correct" fix would be using -DTRANSLATION_DOMAIN=\"konsole\" only to compile the files that are part of the kpart but that's prone to break at some point and using both KLocalizedString::setApplicationDomain and -DTRANSLATION_DOMAIN does not create any problem so i went that route CCMAIL: konsole-devel@kde.org --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 7c5d9530..5e1420e3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -81,6 +81,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char** argv) } } + KLocalizedString::setApplicationDomain("konsole"); + KAboutData about(QStringLiteral("konsole"), i18nc("@title", "Konsole"), QStringLiteral(KONSOLE_VERSION), From a53c950f2978f8ff02cd165edc728be6c507e1ee Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 2 Dec 2015 22:10:13 +0100 Subject: [PATCH 3/8] GIT_SILENT Upgrade KDE Applications version to 15.11.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f5a6152..e2ec70b6 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 "15") 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 8858ba30b40e5ac7d1e4eb769f5d89af9468d1a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Dec 2015 11:12:04 +0000 Subject: [PATCH 4/8] SVN_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index e9255336..3f4f6e9b 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -22,6 +22,7 @@ Konsole Konsole Konsole + Konsole ਕਨਸੋਲ Konsola Konsole @@ -57,6 +58,7 @@ 터미널 Terminal Terminal + Terminal ਟਰਮੀਨਲ Terminal Terminal @@ -91,6 +93,7 @@

Konsole은 터미널 에뮬레이터입니다.

Konsole er en terminalemulator.

Konsole is een terminalemulator

+

Konsole er ein terminalemulator.

ਕਨਸੋਲ ਟਰਮੀਨਲ ਈਮੂਲੇਟਰ ਹੈ।

Konsole jest emulatorem terminala.

O Konsole é um emulador de terminal.

@@ -126,6 +129,7 @@

기능:

Funksjoner:

Mogelijkheden:

+

Funksjonar:

ਫੀਚਰ:

Możliwości:

Funcionalidades:

@@ -162,6 +166,7 @@
  • 탭
  • Faner
  • Tabbladen
    • +
  • Faner
  • ਟੈਬ
  • Karty
  • Páginas
    • @@ -195,6 +200,7 @@
  • 다중 프로필
  • Flere profiler
  • Meerdere profielen
    • +
  • Fleire profilar
  • ਵੱਖ-ਵੱਖ ਪ੍ਰੋਫਾਇਲ
  • Wiele profili
  • Múltiplos perfis
    • @@ -228,6 +234,7 @@
  • 무음 및 활동 모니터링
  • Overvåking av stillhet og aktivitet
  • Monitoring van stilte en activiteit
    • +
  • Overvaking av aktivitet og inaktivitet
  • ਸ਼ਾਂਤ ਅਤੇ ਸਰਗਰਮੀ ਨਿਗਰਾਨੀ
  • Monitorowanie ciszy i aktywności
  • Monitorização do silêncio e da actividade
    • @@ -261,6 +268,7 @@
  • 책갈피 지원
  • Støtte for bokmerker
  • Ondersteuning van bladwijzers
    • +
  • Bokmerkestøtte
  • ਬੁੱਕਮਾਰਕ ਸਹਿਯੋਗ
  • Obsługa zakładek
  • Suporte para favoritos
    • @@ -295,6 +303,7 @@
  • 찾기
  • Søking
  • Zoeken
    • +
  • Søkjestøtte
  • ਖੋਜ ਕਰਨੀ
  • Wyszukiwanie
  • Procurar
    • @@ -328,6 +337,7 @@
  • 출력 저장
  • Lagrer utdata
  • Opslaan van uitvoer
    • +
  • Lagring av utdata
  • ਆਉਟਪੁੱਟ ਸੰਭਾਲਣੀ
  • Zapisywanie wyniku
  • Gravação do resultado
    • From 7fc6243e1c1a24388cc61271007ebbf493bd3d8c Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 8 Dec 2015 16:49:06 +0100 Subject: [PATCH 5/8] GIT_SILENT Upgrade KDE Applications version to 15.12.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2ec70b6..7feee0d7 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 "15") -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 cf9251795960753e9ebf5b79a9ab44e35ccbe246 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Dec 2015 10:04:54 +0000 Subject: [PATCH 6/8] SVN_SILENT made messages (after extraction) --- desktop/org.kde.konsole.appdata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/desktop/org.kde.konsole.appdata.xml b/desktop/org.kde.konsole.appdata.xml index 3f4f6e9b..50a7afa5 100644 --- a/desktop/org.kde.konsole.appdata.xml +++ b/desktop/org.kde.konsole.appdata.xml @@ -46,6 +46,7 @@ Terminal Terminal Terminál + Terminal Terminal Τερματικό Terminal @@ -117,6 +118,7 @@

    Característiques:

    Característiques:

    Vlastnosti:

    +

    Funktioner:

    Funktionen:

    Χαρακτηριστικά:

    Features:

    @@ -154,6 +156,7 @@
  • Pestanyes
  • Pestanyes
  • Karty
    • +
  • Faneblade
  • Unterfenster
  • Καρτέλες
  • Tabs
    • @@ -291,6 +294,7 @@
  • Cerques
  • Cerques
  • Hledání
    • +
  • Søgning
  • Suchen
  • Αναζήτηση
  • Searching
    • @@ -326,6 +330,7 @@
  • Desat de la sortida
  • Guardat de l'eixida
  • Ukládání výstupu
    • +
  • Gemning af output
  • Speicherung der Ausgabe
  • Αποθήκευση αποτελέσματος
  • Saving output
    • From 9490873adebb28b2c23e4a7f08abf0f936038883 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Dec 2015 11:18:54 +0000 Subject: [PATCH 7/8] SVN_SILENT made messages (.desktop file) --- desktop/konsolerun.desktop | 1 + desktop/org.kde.konsole.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index c8e4c5af..21c6e37b 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -37,6 +37,7 @@ Name[lt]=Paleisti konsolėje Name[nb]=Kjør i Konsole Name[nds]=Binnen Konsole lopen Name[nl]=In Konsole uitvoeren +Name[nn]=Køyr i konsoll Name[pa]=ਕੰਨਸੋਲ ਵਿੱਚ ਚਲਾਓ Name[pl]=Uruchom w konsoli Name[pt]=Executar no Konsole diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index baeebb4a..e53d5c51 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -216,6 +216,7 @@ Name[lt]=Atverti naujame lange Name[nb]=Åpne et nytt vindu Name[nds]=En nieg Finster opmaken Name[nl]=Een nieuw venster openen +Name[nn]=Opna i nytt vindauge Name[pa]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ Name[pl]=Otwórz nowe okno Name[pt]=Abrir uma Nova Janela From 2b895fb7f3f3e3654d222c90c90c42103a931726 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 5 Jan 2016 16:42:35 +0000 Subject: [PATCH 8/8] use sound from Oxygen theme instead of from kde-runtime --- desktop/konsole.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index c4351904..6380fb6d 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -423,7 +423,7 @@ Comment[wa]=Cloke ki sone divins ene nén veyåve session Comment[x-test]=xxBell emitted within a non-visible sessionxx Comment[zh_CN]=不可见会话中发生的响铃 Comment[zh_TW]=非可見工作階段中的響鈴行為 -Sound=KDE-Sys-App-Message.ogg +Sound=Oxygen-Sys-App-Message.ogg Action=Popup [Event/Activity]