marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 22:53: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-05 01:20:23 +00:00
parent 5411b8c962
commit 204acee273
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

@ -9,6 +9,7 @@ Name[ia]=Modo aeroplano
Name[nl]=Vliegtuigmodus
Name[nn]=Flymodus
Name[pl]=Tryb samolotowy
Name[ru]=Режим полёта
Name[sl]=Letalski način
Name[sv]=Flygplansläge
Name[uk]=Режим польоту

1
quicksettings/nightcolor/metadata.desktop
View file

@ -15,6 +15,7 @@ Name[nn]=Nattfargar
Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna
Name[ru]=Ночная цветовая схема
Name[sk]=Nočná farba
Name[sl]=Nočna barva
Name[sv]=Nattfärg