Commit f975f53a 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 60915935
......@@ -13,6 +13,7 @@
}
],
"Description": "Preview the document in the target format",
"Description[ast]": "Previsualiza los documentos nel formatu de destín",
"Description[ca@valencia]": "Vista prèvia del document en el format de destí",
"Description[ca]": "Vista prèvia del document en el format de destí",
"Description[da]": "Forhåndsvis dokumentet i målformatet",
......@@ -45,6 +46,7 @@
"Icon": "document-preview",
"Id": "ktexteditorpreview",
"Name": "Document Preview",
"Name[ast]": "Previsualización de documentos",
"Name[ca@valencia]": "Vista prèvia de document",
"Name[ca]": "Vista prèvia de document",
"Name[cs]": "Náhled na dokument",
......
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