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-03-26 07:01:20 +02:00
parent 6ff10e4405
commit 6c00ed2df8
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau
Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio.
Comment[hu]=A sarkokba mozgatja az ablakokat az asztal megjelenítése közben
Comment[ia]=Move fenestra a le angulos quando monstra scriptorio
Comment[id]=Pindah jendela ke pojok ketika menampilkan desktop
Comment[it]=Sposta la finestra negli angoli quando mostri il desktop
Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます
Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동

2
kcmkwin/kwinscreenedges/kwinscreenedges.desktop
View file

@ -98,7 +98,7 @@ Comment[fr]=Bords et coins actifs de l'écran
Comment[gl]=Bordos e esquinas activos da pantalla
Comment[he]=פינות וקצוות של המסך
Comment[hu]=Aktív képernyősarkok és szélek
Comment[id]=Sudut dan Tepi Layar Aktif
Comment[id]=Pojok dan Tepi Layar Aktif
Comment[it]=Angoli e bordi attivi dello schermo
Comment[ko]=활성 화면 경계와 꼭지점
Comment[lt]=Aktyvaus ekrano kampai ir kraštinės