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 2015-08-31 11:22:32 +00:00
parent ba3d4228f5
commit 3bcd24b009
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,7 @@ Comment[en_GB]=Smoothly fade to the desktop when logging in
Comment[es]=Desvanece el escritorio cuando se inicia la sesión
Comment[et]=Töölaua sujuv ilmumine sisselogimisel
Comment[eu]=Mahaigaina pixkanaka desagertzen da saioa hastean
Comment[fi]=Häivytä pehmeästi työpöytään sisäänkirjauduttaessa
Comment[fi]=Häivytä pehmeästi työpöydälle kirjauduttaessa sisään
Comment[fr]=Effectue un dégradé progressif vers le bureau lors de la connexion
Comment[fy]=Lit it opstartskerm ferdizenje nei it buroblêd ûnder it oanmelden
Comment[ga]=Céimnigh go dtí an deasc go réidh ag am logála isteach