Commit e6b8fd61 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 1cc0cb53
......@@ -2,6 +2,7 @@
IconName=preferences-system-bluetooth
Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[ca@valencia]=Reproductor de música petit
Comment[fr]=Lecteur de musique ultra compact
Comment[nl]=Kleine muziekspeler
Comment[pt]=Pequeno Leitor Multimédia
......@@ -11,6 +12,7 @@ Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Name=Babe
Name[ca]=Babe
Name[ca@valencia]=Babe
Name[nl]=Babe
Name[pt]=Babe
Name[sk]=Babe
......@@ -21,6 +23,7 @@ Name[x-test]=xxBabexx
[Event/Notify]
Name=Babe...
Name[ca]=Babe...
Name[ca@valencia]=Babe...
Name[nl]=Babe...
Name[pt]=Babe...
Name[sk]=Babe...
......@@ -29,6 +32,7 @@ Name[uk]=Babe…
Name[x-test]=xxBabe...xx
Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[ca@valencia]=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
......
[Desktop Entry]
Name=Pix
Name[ca]=Pix
Name[ca@valencia]=Pix
Name[nl]=Pix
Name[pt]=Pix
Name[sk]=Pix
......@@ -9,6 +10,7 @@ Name[uk]=Pix
Name[x-test]=xxPixxx
Comment=Image gallery viewer
Comment[ca]=Visor de galeria d'imatges
Comment[ca@valencia]=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
......@@ -26,6 +28,7 @@ MimeType=image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/
# Generic name with translations
GenericName=Image Gallery
GenericName[ca]=Galeria d'imatges
GenericName[ca@valencia]=Galeria d'imatges
GenericName[fr]=Galerie d'images
GenericName[nl]=Galerij met afbeeldingen
GenericName[pt]=Galeria de Imagens
......
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