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-22 07:26:39 +01:00
parent 7bf4a94286
commit 3d5178a7c6
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

@ -48,6 +48,7 @@ Name[nn]=Skliding
Name[pa]=ਸਲਾਈਡ
Name[pl]=Slajd
Name[pt]=Deslizar
Name[pt_BR]=Deslizar
Name[ro]=Alunecă
Name[ru]=Прокрутка
Name[si]=ලිස්සන්න

1
scripts/minimizeall/metadata.desktop
View file

@ -55,6 +55,7 @@ Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te hers
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[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken
Comment[sr]=Додаје пречицу за минимизовање и обнављање свих прозора
Comment[sr@ijekavian]=Додаје пречицу за минимизовање и обнављање свих прозора