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 2017-05-02 10:15:05 +02:00
parent c2f443e350
commit de87abd067
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wallpaper/metadata.desktop
View file

@ -4,6 +4,7 @@ Name[ast]=Bloquiadores de Plasma Phone
Name[ca]=Bloqueigs del telèfon del Plasma Name[ca]=Bloqueigs del telèfon del Plasma
Name[ca@valencia]=Bloqueigs del telèfon del Plasma Name[ca@valencia]=Bloqueigs del telèfon del Plasma
Name[en_GB]=Plasma Phone Lockers Name[en_GB]=Plasma Phone Lockers
Name[es]=Bloqueos del teléfono de Plasma
Name[nl]=Plasma telefoonvergrendeling Name[nl]=Plasma telefoonvergrendeling
Name[nn]=Telefonlåsarar for Plasma Name[nn]=Telefonlåsarar for Plasma
Name[pl]=Blokady telefonu plazmy Name[pl]=Blokady telefonu plazmy