Commit a0c1a579 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 6434909e
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show your phone battery next to your computer battery",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Share the clipboard between devices",
......
......@@ -3,11 +3,13 @@
"Authors": [
{
"Email": "apparle@gmail.com",
"Name": "Apoorv Parle"
"Name": "Apoorv Parle",
"Name[x-test]": "xxApoorv Parlexx"
},
{
"Email": "davidedmundson@kde.org",
"Name": "David Edmundson"
"Name": "David Edmundson",
"Name[x-test]": "xxDavid Edmundsonxx"
}
],
"Description": "Find your lost phone by making it play an alarm sound ",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol"
"Name": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Locks your systems",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "ahmedibrahimkhali@gmail.com",
"Name": "Ahmed I. Khalil"
"Name": "Ahmed I. Khalil",
"Name[x-test]": "xxAhmed I. Khalilxx"
}
],
"Description": "Use your phone as a touchpad and keyboard",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Remote control your music and videos",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol"
"Name": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Control MPRIS services",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show phone notifications on your computer and keep them in sync",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Pause music/videos during a phone call",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Send and receive pings",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol"
"Name": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Control Remote systems",
......
......@@ -4,11 +4,13 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
},
{
"Email": "david@davidedmundson.co.uk",
"Name": "David Edmundson"
"Name": "David Edmundson",
"Name[x-test]": "xxDavid Edmundsonxx"
}
],
"Description": "Execute console commands remotely",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "pmdematagoda@mykolab.ch",
"Name": "Pramod Dematagoda"
"Name": "Pramod Dematagoda",
"Name[x-test]": "xxPramod Dematagodaxx"
}
],
"Description": "Inhibit the screensaver when the device is connected",
......
......@@ -4,7 +4,9 @@
"Authors": [
{
"Email": "kinnalru@gmail.com",
"Name": "Samoilenko Yuri"
"Name": "Samoilenko Yuri",
"Name[uk]": "Юрій Самойленко",
"Name[x-test]": "xxSamoilenko Yurixx"
}
],
"Description": "Browse the remote device filesystem using SFTP",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Receive and send files, URLs or plain text easily",
......
......@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
"Name": "Albert Vaca",
"Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show notifications for calls and SMS (answering coming soon)",
......
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