Commit c5ead097 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 dc9fe6c8
[Desktop Entry]
Name=KompareNavTreePart
Name[ast]=KompareNavTreePart
Name[bg]=KompareNavTreePart
Name[br]=KompareNavTreePart
Name[bs]=KompareNavTreePart
......
......@@ -2,7 +2,6 @@
GenericComment=A part to graphically show the difference between 2 files
Name=KomparePart
Name[af]=K-vergelyk-deel
Name[ast]=KomparePart
Name[bg]=KomparePart
Name[br]=KomparePart
Name[bs]=KomparePart
......
......@@ -67,7 +67,6 @@ Name[zh_CN]=Kompare
Name[zh_TW]=Kompare
GenericName=Diff/Patch Frontend
GenericName[af]=Diff/Lap Voorprogram
GenericName[ast]=Interfaz Diff/Patch
GenericName[bg]=Интерфейс за Diff/Patch
GenericName[bs]=Poređenje datoteka za KDE pomoću Diff/Patch
GenericName[ca]=Frontal del Diff/Patch
......
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