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"
This commit is contained in:
l10n daemon script 2023-12-14 02:06:54 +00:00
parent 3663453c7d
commit 510e776e80

View file

@ -15,6 +15,7 @@ Name[it]=Assistente Kill di KWin
Name[ka]=KWin-
Name[nl]=KWin-hulpprogramma voor kill (afbreken)
Name[pl]=Narzędzie pomocnicze kończące KWin
Name[pt_BR]=Utilitário de ajuda do KWin para matar janelas
Name[sk]=KWin Kill Helper
Name[sl]=Kwin pomočnik odstranjevalnika
Name[ta]=ி ி ிி
@ -38,6 +39,7 @@ Comment[it]=Chiede se chiudere una finestra che non risponde
Comment[ka]=, ,
Comment[nl]=Vraagt of een niet responderend venster afgebroken moet worden
Comment[pl]=Pyta czy zakończyć okno, które nie odpowiada
Comment[pt_BR]=Pergunta se uma janela que não responde deve ser encerrada
Comment[sk]=Výzvy na zabitie nereagujúceho okna
Comment[sl]=Pozove, ali naj se odstrani neodzivno okno
Comment[ta]=ிி ி