Commit 68599c82 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c7411ead
Pipeline #48241 skipped
......@@ -40,7 +40,7 @@
}
],
"Description": "Use a connected device to take a photo",
"Description[ast]": "Usa un preséu coneutáu pa facer una semeya",
"Description[ast]": "Usa un preséu conectáu pa facer una semeya",
"Description[az]": "Qoşulmuş cihazla şəkil çəkmək",
"Description[ca@valencia]": "Usa un dispositiu connectat per a prendre una fotografia",
"Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia",
......
......@@ -40,7 +40,7 @@
}
],
"Description": "Control the volume of the connected device",
"Description[ast]": "Controla'l volume del preséu coneutáu",
"Description[ast]": "Controla'l volume del preséu conectáu",
"Description[az]": "Qoşulmuş cihazın səs səviyyəsini idarə etmək",
"Description[ca@valencia]": "Controla el volum del dispositiu connectat",
"Description[ca]": "Controla el volum del dispositiu connectat",
......
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