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 2020-06-25 09:00:40 +02:00
parent 3bfc750a79
commit b62f687c37
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ Name[en_GB]=Eye on Screen
Name[es]=Ojo a la pantalla
Name[et]=Eye on Screen
Name[eu]=Begirada pantailan
Name[fi]=Silmä näytöllä
Name[fr]=Jeter un oeil sur le bureau
Name[ia]=Eye On Screen (Oculo sur schermo)
Name[id]=Mata di Layar
@ -31,6 +32,7 @@ Comment[en_GB]=Suck windows into the desktop
Comment[es]=Aspirar las ventanas en el escritorio
Comment[et]=Akende imemine töölauale
Comment[eu]=Mahaigainak leihoak xurgatu
Comment[fi]=Imaise ikkunat työpöydälle
Comment[fr]=Faire disparaître les fenêtres dans le bureau
Comment[ia]=Suger fenestras in le scriptorio
Comment[id]=Sedot window ke desktop

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

@ -48,6 +48,7 @@ Comment[en_GB]=Move windows into screen corners
Comment[es]=Mover las ventanas a las esquinas de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
Comment[eu]=Eraman leihoak pantailako bazterretara
Comment[fi]=Siirrä ikkunat näytön kulmiin
Comment[fr]=Déplace les fenêtres dans les coins de l'écran
Comment[ia]=Move fenestra in angulos de schermo
Comment[id]=Pindahkan window ke sudut layar