From 7ac5ac9d6ca4efa8b112e76859512f06e3065862 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Aug 2018 07:37:16 +0200 Subject: [PATCH 1/6] 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" --- kcmkwin/kwintabbox/kwintabbox.desktop | 2 +- kwin.notifyrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index e21f70cc32..f463185dd7 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -129,7 +129,7 @@ X-KDE-Keywords[fr]=fenêtre, fenêtres, basculeur, changeur de fenêtre, bascule X-KDE-Keywords[gl]=xanela,xanelas,alternador,cambiar,trocar de xanela,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[hu]=ablak,ablakok,váltó,ablakváltó,váltás,ablakváltás,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,alttab,alt-tab,alt+tab,alt tab -X-KDE-Keywords[id]=jendela,jendela,pengganti,pengganti jendela,mengganti,mengganti jendela,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[id]=jendela,jendela,pengalih,pengalih jendela,pengalihan,pengalihan jendela,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[it]=finestra,finestre,scambiatore,scambiafinestre,scambio,scambio finestre,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[kk]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[km]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab diff --git a/kwin.notifyrc b/kwin.notifyrc index b4ad466f55..edb43eaa75 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -152,7 +152,7 @@ Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. Comment[ia]=Altere application ha requirite de suspender le composition. -Comment[id]=Aplikasi lain telah meimnta untuk suspensi komposit. +Comment[id]=Aplikasi lain telah meminta untuk suspensi komposit. Comment[is]=Annað forrit hefur beðið um að skjásamsetningu verði hætt. Comment[it]=Un'altra applicazione ha richiesto di sospendere la composizione. Comment[ja]=他のアプリケーションがコンポジティングの一時停止を要求しました。 From 57796645f889823a108fda2a8d8677c4ddc89dbb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Aug 2018 08:08:30 +0200 Subject: [PATCH 2/6] 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" --- kcmkwin/kwintabbox/kwintabbox.desktop | 2 +- kwin.notifyrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index e21f70cc32..f463185dd7 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -129,7 +129,7 @@ X-KDE-Keywords[fr]=fenêtre, fenêtres, basculeur, changeur de fenêtre, bascule X-KDE-Keywords[gl]=xanela,xanelas,alternador,cambiar,trocar de xanela,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[hu]=ablak,ablakok,váltó,ablakváltó,váltás,ablakváltás,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,alttab,alt-tab,alt+tab,alt tab -X-KDE-Keywords[id]=jendela,jendela,pengganti,pengganti jendela,mengganti,mengganti jendela,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[id]=jendela,jendela,pengalih,pengalih jendela,pengalihan,pengalihan jendela,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[it]=finestra,finestre,scambiatore,scambiafinestre,scambio,scambio finestre,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[kk]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[km]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab diff --git a/kwin.notifyrc b/kwin.notifyrc index c6dec7bf0b..e9595c61a1 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -152,7 +152,7 @@ Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. Comment[ia]=Altere application ha requirite de suspender le composition. -Comment[id]=Aplikasi lain telah meimnta untuk suspensi komposit. +Comment[id]=Aplikasi lain telah meminta untuk suspensi komposit. Comment[is]=Annað forrit hefur beðið um að skjásamsetningu verði hætt. Comment[it]=Un'altra applicazione ha richiesto di sospendere la composizione. Comment[ja]=他のアプリケーションがコンポジティングの一時停止を要求しました。 From 18bf4444eaf10e22f32cefbfaf108d021e2a55d3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Aug 2018 07:44:11 +0200 Subject: [PATCH 3/6] 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" --- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 6 +++--- scripts/videowall/metadata.desktop | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index f6457592be..a710d57ee8 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -21,7 +21,7 @@ Name[en_GB]=Touch Screen Name[es]=Pantalla táctil Name[eu]=Ukimen-pantaila Name[fi]=Kosketusnäyttö -Name[fr]=Pavé tactile +Name[fr]=Écran tactile Name[gl]=Pantalla táctil Name[he]=מסך מגע Name[hu]=Érintőképernyő @@ -57,7 +57,7 @@ Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil Comment[eu]=Ukipen-pantailan irrist-keinuak Comment[fi]=Kosketusnäytön pyyhkäisyeleet -Comment[fr]=Mouvements sur le pavé tactile +Comment[fr]=Mouvements sur l'écran tactile Comment[gl]=Xestos de pantalla táctil Comment[he]=מחוות החלקה של מסכי מגע Comment[hu]=Érintőképernyő-gesztusok @@ -93,7 +93,7 @@ X-KDE-Keywords[en_GB]=kwin,window,manager,effect,edge,border,action,switch,deskt X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes del escritorio,bordes de la pantalla,lado de la pantalla,comportamiento de la pantalla,pantalla táctil X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,mahaigainaren ertzak,pantailen ertzak,pantailaren aldea,pantailaren portaera,ukipen-pantaila X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,tehoste,kulma,laita,reuna,toiminto,vaihda,työpöytä,työpöydän reunat,näytön reunat,näytön laita,näytön käyttäytyminen,kosketusnäyttö -X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, bordure, action, bascule, bureau, bords du bureau, bords de l'écran, côté de l'écran, comportement de l'écran, pavé tactile +X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, bordure, action, bascule, bureau, bords du bureau, bords de l'écran, côté de l'écran, comportement de l'écran, écran tactile X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,effect,efecto,edge,beira,bordo,contorno,esquina,border,action,acción,switch,cambiar,conmutar,trocar,desktop,escritorio,desktop edges,screen edges,pantalla,side of screen,screen behavior,comportamento,touch screen,táctil X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás,asztal,asztalszél,képernyőszél,képernyőoldal,képernyő működése,érintőképernyő X-KDE-Keywords[id]=kwin,jendela,pengelola,efek,tepi,batas,aksi,alih,desktop,tepi desktop,tepi layar,sisi layar,perilaku layar,layar sentuh diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index e99eab9858..d347408c93 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -64,7 +64,7 @@ Comment[gl]=Estende un reprodutor de vídeo a pantalla completa por todas as pan Comment[he]=מפעיל נגן וידאו במסך מלא על כל המסכים המחוברים ליצירה של קיר וידאו Comment[hu]=Kiterjeszti a teljes képernyős videólejátszót az összes csatolt kijelzőre, hogy videófalat hozzon létre Comment[ia]=Extende jocator de video de schermo plen super omne schermos attachate pro crea un Muro de Video -Comment[id]=Rentangkan layar-penuh pemain video ke semua layar yang terhubung untuk menciptakan Video Wall +Comment[id]=Rentangkan layar-penuh player video ke semua layar yang terhubung untuk menciptakan Video Wall Comment[it]=Distribuisci il lettore video a schermo pieno su tutti gli schermi per creare una parete video Comment[kk]=Видеоплейердің суретін бейне қабырғаны құратын экрандарға жайып көрсету Comment[km]=រំលង​កម្មវិធី​ចាក់​វីដេអូ​លើ​អេក្រង់​ដែល​បានភ្ជាប់ ដើម្បី​បង្កើត​ផ្ទាំង​វីដេអូ From a5b820ee7e1c3b86a6a834c7e476e05cf3c1d3c8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Aug 2018 08:09:08 +0200 Subject: [PATCH 4/6] 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" --- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 6 +++--- scripts/videowall/metadata.desktop | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index f6457592be..a710d57ee8 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -21,7 +21,7 @@ Name[en_GB]=Touch Screen Name[es]=Pantalla táctil Name[eu]=Ukimen-pantaila Name[fi]=Kosketusnäyttö -Name[fr]=Pavé tactile +Name[fr]=Écran tactile Name[gl]=Pantalla táctil Name[he]=מסך מגע Name[hu]=Érintőképernyő @@ -57,7 +57,7 @@ Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil Comment[eu]=Ukipen-pantailan irrist-keinuak Comment[fi]=Kosketusnäytön pyyhkäisyeleet -Comment[fr]=Mouvements sur le pavé tactile +Comment[fr]=Mouvements sur l'écran tactile Comment[gl]=Xestos de pantalla táctil Comment[he]=מחוות החלקה של מסכי מגע Comment[hu]=Érintőképernyő-gesztusok @@ -93,7 +93,7 @@ X-KDE-Keywords[en_GB]=kwin,window,manager,effect,edge,border,action,switch,deskt X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes del escritorio,bordes de la pantalla,lado de la pantalla,comportamiento de la pantalla,pantalla táctil X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,mahaigainaren ertzak,pantailen ertzak,pantailaren aldea,pantailaren portaera,ukipen-pantaila X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,tehoste,kulma,laita,reuna,toiminto,vaihda,työpöytä,työpöydän reunat,näytön reunat,näytön laita,näytön käyttäytyminen,kosketusnäyttö -X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, bordure, action, bascule, bureau, bords du bureau, bords de l'écran, côté de l'écran, comportement de l'écran, pavé tactile +X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, bordure, action, bascule, bureau, bords du bureau, bords de l'écran, côté de l'écran, comportement de l'écran, écran tactile X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,effect,efecto,edge,beira,bordo,contorno,esquina,border,action,acción,switch,cambiar,conmutar,trocar,desktop,escritorio,desktop edges,screen edges,pantalla,side of screen,screen behavior,comportamento,touch screen,táctil X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás,asztal,asztalszél,képernyőszél,képernyőoldal,képernyő működése,érintőképernyő X-KDE-Keywords[id]=kwin,jendela,pengelola,efek,tepi,batas,aksi,alih,desktop,tepi desktop,tepi layar,sisi layar,perilaku layar,layar sentuh diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index 1f9d518574..a8ae86b8ed 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -64,7 +64,7 @@ Comment[gl]=Estende un reprodutor de vídeo a pantalla completa por todas as pan Comment[he]=מפעיל נגן וידאו במסך מלא על כל המסכים המחוברים ליצירה של קיר וידאו Comment[hu]=Kiterjeszti a teljes képernyős videólejátszót az összes csatolt kijelzőre, hogy videófalat hozzon létre Comment[ia]=Extende jocator de video de schermo plen super omne schermos attachate pro crea un Muro de Video -Comment[id]=Rentangkan layar-penuh pemain video ke semua layar yang terhubung untuk menciptakan Video Wall +Comment[id]=Rentangkan layar-penuh player video ke semua layar yang terhubung untuk menciptakan Video Wall Comment[it]=Distribuisci il lettore video a schermo pieno su tutti gli schermi per creare una parete video Comment[kk]=Видеоплейердің суретін бейне қабырғаны құратын экрандарға жайып көрсету Comment[km]=រំលង​កម្មវិធី​ចាក់​វីដេអូ​លើ​អេក្រង់​ដែល​បានភ្ជាប់ ដើម្បី​បង្កើត​ផ្ទាំង​វីដេអូ From fa5242b3eefd02683d98b773f1c64da6c4379fbe Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Mon, 18 Jun 2018 15:25:58 +0300 Subject: [PATCH 5/6] [effects] Use more effectData() in BuiltInEffects Summary: While BuiltInEffects has effectData() function, many functions repeat s_effectData.at(index(effect)), which is what effectData() is doing. By using effectData(), we'll get rid of those repetitions and maybe make easier transition to other underlying data structure that stores metadata for builtin effects. Test Plan: Compiles, all enabled builtin effects are loaded and working. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D13587 (cherry picked from commit 7bfaa6e913dff867e6b6c3d4b451eb274683ca87) --- effects/effect_builtins.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/effects/effect_builtins.cpp b/effects/effect_builtins.cpp index 7198d6cf09..4513f57bda 100644 --- a/effects/effect_builtins.cpp +++ b/effects/effect_builtins.cpp @@ -692,11 +692,11 @@ static inline int index(BuiltInEffect effect) Effect *create(BuiltInEffect effect) { - const EffectData &effectData = s_effectData.at(index(effect)); - if (effectData.createFunction == nullptr) { + const EffectData &data = effectData(effect); + if (data.createFunction == nullptr) { return nullptr; } - return effectData.createFunction(); + return data.createFunction(); } bool available(const QString &name) @@ -714,11 +714,11 @@ bool supported(BuiltInEffect effect) if (effect == BuiltInEffect::Invalid) { return false; } - const EffectData &effectData = s_effectData.at(index(effect)); - if (effectData.supportedFunction == nullptr) { + const EffectData &data = effectData(effect); + if (data.supportedFunction == nullptr) { return true; } - return effectData.supportedFunction(); + return data.supportedFunction(); } bool checkEnabledByDefault(BuiltInEffect effect) @@ -726,17 +726,16 @@ bool checkEnabledByDefault(BuiltInEffect effect) if (effect == BuiltInEffect::Invalid) { return false; } - const EffectData &effectData = s_effectData.at(index(effect)); - if (effectData.enabledFunction == nullptr) { + const EffectData &data = effectData(effect); + if (data.enabledFunction == nullptr) { return true; } - return effectData.enabledFunction(); + return data.enabledFunction(); } bool enabledByDefault(BuiltInEffect effect) { - const EffectData &effectData = s_effectData.at(index(effect)); - return effectData.enabled; + return effectData(effect).enabled; } QStringList availableEffectNames() @@ -775,7 +774,7 @@ BuiltInEffect builtInForName(const QString &name) QString nameForEffect(BuiltInEffect effect) { - return s_effectData.at(index(effect)).name; + return effectData(effect).name; } const EffectData &effectData(BuiltInEffect effect) From 3cfb7a30f00517e2d3a43dd422c7e72c749ea911 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 30 Aug 2018 13:01:43 +0200 Subject: [PATCH 6/6] Avoid global static for effects Otherwise we call i18n without a QCoreApplication Differential Revision: https://phabricator.kde.org/D15163 (cherry picked from commit 0fd939425bf7bed20ae0435f864eadcaa6f5a3b0) --- effects/effect_builtins.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/effects/effect_builtins.cpp b/effects/effect_builtins.cpp index 4513f57bda..6ccb651ed5 100644 --- a/effects/effect_builtins.cpp +++ b/effects/effect_builtins.cpp @@ -84,7 +84,9 @@ inline Effect *createHelper() return new T(); } -static const QVector s_effectData = { +static const QVector &effectData() +{ + static const QVector s_effectData = { { QString(), QString(), @@ -683,7 +685,9 @@ EFFECT_FALLBACK #endif EFFECT_FALLBACK } -}; + }; + return s_effectData; +} static inline int index(BuiltInEffect effect) { @@ -701,12 +705,12 @@ Effect *create(BuiltInEffect effect) bool available(const QString &name) { - auto it = std::find_if(s_effectData.begin(), s_effectData.end(), + auto it = std::find_if(effectData().begin(), effectData().end(), [name](const EffectData &data) { return data.name == name; } ); - return it != s_effectData.end(); + return it != effectData().end(); } bool supported(BuiltInEffect effect) @@ -741,7 +745,7 @@ bool enabledByDefault(BuiltInEffect effect) QStringList availableEffectNames() { QStringList result; - for (const EffectData &data : s_effectData) { + for (const EffectData &data : effectData()) { if (data.name.isEmpty()) { continue; } @@ -761,15 +765,15 @@ QList< BuiltInEffect > availableEffects() BuiltInEffect builtInForName(const QString &name) { - auto it = std::find_if(s_effectData.begin(), s_effectData.end(), + auto it = std::find_if(effectData().begin(), effectData().end(), [name](const EffectData &data) { return data.name == name; } ); - if (it == s_effectData.end()) { + if (it == effectData().end()) { return BuiltInEffect::Invalid; } - return BuiltInEffect(std::distance(s_effectData.begin(), it)); + return BuiltInEffect(std::distance(effectData().begin(), it)); } QString nameForEffect(BuiltInEffect effect) @@ -779,7 +783,7 @@ QString nameForEffect(BuiltInEffect effect) const EffectData &effectData(BuiltInEffect effect) { - return s_effectData.at(index(effect)); + return effectData().at(index(effect)); } } // BuiltInEffects