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-08-15 08:14:58 +02:00
parent 3dab3d74cb
commit 39ddc54c0a
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

@ -38,6 +38,7 @@ Name[ja]=スライド
Name[kk]=Сырғанату
Name[km]=ស្លាយ
Name[kn]=ಜಾರು
Name[ko]=슬라이드
Name[ku]=Xîş Bike
Name[lv]=Slīdēt
Name[mai]=स्लाइड

1
scripts/minimizeall/metadata.desktop
View file

@ -54,6 +54,7 @@ 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[id]=Menambahkan sebuah pintasan untuk minimalkan dan pulihkan semua jendela
Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre
Comment[ko]=모든 창을 최소화하고 복원하는 단축키를 추가합니다
Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen
Comment[nn]=Legg til snarvegar for å minimera og gjenoppretta alle vindauge
Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien