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-10-18 01:18:59 +00:00
parent 9cc7722e2a
commit 21f28c6ae8
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

@ -6,6 +6,7 @@ Name[en_GB]=Airplane Mode
Name[es]=Modo avión
Name[eu]=Hegaldi modua
Name[fr]=Mode Avion
Name[hu]=Repülős üzemmód
Name[ia]=Modo aeroplano
Name[nl]=Vliegtuigmodus
Name[nn]=Flymodus

1
quicksettings/nightcolor/metadata.desktop
View file

@ -7,6 +7,7 @@ Name[es]=Color nocturno
Name[eu]=Gaueko kolorea
Name[fi]=Yöväri
Name[fr]=Couleur de nuit
Name[hu]=Éjszakai színek
Name[ia]=Color de Nocte
Name[it]=Colore notturno
Name[ko]=야간 색상