tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests 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 2023-07-30 03:08:18 +00:00
parent 0fe35ee08b
commit 1565f0a0ae
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/kdeconnect.notifyrc
View file

@ -868,6 +868,7 @@ Name[cs]=Text byl přijat
Name[de]=Text empfangen Name[de]=Text empfangen
Name[en_GB]=Text Received Name[en_GB]=Text Received
Name[es]=Texto recibido Name[es]=Texto recibido
Name[eu]=Testua jaso du
Name[fi]=Vastaanotettiin tekstiä Name[fi]=Vastaanotettiin tekstiä
Name[fr]=Texte reçu Name[fr]=Texte reçu
Name[gl]=Recibiuse texto Name[gl]=Recibiuse texto
@ -896,6 +897,7 @@ Comment[ca@valencia]=S'ha rebut text
Comment[cs]=Byl přijat nějaký text Comment[cs]=Byl přijat nějaký text
Comment[en_GB]=Received some text Comment[en_GB]=Received some text
Comment[es]=Ha recibido un texto Comment[es]=Ha recibido un texto
Comment[eu]=Testu batzuk jaso ditu
Comment[fi]=Vastaanotettiin tekstiä Comment[fi]=Vastaanotettiin tekstiä
Comment[fr]=Réception de quelques éléments de texte Comment[fr]=Réception de quelques éléments de texte
Comment[gl]=Recibiuse un texto Comment[gl]=Recibiuse un texto