Commit ef82360a 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 9f0b7241
......@@ -45,7 +45,6 @@ Name[sv]=Bazaar
Name[tr]=Bazaar
Name[ug]=Bazaar
Name[uk]=Bazaar
Name[x-test]=xxBazaarxx
Name[zh_CN]=Bazaar
Name[zh_TW]=Bazaar
X-KDE-ServiceTypes=FileViewVersionControlPlugin
......
......@@ -40,7 +40,6 @@ Name[sr@latin]=Dropbox
Name[sv]=Dropbox
Name[tr]=Dropbox
Name[uk]=Dropbox
Name[x-test]=xxDropboxxx
Name[zh_CN]=Dropbox
Name[zh_TW]=Dropbox
X-KDE-ServiceTypes=FileViewVersionControlPlugin
......
......@@ -48,7 +48,6 @@ Name[sv]=Git
Name[tr]=Git
Name[ug]=Git
Name[uk]=Git
Name[x-test]=xxGitxx
Name[zh_CN]=Git
Name[zh_TW]=Git
X-KDE-ServiceTypes=FileViewVersionControlPlugin
......
......@@ -43,7 +43,6 @@ Name[sr@latin]=Mercurial
Name[sv]=Mercurial
Name[tr]=Mercurial
Name[uk]=Mercurial
Name[x-test]=xxMercurialxx
Name[zh_CN]=Mercurial
Name[zh_TW]=Mercurial
X-KDE-ServiceTypes=FileViewVersionControlPlugin
......
......@@ -21,7 +21,6 @@
"Name[sl]": "Priklopi in odklopi iso sliko sistema",
"Name[sv]": "Montera och avmontera ISO-avbild",
"Name[uk]": "Монтування і демонтування образів ISO",
"Name[x-test]": "xxMount and unmount iso imagexx",
"ServiceTypes": [
"KFileItemAction/Plugin"
]
......
......@@ -49,7 +49,6 @@ Name[sv]=Subversion
Name[tr]=Subversion
Name[ug]=Subversion
Name[uk]=Subversion
Name[x-test]=xxSubversionxx
Name[zh_CN]=Subversion
Name[zh_TW]=Subversion
X-KDE-ServiceTypes=FileViewVersionControlPlugin
......
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