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 2017-09-27 09:13:10 +02:00
parent b437a6cbda
commit 475af42e37
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
View file

@ -11,7 +11,7 @@ Name[es]=Cambiador de ventanas de KWin
Name[eu]=KWin leiho-aldatzailea
Name[fi]=KWin-ikkunanvalitsin
Name[fr]=Sélecteur de fenêtres de KWin
Name[gl]=Selector de xanela do KWin
Name[gl]=Selector de xanela de KWin
Name[hu]=KWin ablakváltó
Name[ia]=Commutator de fenestra de KWin
Name[it]=Scambiafinestre di KWin

2
scripting/kwinscript.desktop
View file

@ -17,7 +17,7 @@ Comment[eu]=KWin scripta
Comment[fi]=KWin-skripti
Comment[fr]=Script KWin
Comment[ga]=Script KWin
Comment[gl]=Script do KWin
Comment[gl]=Script de KWin
Comment[he]=תוספים של KWin
Comment[hu]=KWin parancsfájl
Comment[ia]=Script de kwin