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 2017-02-03 06:18:14 +01:00
parent d33c96af5e
commit 1296cfd861
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin.notifyrc
View file

@ -147,7 +147,7 @@ Comment[fi]=Toinen sovellus vaati keskeyttämään koostamisen.
Comment[fr]=Une autre application a demandé la suspension de la composition.
Comment[fy]=In oare applikaasje hat frege om compositing út te stellen.
Comment[ga]=Tá feidhmchlár eile ag iarraidh comhshuí a chur ar fionraí.
Comment[gl]=Outro programa pediu que a suspensión da composición.
Comment[gl]=Outro aplicativo pediu que a suspensión da composición.
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.