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 2018-06-10 05:27:27 +02:00
parent ff7b037422
commit efcebd1209
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dialer/src/plasma_dialer.notifyrc
View file

@ -73,6 +73,7 @@ Name[cs]=Zvoní
Name[de]=Es klingelt
Name[en_GB]=Ringing
Name[es]=Sonando
Name[fr]=Sonnerie en cours
Name[gl]=Chámano
Name[it]=Sta squillando
Name[nl]=Bel gaat over
@ -93,6 +94,7 @@ Comment[cs]=Telefon zvoní
Comment[de]=Das Telefon klingelt
Comment[en_GB]=The phone is ringing
Comment[es]=El teléfono está sonando
Comment[fr]=Le téléphone est en train de sonner
Comment[gl]=Está a recibir unha chamada.
Comment[it]=Il telefono sta squillando
Comment[nl]=De telefoon gaat over