Commit 35f3d2ec authored by Script Kiddy's avatar Script Kiddy
Browse files

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 03a28721
......@@ -8,7 +8,7 @@ Name[ca@valencia]=Volum de l'àudio
Name[cs]=Hlasitost zvuku
Name[da]=Lydstyrke
Name[de]=Lautstärke
Name[el]=Ένταση ήχου
Name[el]=Ένταsη ήχου
Name[en_GB]=Audio Volume
Name[es]=Volumen del sonido
Name[et]=Helitugevus
......
......@@ -6,6 +6,7 @@ Name[ca]=Àudio
Name[cs]=Audio
Name[da]=Lyd
Name[de]=Audio
Name[el]=Ήχος
Name[en_GB]=Audio
Name[es]=Audio
Name[et]=Heli
......@@ -43,6 +44,7 @@ Comment[ca]=Configura els dispositius d'àudio i el volum
Comment[cs]=Nastavit kanály zvuku a hlasitost
Comment[da]=Indstil lydenheder og lydstyrke
Comment[de]=Einstellung von Audio-Geräten und Lautstärke
Comment[el]=Διαμόρφωση συσκευών και έντασης ήχου
Comment[en_GB]=Configure audio devices and volume
Comment[es]=Configurar los dispositivos de audio y el volumen
Comment[et]=Heliseadmete ja -tugevuse seadistamine
......@@ -96,6 +98,7 @@ X-KDE-Keywords[ca]=So,Volum,Sortida,Entrada,Altaveus,Micròfon,Àudio,Música,Pu
X-KDE-Keywords[cs]=Zvuk,Hlasitost,Výstup,Vstup,Reproduktory,Mikrofon,Audio,Hudba,PulseAudio,Pulse
X-KDE-Keywords[da]=lyd,lydstyrke,output,input,højtalere,mikrofon,audio,musik,PulseAudio,Pulse
X-KDE-Keywords[de]=Sound,Lautstärke,Ausgang,Eingang,Lautsprecher,Mikrofon,Audio,Musik,PulseAudio,Pulse
X-KDE-Keywords[el]=Ήχος,Ένταση,Έξοδος,Είσοδος,Ηχεία,Νικρόφωνο,Audio,Μουσική,PulseAudio,Pulse
X-KDE-Keywords[en_GB]=Sound,Volume,Output,Input,Speakers,Microphone,Audio,Music,PulseAudio,Pulse
X-KDE-Keywords[es]=Sonido,Volumen,Salida,Entrada,Altavoces,Micrófono,Audio,Música,PulseAudio,Pulse
X-KDE-Keywords[et]=Heli,Helitugevus,Väljund,Sisend,Kõlarid,Mikrofon.Audio,Muusika,PulseAudio
......
Supports Markdown
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