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-03-17 03:50:12 +01:00
parent 926f2136e8
commit 12a02451df
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,11 @@
[Desktop Entry]
Name=logout
Name[ca]=sortida
Name[nl]=afmelden
Name[pt]=encerramento
Name[sv]=utloggning
Name[uk]=вихід
Name[x-test]=xxlogoutxx
Icon=preferences-system-windows-effect-logout
Comment=Smoothly fade to the desktop when logging in
Comment[ar]=اظهار سطح المكتب بنعومة عند الولوج

6
packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
View file

@ -1,5 +1,11 @@
[Desktop Entry]
Name=KWin Aurorae
Name[ca]=Aurorae del KWin
Name[nl]=KWin Aurorae
Name[pt]=Aurora do KWin
Name[sv]=Kwin-aurora
Name[uk]=KWin Aurorae
Name[x-test]=xxKWin Auroraexx
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_aurorae

6
packageplugins/decoration/kwin-packagestructure-decoration.desktop
View file

@ -1,5 +1,11 @@
[Desktop Entry]
Name=KWin Decoration
Name[ca]=Decoració del KWin
Name[nl]=KWin-decoraties
Name[pt]=Decorações do KWin
Name[sv]=Kwin-dekoration
Name[uk]=Обрамлення вікон KWin
Name[x-test]=xxKWin Decorationxx
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_decoration