Commit 3ec4a7a3 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 64f0459b
......@@ -33,4 +33,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "1"
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -44,4 +44,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -48,4 +48,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -51,4 +51,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -53,4 +53,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -53,4 +53,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -53,4 +53,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -50,4 +50,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -50,4 +50,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "1"
}
\ No newline at end of file
}
......@@ -54,4 +54,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -52,4 +52,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
{
"KPlugin": {
"Description": "This plugin allows you to add automatically email address to addressbook.",
"EnabledByDefault": "true",
"Description": "This plugin allows you to add automatically email address to addressbook.",
"Id": "kmailautomaticaddcontacts",
"Name": "Automatic Add Contacts",
"Name[ca@valencia]": "Afig automàticament als contactes",
......
{
"KPlugin": {
"Description": "This plugin allows you to check message settings before sending.",
"EnabledByDefault": "true",
"Description": "This plugin allows you to check message settings before sending.",
"Id": "kmailcheckbeforesend",
"Name": "Check Before Send",
"Name[ca@valencia]": "Comprova abans d'enviar",
......
......@@ -48,4 +48,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -44,4 +44,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
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