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-09 05:06:46 +01:00
parent 7ca8771d12
commit 8a3128c8cf
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/slide/slide_config.desktop
View file

@ -31,7 +31,6 @@ Name[hne]=स्लाइड
Name[hr]=Pomak
Name[hu]=Csúsztatott váltás
Name[ia]=Glissa
Name[id]=Geser
Name[is]=Renna til
Name[it]=Scivola
Name[kk]=Сырғанату

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[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
Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas