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-12-22 01:43:01 +00:00
parent 0c8cd94fe8
commit 16035a5640
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/airplanemode/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Airplane Mode
Name[ca]=Mode avió
Name[ca@valencia]=Mode avió
Name[cs]=Režim v Letadle
Name[de]=Flugzeug-Modus
Name[en_GB]=Airplane Mode
Name[es]=Modo avión
Name[eu]=Hegaldi modua

1
quicksettings/nightcolor/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Night Color
Name[ca]=Color de nit
Name[ca@valencia]=Color de nit
Name[cs]=Noční barva
Name[de]=Nachtfarben
Name[en_GB]=Night Colour
Name[es]=Color nocturno
Name[eu]=Gaueko kolorea