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 2023-08-07 02:38:56 +00:00
parent 7be6aa73f2
commit 9750581ba9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kwin.notifyrc
View file

@ -20,7 +20,7 @@ Comment[eu]=KWin leiho-kudeatzailea
Comment[fi]=KWin-ikkunointiohjelma
Comment[fr]=Gestionnaire de fenêtres KWin
Comment[ga]=Bainisteoir Fuinneog KWin
Comment[gl]=Xestor de xanelas KWin
Comment[gl]=Xestor de xanelas KWin.
Comment[gu]=KWin વિન્ડો સંચાલક
Comment[he]=מנהל החלונות KWin
Comment[hi]=केविन विंडो प्रबंधक
@ -281,7 +281,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 evento de 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