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-08-06 05:37:09 +02:00
parent 1df27f8272
commit 39186e1442
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Logout
Name[ca]=Sortida
Name[ca@valencia]=Eixida
Name[cs]=Odhlášení
Name[eu]=Saio-ixtea
Name[fr]=Déconnexion
@ -16,6 +17,7 @@ Name[zh_TW]=登出
Icon=preferences-system-windows-effect-logout
Comment=Smoothly fade to the logout screen
Comment[ca]=Transició suau a la pantalla de sortida
Comment[ca@valencia]=Transició suau a la pantalla d'eixida
Comment[eu]=Emeki desagertu saio-ixteko pantailarantz
Comment[fr]=Effectue un dégradé progressif vers l'écran de déconnexion
Comment[id]=Memudar dengan halus ke layar logout