Commit fd1fbcbe 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 a40c6e81
Pipeline #4945 passed with stage
in 12 minutes and 13 seconds
......@@ -3,7 +3,42 @@
"Authors": [
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol"
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
"Name[da]": "Aleix Pol",
"Name[de]": "Aleix Pol",
"Name[el]": "Aleix Pol",
"Name[en_GB]": "Aleix Pol",
"Name[es]": "Aleix Pol",
"Name[et]": "Aleix Pol",
"Name[eu]": "Aleix Pol",
"Name[fi]": "Aleix Pol",
"Name[fr]": "Aleix Pol",
"Name[gl]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ko]": "Aleix Pol",
"Name[lt]": "Aleix Pol",
"Name[nl]": "Aleix Pol",
"Name[nn]": "Aleix Pol",
"Name[pl]": "Aleix Pol",
"Name[pt]": "Aleix Pol",
"Name[pt_BR]": "Aleix Pol",
"Name[ru]": "Aleix Pol",
"Name[sk]": "Aleix Pol",
"Name[sr@ijekavian]": "Алекс Пол Гонзалез",
"Name[sr@ijekavianlatin]": "Aleks Pol Gonzalez",
"Name[sr@latin]": "Aleks Pol Gonzalez",
"Name[sr]": "Алекс Пол Гонзалез",
"Name[sv]": "Aleix Pol",
"Name[tr]": "Aleix Pol",
"Name[uk]": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx",
"Name[zh_CN]": "Aleix Pol",
"Name[zh_TW]": "Aleix Pol"
}
],
"Description": "",
......@@ -12,7 +47,9 @@
"Id": "kdeconnect_presenter",
"License": "GPL",
"Name": "Presenter",
"ServiceTypes": [ "KdeConnect/Plugin" ]
"ServiceTypes": [
"KdeConnect/Plugin"
]
},
"X-KdeConnect-OutgoingPacketType": [],
"X-KdeConnect-SupportedPacketType": [
......
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