Commit 11047b23 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 cbf7e1be
......@@ -18,6 +18,7 @@ Name[fi]=Bazaar
Name[fr]=Bazaar
Name[gl]=Bazaar
Name[hu]=Bazaar
Name[ia]=Bazaar
Name[id]=Bazaar
Name[is]=Bazaar
Name[it]=Bazaar
......
......@@ -18,6 +18,7 @@ Name[fi]=Dropbox
Name[fr]=DropBox
Name[gl]=Dropbox
Name[hu]=Dropbox
Name[ia]=DropBox
Name[id]=Dropbox
Name[is]=Dropbox
Name[it]=Dropbox
......
......@@ -20,6 +20,7 @@ Name[fr]=Git
Name[ga]=Git
Name[gl]=Git
Name[hu]=Git
Name[ia]=Git
Name[id]=Git
Name[is]=Git
Name[it]=Git
......
......@@ -18,6 +18,7 @@ Name[fi]=Mercurial
Name[fr]=Mercurial
Name[gl]=Mercurial
Name[hu]=Mercurial
Name[ia]=Mercurial
Name[id]=Mercurial
Name[is]=Mercurial
Name[it]=Mercurial
......
......@@ -14,6 +14,7 @@
"Name[eu]": "Muntatuta eta desmuntatu ISO irudiak",
"Name[fi]": "Liitä ja irrota ISO-levykuva",
"Name[fr]": "Monter et libérer une image « ISO »",
"Name[ia]": "Monta e dismonta image iso",
"Name[it]": "Monta e smonta immagine iso",
"Name[ko]": "ISO 이미지 마운트 및 마운트 해제",
"Name[nl]": "Aan- en afkoppelen van iso-image",
......
......@@ -21,6 +21,7 @@ Name[fr]=Subversion
Name[ga]=Subversion
Name[gl]=Subversion
Name[hu]=Subversion
Name[ia]=Subversion
Name[id]=Subversion
Name[is]=Subversion
Name[it]=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