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 2021-09-26 01:13:57 +00:00
parent 45ee1969c7
commit ced2990c8a
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/eyeonscreen/package/metadata.desktop
View file

@ -14,6 +14,7 @@ Name[fr]=Jeter un œil sur le bureau
Name[ia]=Eye On Screen (Oculo sur schermo) Name[ia]=Eye On Screen (Oculo sur schermo)
Name[id]=Eye on Screen Name[id]=Eye on Screen
Name[it]=Eye On Screen Name[it]=Eye On Screen
Name[ja]=Eye on Screen
Name[ko]=화면 위의 눈 Name[ko]=화면 위의 눈
Name[lt]=Akis ekrane Name[lt]=Akis ekrane
Name[nl]=Oog op scherm Name[nl]=Oog op scherm
@ -47,6 +48,7 @@ Comment[fr]=Faire disparaître les fenêtres dans le bureau
Comment[ia]=Suger fenestras in le scriptorio Comment[ia]=Suger fenestras in le scriptorio
Comment[id]=Sedot window ke desktop Comment[id]=Sedot window ke desktop
Comment[it]=Risucchia le finestre nel desktop Comment[it]=Risucchia le finestre nel desktop
Comment[ja]=ウィンドウをデスクトップに吸い込みます
Comment[ko]=창을 바탕 화면으로 흡수 Comment[ko]=창을 바탕 화면으로 흡수
Comment[lt]=Įtraukti langus į darbalaukį Comment[lt]=Įtraukti langus į darbalaukį
Comment[nl]=Zuig vensters in het bureaublad Comment[nl]=Zuig vensters in het bureaublad

1
src/effects/windowaperture/package/metadata.desktop
View file

@ -57,6 +57,7 @@ Comment[fr]=Déplace les fenêtres dans les coins de l'écran
Comment[ia]=Move fenestra in angulos de schermo Comment[ia]=Move fenestra in angulos de schermo
Comment[id]=Pindahkan window ke sudut layar Comment[id]=Pindahkan window ke sudut layar
Comment[it]=Sposta le finestre negli angoli dello schermo Comment[it]=Sposta le finestre negli angoli dello schermo
Comment[ja]=ウィンドウを画面の角に移動します
Comment[ko]=창을 화면 꼭짓점으로 이동 Comment[ko]=창을 화면 꼭짓점으로 이동
Comment[lt]=Perkelti langus į kampus Comment[lt]=Perkelti langus į kampus
Comment[nl]=Verplaats vensters in de hoeken van het scherm Comment[nl]=Verplaats vensters in de hoeken van het scherm