Commit 9de09e9b 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 216d9a8f
......@@ -2,6 +2,7 @@
Name=KDE Write Daemon
Name[af]=KDE Skryf Bediener
Name[ar]=عفريت كدي للكتابة
Name[ast]=Degorriu d'escritura KDE
Name[be]=Cервіс KDE Write
Name[be@latin]=Słužba „Write” dla „KDE”
Name[bg]=Демон за писане (KDE)
[Desktop Entry]
Name=Write Daemon
Name[ar]=عفريت الكتابة
Name[ast]=Degorriu d'escritura
Name[bg]=Демон за писане
Name[bs]=Demon za poruke
Name[ca]=Dimoni d'escriptura
......@@ -2,6 +2,7 @@
Comment=Local system message service
Comment[ar]=خدمة رسائل النّظام المحليّة
Comment[ast]=Serviciu de mensaxes del sistema llocal
Comment[bg]=Локална услуга за системни съобщения
Comment[bn]=স্থানীয় সিস্টেম বার্তা সার্ভিস
Comment[bs]=Servis poruka na lokalnom sistemu
......@@ -65,6 +66,7 @@ Comment[zh_TW]=本地端系統訊息服務
Name=New message received
Name[ar]=استُقبلت رسالة جديدة
Name[ast]=Recibióse un mensaxe nuevu
Name[be@latin]=Atrymanaje novaje paviedamleńnie
Name[bg]=Получено е ново съобщение
Name[bs]=Primljena nova poruka
......@@ -135,6 +137,7 @@ Name[x-test]=xxNew message receivedxx
Comment=The daemon received a new message sent with wall(1) or write(1)
Comment[ast]=El degorriu recibió un mensaxe nuevu unviáu con wall(1) o write(1)
Comment[be@latin]=Słužba atrymała novaje paviedamleńnie ad „wall(1)” ci „write(1)”.
Comment[bg]=Демонът получи ново съобщение (wall(1) или write(1))
Comment[bs]=Demon je primio novu poruku poslatu kroz wall(1) ili write(1)
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