Commit 8b329fb0 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 01486627
......@@ -18,7 +18,7 @@ Name[cy]=Daemon KDE Write
Name[da]=KDE Skrivedæmon
Name[el]=Δαίμονας Write του KDE
Name[en_GB]=KDE Write Dæmon
Name[en_GB]=KDE Write Daemon
Name[es]=Servicio de escritura de KDE
Name[et]=KDE Write deemon
......@@ -10,7 +10,7 @@ Name[cs]=Zapisovací démon
Name[el]=Δαίμονας Write
Name[en_GB]=Write Dæmon
Name[en_GB]=Write Daemon
Name[es]=Demonio de escritura
Name[eu]=Write daimona
......@@ -150,7 +150,7 @@ Comment[cs]=Démon obdržel novou zprávu zaslanou pomocí wall nebo write
Comment[da]=Dæmonen modtog en ny besked sendt med wall(1) eller write(1)
Comment[de]=Der Dienst hat eine Nachricht empfangen, die mittels wall(1) oder write(1) gesendet worden ist.
Comment[el]=Ο δαίμονας έλαβε ένα νέο μήνυμα μέσω του wall(1) ή του write(1)
Comment[en_GB]=The dæmon received a new message sent with wall(1) or write(1)
Comment[en_GB]=The daemon received a new message sent with wall(1) or write(1)
Comment[es]=El demonio recibió un nuevo mensaje enviado mediante wall(1) o write(1)
Comment[et]=Deemon sai uue teate, mis saadeti käsuga wall(1) või write(1)
Comment[eu]=daimonak wall(1) edo write(1)(r)ekin bidalitako beste mezu bat jaso du
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