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-08 07:02:28 +01:00
parent 8245a74b31
commit 40862c034a
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/slide/slide_config.desktop
View file

@ -20,6 +20,7 @@ Name[eo]=Lumbildo
Name[es]=Deslizar
Name[et]=Liuglemine
Name[eu]=Irristatu
Name[fi]=Liuku
Name[fr]=Glisser
Name[fy]=Glydzje
Name[ga]=Sleamhnaigh

1
scripts/minimizeall/metadata.desktop
View file

@ -46,6 +46,7 @@ Comment[da]=Tilføjer en genvej til at minimere og gendanne alle vinduer
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[fi]=Lisää pikanäppäimen, joka pienentää tai palauttaa kaikki ikkunat
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