marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 01:34:46 +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-19 01:28:51 +00:00
parent 1e96ec0f3f
commit 1e01aa53e5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
quicksettings/airplanemode/metadata.desktop
View file

@ -3,10 +3,13 @@ Name=Airplane Mode
Name[ca]=Mode avió Name[ca]=Mode avió
Name[cs]=Režim v Letadle Name[cs]=Režim v Letadle
Name[es]=Modo avión Name[es]=Modo avión
Name[fr]=Mode Avion
Name[nl]=Vliegtuigmodus Name[nl]=Vliegtuigmodus
Name[sl]=Letalski način
Name[sv]=Flygplansläge Name[sv]=Flygplansläge
Name[uk]=Режим польоту Name[uk]=Режим польоту
Name[x-test]=xxAirplane Modexx Name[x-test]=xxAirplane Modexx
Name[zh_CN]=飞行模式
Icon=network-flightmode-on Icon=network-flightmode-on
Type=Service Type=Service