marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +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 2021-07-26 01:17:42 +00:00
parent 989d6fdc1d
commit 622d96d50a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quicksettings/nightcolor/metadata.desktop
View file

@ -2,7 +2,9 @@
Name=Night Color Name=Night Color
Name[ca]=Color de nit Name[ca]=Color de nit
Name[cs]=Noční barva Name[cs]=Noční barva
Name[en_GB]=Night Colour
Name[es]=Color nocturno Name[es]=Color nocturno
Name[eu]=Gaueko kolorea
Name[fr]=Couleur de nuit Name[fr]=Couleur de nuit
Name[nl]=Nachtkleur Name[nl]=Nachtkleur
Name[pt]=Cor Nocturna Name[pt]=Cor Nocturna