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-10-31 04:42:16 +01:00
parent 7e6721ece0
commit aa0a25f380
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

@ -252,7 +252,7 @@ Comment[et]=Toimus graafika lähtestamise sündmus
Comment[eu]=Grafikoak berrezartzeko gertaera bat jazo da
Comment[fi]=Sattui grafiikan nollaustapahtuma
Comment[fr]=Un évènement de réinitialisation graphique est intervenu
Comment[gl]=Aconteceu un reinicio de gráficos
Comment[gl]=Aconteceu un evento de reinicio de gráficos
Comment[he]=הגרפיקה אופסה
Comment[hu]=Egy grafikai visszaállítás esemény történt
Comment[ia]=Il necessita un evento de reinitiar le graphic