Commit 60e0b20b 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 f20d7639
......@@ -12,6 +12,7 @@ Name[it]=Pix
Name[ko]=Pix
Name[lt]=Pix
Name[nl]=Pix
Name[nn]=Pix
Name[pl]=Pix
Name[pt]=Pix
Name[sk]=Pix
......@@ -31,6 +32,7 @@ Comment[it]=Visualizzatore della galleria di immagini
Comment[ko]=그림 갤러리 뷰어
Comment[lt]=Paveikslų galerijos žiūryklė
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[sk]=Prehliadač galérie obrázkov
......@@ -59,6 +61,7 @@ GenericName[it]=Galleria di immagini
GenericName[ko]=그림 갤러리
GenericName[lt]=Paveikslų galerija
GenericName[nl]=Galerij met afbeeldingen
GenericName[nn]=Biletgalleri
GenericName[pl]=Galeria obrazów
GenericName[pt]=Galeria de Imagens
GenericName[sk]=Galéria obrázkov
......
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