Commit 3127976a 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 d8331e25
......@@ -15,6 +15,7 @@ Name[nl]=Pix
Name[nn]=Pix
Name[pl]=Pix
Name[pt]=Pix
Name[pt_BR]=Pix
Name[sk]=Pix
Name[sv]=Pix
Name[uk]=Pix
......@@ -35,6 +36,7 @@ Comment[nl]=Viewer van galerij met afbeeldingen
Comment[nn]=Biletgalleri-visar
Comment[pl]=Przeglądarka galerii obrazów
Comment[pt]=Visualizador de galerias de imagens
Comment[pt_BR]=Visualizador de galeria de imagens
Comment[sk]=Prehliadač galérie obrázkov
Comment[sv]=Bildgallerivisning
Comment[uk]=Перегляд галерей зображень
......@@ -64,6 +66,7 @@ GenericName[nl]=Galerij met afbeeldingen
GenericName[nn]=Biletgalleri
GenericName[pl]=Galeria obrazów
GenericName[pt]=Galeria de Imagens
GenericName[pt_BR]=Galeria de imagens
GenericName[sk]=Galéria obrázkov
GenericName[sv]=Bildgalleri
GenericName[uk]=Галерея зображень
......
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