Commit 88935f71 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 9f1c5253
......@@ -75,7 +75,7 @@ Name[sr@latin]=KDE‑ov demon za poruke
Name[sv]=KDE-skrivdemon
Name[ta]=KDE Write Daemon
Name[te]=KDE వ్రాయు డెమోన్
Name[tg]=Суҳбати шабакаи дохилӣ
Name[tg]=Раванди дохилии навишти KDE
Name[th]=ดีมอน Write ของ KDE
Name[tr]=KDE Write Servisi
Name[ug]=KDE Write نازارەتچى
......@@ -161,7 +161,6 @@ 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,7 +53,6 @@ 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]=يەرلىك سىستېما ئۇچۇر مۇلازىمىتى
......@@ -128,7 +127,6 @@ 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]=يېڭى ئۇچۇر قوبۇللاندى
......
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