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"
This commit is contained in:
parent
c9aca6830c
commit
522ae367d6
1 changed files with 10 additions and 0 deletions
|
@ -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"
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue