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-01-23 05:13:56 +01:00
parent 567dba7d8e
commit 02f4d3f4f7
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/minimizeall/metadata.desktop
View file

@ -48,6 +48,7 @@ Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventana
Comment[gl]=Engade un atallo para minimizar e restaurar todas as xanelas.
Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre
Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen
Comment[nn]=Legg til snarvegar for å minimera og gjenoppretta alle vindauge
Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien
Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas
Comment[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken