Commit 13ed9494 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 473ab699
......@@ -36,7 +36,7 @@ Name[hr]=KDE demon za pisanje
Name[hsb]=KDE write demon
Name[hu]=KDE adatkiíró szolgáltatás
Name[ia]=KDE Write Daemon
Name[id]=Jurik Tulis KDE
Name[id]=Daemon Write KDE
Name[is]=KDE skriftarpúki
Name[it]=Demone di write di KDE
Name[ja]=KDE Write デーモン
......
......@@ -165,7 +165,7 @@ Comment[hr]=Daemon je primio novu poruku poslanu sa wall(1) ili write(1)
Comment[hsb]=Demon je powěsć dóstał, pósłanu z wall(1) abo write(1)
Comment[hu]=A szolgáltatás új üzenetet kapott wall(1) vagy write(1) paranccsal
Comment[ia]=Le demone recipeva un nove message inviate con wall(1) o write(1)
Comment[id]=Jurik menerima sebuah pesan baru yang dikirim dengan wall(1) atau write(1)
Comment[id]=Daemon menerima sebuah pesan baru yang dikirim dengan wall(1) atau write(1)
Comment[is]=Þjónninn tók við nýju skeyti sem sent var með wall(1) eða write(1)
Comment[it]=Il demone ha ricevuto un nuovo messaggio mandato con wall(1) o write(1)
Comment[ja]=デーモンが wall(1) か write(1) で送信された新しいメッセージを受け取りました
......
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