Commit a959a94a 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 40730b28
......@@ -161,6 +161,7 @@ Comment[sr@latin]=Pazi na poruke od lokalnih korisnika poslatih naredbama write(
Comment[sv]=Titta efter meddelanden från lokala användare som skickas med write(1) eller wall(1)
Comment[ta]=உள் பயனர் அணுப்பியதுடன் write(1) or wall(1) அதிலிருந்து பார்க்கவேண்டிய தகவல்கள்
Comment[te]=స్థానిక వినియోగదారులనుండి write(1) లేదా wall(1) తో పంపబడిన సందేశాలనకొరకు గమనించండి
Comment[tg]=Назорати паёмҳои ирсолшуда бо write(1) ё wall(1) аз корбарони маҳаллӣ
Comment[th]=เฝ้าดูข้อความจากผู้ใช้ภายในระบบที่ถูกส่งมาด้วย write(1) หรือ wall(1)
Comment[tr]=Yerel kullanıcılarda write(1) veya wall(1) ile gönderilmiş mesajları izle
Comment[ug]=يەرلىك ئىشلەتكۈچى يوللىغان write(1) ياكى wall(1) نى نازارەت قىلىدۇ
......
......@@ -53,6 +53,7 @@ Comment[sr@ijekavian]=Сервис порука на локалном систе
Comment[sr@ijekavianlatin]=Servis poruka na lokalnom sistemu
Comment[sr@latin]=Servis poruka na lokalnom sistemu
Comment[sv]=Lokal systemmeddelandetjänst
Comment[tg]=Хизмати паёмҳои низоми маҳаллӣ
Comment[th]=บริการรับส่งข้อความภายในระบบ
Comment[tr]=Yerel sistem iletisi hizmeti
Comment[ug]=يەرلىك سىستېما ئۇچۇر مۇلازىمىتى
......@@ -127,6 +128,7 @@ Name[sr@latin]=Primljena nova poruka
Name[sv]=Nytt meddelande mottaget
Name[ta]=New message received
Name[te]=కొత్త సందేశము స్వీకరించబడింది
Name[tg]=Паёми нав қабул шуд
Name[th]=ได้รับข้อความใหม่
Name[tr]=Yeni ileti alındı
Name[ug]=يېڭى ئۇچۇر قوبۇللاندى
......@@ -196,6 +198,7 @@ Comment[sr@latin]=Demon je primio novu poruku poslatu kroz wall(1) ili write(1)
Comment[sv]=Demonen tog emot ett nytt meddelande skickat med wall(1) eller write(1)
Comment[ta]=The daemon received a new message sent with wall(1) or write(1)
Comment[te]=wall(1) లేదా write(1)తో పంపబడిన కొత్త సందేశమును డెమోన్ స్వీకరించినది
Comment[tg]=Раванди дохилӣ паёми ирсолшудаи наверо бо wall(1) ё write(1) қабул кард
Comment[th]=ดีมอนที่จะทำการรับข้อความใหม่ที่ถูกส่งมาจาก wall(1) หรือ write(1)
Comment[tr]=Servis wall(1) ya da write(1) ile gönderilen yeni bir ileti aldı
Comment[ug]=بۇ نازارەتچى 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