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-24 05:30:15 +02:00
parent 43382ec7a7
commit 76424c157b
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/org.kde.kdeconnect_open.desktop
View file

@ -1,7 +1,9 @@
[Desktop Entry]
GenericName=Open on connected device via KDE Connect
GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect
GenericName[cs]=Otevřít na připojeném zařízení přes KDE Connect
GenericName[it]=Apri nel dispositivo connesso tramite KDE Connect
GenericName[ko]=KDE Connect로 연결된 장치에서 열기
GenericName[nl]=Op verbonden apparaat openen via KDE Connect
GenericName[nn]=Opna på tilkopla eining via KDE Connect
GenericName[pt]=Abrir no dispositivo ligado com o KDE Connect
@ -11,7 +13,9 @@ GenericName[uk]=Відкрити на з'єднаному пристрої за
GenericName[x-test]=xxOpen on connected device via KDE Connectxx
Name=Open on connected device via KDE Connect
Name[ca]=Obre al dispositiu connectat a través del KDE Connect
Name[cs]=Otevřít na připojeném zařízení přes KDE Connect
Name[it]=Apri nel dispositivo connesso tramite KDE Connect
Name[ko]=KDE Connect로 연결된 장치에서 열기
Name[nl]=Op verbonden apparaat openen via KDE Connect
Name[nn]=Opna på tilkopla eining via KDE Connect
Name[pt]=Abrir no dispositivo ligado com o KDE Connect
@ -21,7 +25,9 @@ Name[uk]=Відкрити на з'єднаному пристрої за доп
Name[x-test]=xxOpen on connected device via KDE Connectxx
Comment=Open on a connected device using KDE Connect
Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect
Comment[cs]=Otevřít na připojeném zařízení pomocí KDE Connect
Comment[it]=Apri in un dispositivo connesso usando KDE Connect
Comment[ko]=KDE Connect로 연결된 장치에서 열기
Comment[nl]=Op een verbonden apparaat openen via KDE Connect
Comment[nn]=Opna på ei tilkopla eining via KDE Connect
Comment[pt]=Abrir num dispositivo ligado com o KDE Connect

6
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -129,9 +129,11 @@
"Website": "https://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPacketType": [
"kdeconnect.clipboard", "kdeconnect.clipboard.connect"
"kdeconnect.clipboard",
"kdeconnect.clipboard.connect"
],
"X-KdeConnect-SupportedPacketType": [
"kdeconnect.clipboard", "kdeconnect.clipboard.connect"
"kdeconnect.clipboard",
"kdeconnect.clipboard.connect"
]
}