marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 09:18:07 +00:00
Code Issues 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 2022-02-13 01:42:21 +00:00
parent 3453760dd3
commit 3cb0a38040
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
quicksettings/caffeine/metadata.desktop
View file

@ -3,6 +3,11 @@
[Desktop Entry] [Desktop Entry]
Name=Caffeine Name=Caffeine
Name[ca]=Caffeine
Name[nl]=Cafeïne
Name[sv]=Koffein
Name[uk]=Кофеїн
Name[x-test]=xxCaffeinexx
Icon=system-suspend-hibernate Icon=system-suspend-hibernate
Type=Service Type=Service

5
quicksettings/powermenu/package/metadata.desktop
View file

@ -3,6 +3,11 @@
[Desktop Entry] [Desktop Entry]
Name=Power Menu Name=Power Menu
Name[ca]=Power Menu
Name[nl]=Energiemenu
Name[sv]=Strömmeny
Name[uk]=Меню живлення
Name[x-test]=xxPower Menuxx
Icon=system-shutdown-symbolic Icon=system-shutdown-symbolic
Type=Service Type=Service