Commit 6fd7bfd5 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 c36bf415
......@@ -169,7 +169,7 @@ Comment[uk]=Спостерігання за  повідомленнями ві
Comment[vi]=Theo dõi các thông báo từ người dùng trên cùng máy được gửi bằng lệnh write(1) hay wall(1)
Comment[wa]=Louke après des messaedjes des uzeus locås evoyîs avou write(1) ou wall(1)
Comment[x-test]=xxWatch for messages from local users sent with write(1) or wall(1)xx
Comment[zh_CN]=监视本地用户发出的 write(1) 或 wall(1) 消息
Comment[zh_CN]=监视本地用户使用 write(1) 或 wall(1) 发送的消息
Comment[zh_TW]=監控本地使用者以 write(1) 或 wall(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