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-02-10 05:02:44 +01:00
parent 6e5f5d92da
commit ded7225572
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

@ -47,6 +47,7 @@ Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wie
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[fi]=Lisää pikanäppäimen, joka pienentää tai palauttaa kaikki ikkunat
Comment[fr]=Ajoute un raccourci pour réduire ou afficher toutes les fenêtres
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