yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2018-08-26 07:37:16 +02:00
parent fca9dbd011
commit 7ac5ac9d6c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -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

2
kwin.notifyrc
View file

@ -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]=他のアプリケーションがコンポジティングの一時停止を要求しました。