Commit 3320261b 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 91a6660e
[Global]
IconName=preferences-system-bluetooth
Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[nl]=Kleine muziekspeler
Comment[pt]=Pequeno Leitor Multimédia
Comment[sk]=Malý hudobný prehrávač
Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Name=Babe
Name[ca]=Babe
Name[nl]=Babe
Name[pt]=Babe
Name[sk]=Babe
Name[sv]=Babe
Name[uk]=Babe
Name[x-test]=xxBabexx
[Event/Notify]
Name=Babe...
Name[ca]=Babe...
Name[nl]=Babe...
Name[pt]=Babe...
Name[sk]=Babe...
Name[sv]=Babe...
Name[uk]=Babe…
Name[x-test]=xxBabe...xx
Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[nl]=Verbinding met het apparaat is mislukt
Comment[pt]=A ligação ao dispositivo foi mal-sucedida
Comment[sk]=Pripojenie k zariadeniu zlyhalo
Comment[sv]=Anslutning till enhet misslyckades
Comment[uk]=Не вдалося встановити з’єднання із пристроєм
Comment[x-test]=xxConnection to device failedxx
Icon=babe-qt
Action=Popup
[Desktop Entry]
Name=Pix
Name[ca]=Pix
Name[nl]=Pix
Name[pt]=Pix
Name[sk]=Pix
Name[sv]=Pix
Name[uk]=Pix
Name[x-test]=xxPixxx
Comment=Image gallery viewer
Comment[ca]=Visor de galeria d'imatges
Comment[nl]=Viewer van galerij met afbeeldingen
Comment[pt]=Visualizador de galerias de imagens
Comment[sk]=Prehliadač galérie obrázkov
Comment[sv]=Bildgallerivisning
Comment[uk]=Перегляд галерей зображень
Comment[x-test]=xxImage gallery viewerxx
TryExec=pix
Exec=pix %U
Terminal=false
......@@ -11,3 +25,10 @@ Icon=pix
MimeType=image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/tiff;image/x-psd;image/x-webp;image/webp;
# Generic name with translations
GenericName=Image Gallery
GenericName[ca]=Galeria d'imatges
GenericName[nl]=Galerij met afbeeldingen
GenericName[pt]=Galeria de Imagens
GenericName[sk]=Galéria obrázkov
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