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 2024-01-19 02:55:52 +00:00
parent 45b09c8074
commit 079db711a1
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

@ -901,6 +901,7 @@ Name[fi]=Vastaanotettiin tekstiä
Name[fr]=Texte reçu
Name[gl]=Recibiuse texto
Name[he]=התקבלה הודעה
Name[hu]=Szöveg érkezett
Name[ia]=Texto Recipite
Name[it]=Testo ricevuto
Name[ka]=მიღებულია ტექსტი
@ -936,6 +937,7 @@ Comment[fi]=Vastaanotettiin tekstiä
Comment[fr]=Réception de quelques éléments de texte
Comment[gl]=Recibiuse un texto
Comment[he]=הגיע טקסט כלשהו
Comment[hu]=Némi szöveg érkezett
Comment[ia]=Recipite alcun texto
Comment[it]=Testo ricevuto
Comment[ka]=მიღებულია რაღაც ტექსტი