From 7ac5ac9d6ca4efa8b112e76859512f06e3065862 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Aug 2018 07:37:16 +0200 Subject: [PATCH] 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]=他のアプリケーションがコンポジティングの一時停止を要求しました。