Commit ce3d3618 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 99ce5831
...@@ -29,6 +29,7 @@ Name[x-test]=xxBabe...xx ...@@ -29,6 +29,7 @@ Name[x-test]=xxBabe...xx
Comment=Connection to device failed Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[en_GB]=Connection to device failed Comment[en_GB]=Connection to device failed
Comment[es]=La conexión con el dispositivo ha fallado
Comment[nl]=Verbinding met het apparaat is mislukt Comment[nl]=Verbinding met het apparaat is mislukt
Comment[pt]=A ligação ao dispositivo foi mal-sucedida Comment[pt]=A ligação ao dispositivo foi mal-sucedida
Comment[sk]=Pripojenie k zariadeniu zlyhalo Comment[sk]=Pripojenie k zariadeniu zlyhalo
......
...@@ -27,6 +27,7 @@ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;appl ...@@ -27,6 +27,7 @@ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;appl
GenericName=Audio Player GenericName=Audio Player
GenericName[ca]=Reproductor d'àudio GenericName[ca]=Reproductor d'àudio
GenericName[en_GB]=Audio Player GenericName[en_GB]=Audio Player
GenericName[es]=Reproductor de sonido
GenericName[nl]=Audiospeler GenericName[nl]=Audiospeler
GenericName[pt]=Leitor de Áudio GenericName[pt]=Leitor de Áudio
GenericName[sk]=Audio prehrávač GenericName[sk]=Audio prehrávač
......
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