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 2020-01-09 05:54:13 +01:00
parent 2b9cec93b0
commit ca8f308727
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/metadata.desktop
View file

@ -39,6 +39,7 @@ Comment[en_GB]=Plasma shell for phones
Comment[es]=Interfaz de Plasma para teléfonos
Comment[et]=Plasma kest telefonidele
Comment[eu]=Telefonoetarako Plasma oskola
Comment[fi]=Plasma-työtila puhelimiin
Comment[fr]=Terminal Plasma pour smartphones
Comment[gl]=Intérprete de ordes de Plasma para móbiles
Comment[hu]=Plasma felület telefonokhoz

1
wallpaper/metadata.desktop
View file

@ -6,6 +6,7 @@ Name[en_GB]=Plasma Phone Lockers
Name[es]=Bloqueos del teléfono de Plasma
Name[et]=Plasma telefonilukustajad
Name[eu]=Plasma telefono giltzatzaileak
Name[fi]=Plasman puhelinlukot
Name[fr]=Verrouillage de téléphone Plasma
Name[gl]=Casilleiros de Plasma Phone
Name[hu]=Plasma Phone zárképernyők