Commit 64e2b26b 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 39dd9b7a
......@@ -18,6 +18,7 @@ Name[eu]=Bazaar
Name[fi]=Bazaar
Name[fr]=Bazaar
Name[gl]=Bazaar
Name[hi]=बाज़ार
Name[hu]=Bazaar
Name[id]=Bazaar
Name[is]=Bazaar
......
......@@ -18,6 +18,7 @@ Name[eu]=Dropbox
Name[fi]=Dropbox
Name[fr]=DropBox
Name[gl]=Dropbox
Name[hi]=ड्रॉपबॉक्स
Name[hu]=Dropbox
Name[id]=Dropbox
Name[is]=Dropbox
......
......@@ -20,6 +20,7 @@ Name[fi]=Git
Name[fr]=Git
Name[ga]=Git
Name[gl]=Git
Name[hi]=गिट
Name[hu]=Git
Name[id]=Git
Name[is]=Git
......
......@@ -18,6 +18,7 @@ Name[eu]=Mercurial
Name[fi]=Mercurial
Name[fr]=Mercurial
Name[gl]=Mercurial
Name[hi]=मर्कुरियल
Name[hu]=Mercurial
Name[id]=Mercurial
Name[is]=Mercurial
......
......@@ -21,6 +21,7 @@ Name[fi]=Subversion
Name[fr]=Subversion
Name[ga]=Subversion
Name[gl]=Subversion
Name[hi]=सबवर्सन
Name[hu]=Subversion
Name[id]=Subversion
Name[is]=Subversion
......
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