Commit d47b27f9 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 e34d8bbe
{
"KPackageStructure": "KWin/Aurorae",
"KPlugin": {
"Authors": [
{
......@@ -36,6 +37,5 @@
"Name[vi]": "Aurorae của KWin",
"Name[x-test]": "xxKWin Auroraexx",
"Version": "1"
},
"KPackageStructure": "KWin/Aurorae"
}
}
{
"KPackageStructure": "KWin/Decoration",
"KPlugin": {
"Authors": [
{
......@@ -36,6 +37,5 @@
"Name[vi]": "Trang trí KWin",
"Name[x-test]": "xxKWin Decorationxx",
"Version": "1"
},
"KPackageStructure": "KWin/Decoration"
}
}
{
"KPackageStructure": "KWin/Effect",
"KPlugin": {
"Authors": [
{
......@@ -36,6 +37,5 @@
"Name[vi]": "Hiệu ứng KWin",
"Name[x-test]": "xxKWin Effectxx",
"Version": "1"
},
"KPackageStructure": "KWin/Effect"
}
}
{
"KPackageStructure": "KWin/Script",
"KPlugin": {
"Authors": [
{
......@@ -36,6 +37,5 @@
"Name[vi]": "Kịch bản KWin",
"Name[x-test]": "xxKWin Scriptxx",
"Version": "1"
},
"KPackageStructure": "KWin/Script"
}
}
{
"KPackageStructure": "KWin/WindowSwitcher",
"KPlugin": {
"Authors": [
{
......@@ -36,6 +37,5 @@
"Name[vi]": "Trình chuyển cửa sổ KWin",
"Name[x-test]": "xxKWin Window Switcherxx",
"Version": "1"
},
"KPackageStructure": "KWin/WindowSwitcher"
}
}
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