Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 522ae367 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent c9aca683
Pipeline #1282 passed with stage
in 12 minutes and 43 seconds
......@@ -30,11 +30,21 @@
}
],
"Description": "Use a connected device to take a photo",
"Description[ca@valencia]": "Usa un dispositiu connectat per fer una fotografia",
"Description[ca]": "Usa un dispositiu connectat per fer una fotografia",
"Description[nl]": "Gebruik een verbonden apparaat om een foto te nemen",
"Description[uk]": "Скористатися з'єднаним пристроєм для фотографування",
"Description[x-test]": "xxUse a connected device to take a photoxx",
"EnabledByDefault": true,
"Icon": "camera-photo",
"Id": "kdeconnect_photo",
"License": "GPL",
"Name": "Photo",
"Name[ca@valencia]": "Fotografia",
"Name[ca]": "Fotografia",
"Name[nl]": "Foto",
"Name[uk]": "Фото",
"Name[x-test]": "xxPhotoxx",
"ServiceTypes": [
"KdeConnect/Plugin"
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment