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-11-25 01:31:28 +00:00
parent a63dcf2d9b
commit d544f70d56
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

@ -9,6 +9,7 @@ Name[fi]=Lentokonetila
Name[fr]=Mode Avion
Name[hu]=Repülős üzemmód
Name[ia]=Modo aeroplano
Name[it]=Modalità aereo
Name[ko]=비행기 모드
Name[nl]=Vliegtuigmodus
Name[nn]=Flymodus