Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 216dd7d0 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 642bee9a
......@@ -17,6 +17,7 @@ Name[pl]=Pix
Name[pt]=Pix
Name[pt_BR]=Pix
Name[sk]=Pix
Name[sl]=Pix
Name[sv]=Pix
Name[uk]=Pix
Name[x-test]=xxPixxx
......@@ -38,6 +39,7 @@ 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[sl]=Pregledovalnik galerij slik
Comment[sv]=Bildgallerivisning
Comment[uk]=Перегляд галерей зображень
Comment[x-test]=xxImage gallery viewerxx
......@@ -68,6 +70,7 @@ GenericName[pl]=Galeria obrazów
GenericName[pt]=Galeria de Imagens
GenericName[pt_BR]=Galeria de imagens
GenericName[sk]=Galéria obrázkov
GenericName[sl]=Galerija slik
GenericName[sv]=Bildgalleri
GenericName[uk]=Галерея зображень
GenericName[x-test]=xxImage Galleryxx
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