Commit fd1516ff authored by Script Kiddy's avatar Script Kiddy
Browse files

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 f5dd6294
......@@ -3,61 +3,6 @@ Type=Application
TryExec=marble
Exec=marble %F
Name=KDE Marble
Name[ast]=Marble
Name[bg]=Marble
Name[bs]=Marble
Name[ca]=Marble
Name[ca@valencia]=Marble
Name[cs]=Marble
Name[csb]=Marble
Name[da]=Marble
Name[de]=Marble
Name[el]=Marble
Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
Name[gl]=Marble
Name[gu]=માર્બલ
Name[he]=Marble
Name[hi]=संगमरमर
Name[hne]=संगमरमर
Name[hr]=Marble
Name[hu]=Marble
Name[is]=Marble
Name[it]=Marble
Name[ja]=Marble
Name[kk]=Marble
Name[km]=ថ្មម៉ាប
Name[ko]=Marble
Name[lt]=Marble
Name[lv]=Marble
Name[ml]=മാര്‍ബിള്‍
Name[mr]=मार्बल
Name[nb]=Marble
Name[nds]=Marble
Name[ne]=मार्बल
Name[nl]=Marble
Name[nn]=Marble
Name[pa]=ਮਾਰਬਲ
Name[pl]=Marble
Name[pt]=Marble
Name[pt_BR]=Marble
Name[ro]=Marble
Name[ru]=Marble
Name[sk]=Marble
Name[sl]=Marble
Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
GenericName=Virtual Globe
GenericName[bg]=Настолен глобус
GenericName[bs]=Virtualni globus
......
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