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-07-30 07:40:40 +02:00
parent 3eaf1a9972
commit 6adc20dca6
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

@ -59,6 +59,7 @@ 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[pt_BR]=Adiciona um atalho para minimizar e restaurar todas as janelas
Comment[ru]=Добавляет глобальную комбинацию клавиш для сворачивания и восстановления всех окон
Comment[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken
Comment[sr]=Додаје пречицу за минимизовање и обнављање свих прозора
Comment[sr@ijekavian]=Додаје пречицу за минимизовање и обнављање свих прозора