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-03-08 01:43:20 +00:00
parent 107dfb9e3d
commit e2d0ef02bc
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

@ -90,7 +90,7 @@
"Description[sr@latin]": "Primaj i šalji fajlove, URL‑ove ili običan tekst, sa lakoćom", "Description[sr@latin]": "Primaj i šalji fajlove, URL‑ove ili običan tekst, sa lakoćom",
"Description[sr]": "Примај и шаљи фајлове, УРЛ‑ове или обичан текст, са лакоћом", "Description[sr]": "Примај и шаљи фајлове, УРЛ‑ове или обичан текст, са лакоћом",
"Description[sv]": "Ta emot och skicka filer, webbadresser eller vanlig text enkelt", "Description[sv]": "Ta emot och skicka filer, webbadresser eller vanlig text enkelt",
"Description[tr]": "Dosyaları, adres ve düz metinleri kolayca alın ve gönderin", "Description[tr]": "Dosyaları, URL'leri ve düz metinleri kolayca alın ve gönderin",
"Description[uk]": "Спрощене отримання і надсилання файлів, адрес або текстових фрагментів", "Description[uk]": "Спрощене отримання і надсилання файлів, адрес або текстових фрагментів",
"Description[x-test]": "xxReceive and send files, URLs or plain text easilyxx", "Description[x-test]": "xxReceive and send files, URLs or plain text easilyxx",
"Description[zh_CN]": "简单地接收和发送文件，URL 或者文本", "Description[zh_CN]": "简单地接收和发送文件，URL 或者文本",