Commit 6e950617 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 f93d5ede
......@@ -41,7 +41,7 @@ Comment[nn]=Redigeringsprogram for HTML-biletkart
Comment[pl]=Edytor map obrazków HTML
Comment[pt]=Editor de Mapas de Imagem HTML
Comment[pt_BR]=Um editor de mapeamento de imagem HTML
Comment[ru]=Редактор HTML imagemap
Comment[ru]=Редактор табличных изображений HTML
Comment[sk]=Editor HTML mapy obrázkov
Comment[sl]=Urejevalnik slikovnih zemljevidov v HTML
Comment[sv]=En editor för HTML-bildkartor
......@@ -95,7 +95,7 @@ GenericName[nn]=HTML-biletkartredigering
GenericName[pl]=Edytor map obrazków HTML
GenericName[pt]=Editor de Mapas de Imagem HTML
GenericName[pt_BR]=Editor de mapeamento de imagem HTML
GenericName[ru]=HTML Image Map Editor
GenericName[ru]=Редактор табличных изображений HTML
GenericName[sk]=Editor HTML mapy obrázkov
GenericName[sl]=Urejevalnik slikovnih zemljevidov v HTML
GenericName[sv]=Redigering av HTML-bildkartor
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