marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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-11 01:22:06 +00:00
parent 4d8bf06da1
commit ae77de27e2
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

@ -2,6 +2,7 @@
Name=Airplane Mode Name=Airplane Mode
Name[ca]=Mode avió Name[ca]=Mode avió
Name[cs]=Režim v Letadle Name[cs]=Režim v Letadle
Name[en_GB]=Airplane Mode
Name[es]=Modo avión Name[es]=Modo avión
Name[eu]=Hegaldi modua Name[eu]=Hegaldi modua
Name[fr]=Mode Avion Name[fr]=Mode Avion