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-04-30 01:17:56 +00:00
parent 0ed2053e79
commit daf02cc028
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kwinmultitasking/metadata.desktop
View file

@ -38,6 +38,7 @@ Comment[ast]=Interfaz d'usuariu multixera pa teléfonos
Comment[ca]=Interfície d'usuari multitasca per als dispositius de telèfon
Comment[ca@valencia]=Interfície d'usuari multitasca per als dispositius de telèfon
Comment[da]=Brugerflade med multitasking til telefoner
Comment[de]=Multitasking-Benutzeroberfläche für Plasma-Telefongeräte
Comment[en_GB]=Multitasking user interface for Phone devices
Comment[es]=Interfaz de usuario multitarea para teléfonos
Comment[et]=Telefonide multitegumtöö kasutajaliides

1
look-and-feel/metadata.desktop
View file

@ -5,6 +5,7 @@ Name[ca]=Telèfon del Plasma
Name[ca@valencia]=Telèfon del Plasma
Name[cs]=Plasma Phone
Name[da]=Plasma Phone
Name[de]=Plasma Phone
Name[en_GB]=Plasma Phone
Name[es]=Plasma Phone
Name[et]=Plasma telefon