marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 22:33:08 +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-03-13 01:57:43 +00:00
parent 4b53b4da5c
commit 6be4fae2c7
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quicksettings/caffeine/metadata.desktop
View file

@ -10,6 +10,7 @@ Name[cs]=Caffeine
Name[en_GB]=Caffeine
Name[es]=Cafeína
Name[eu]=Caffeine
Name[fi]=Caffeine
Name[fr]=Caffeine
Name[hi]=कैफीन
Name[hu]=Caffeine

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

@ -9,6 +9,7 @@ Name[ca@valencia]=Power Menu
Name[en_GB]=Power Menu
Name[es]=Menú de energía
Name[eu]=Energia menua
Name[fi]=Virranhallintavalikko
Name[fr]=Menu « Énergie »
Name[hi]=शक्ती मेन्यू
Name[hu]=Energia menü