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 2019-07-05 08:31:03 +02:00
parent 1c5b3d3bab
commit e8459aeca8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/share/kdeconnect_share.json
View file

@ -65,7 +65,7 @@
"Description[pl]": "Udostępniaj i otrzymuj pliki, adresy URL lub zwykły tekst z łatwością",
"Description[pt]": "Receber e enviar ficheiros, URL's ou texto normal de forma simples",
"Description[pt_BR]": "Recebe e envia facilmente arquivos, URLs ou texto simples",
"Description[ru]": "Получение и отправка файлов, URL адресов или простого текста",
"Description[ru]": "Получение и отправка файлов, адресов URL или простого текста",
"Description[sk]": "Prijať a poslať súbory, URL alebo čisté texty jednoducho",
"Description[sr@ijekavian]": "Примај и шаљи фајлове, УРЛ‑ове или обичан текст, са лакоћом",
"Description[sr@ijekavianlatin]": "Primaj i šalji fajlove, URL‑ove ili običan tekst, sa lakoćom",