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-14 04:53:24 +01:00
parent b8f4361847
commit f7f0a64db0
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

@ -44,6 +44,7 @@ Comment[ca]=Afegeix una drecera per a minimitzar i restaurar totes les finestres
Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les finestres
Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen
Comment[en_GB]=Adds a shortcut to minimise and restore all windows
Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas
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[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien