marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 14: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 2021-09-26 02:14:27 +00:00
parent a3791ee081
commit 92cb1290dc
1 changed files with 1 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

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