diff --git a/translations/lrc_ar.ts b/translations/lrc_ar.ts index 891af16f1bd91faf01b76187e90b07a306dee768..28aba76a67d122ad8134723a97304fb0ba20ac6d 100644 --- a/translations/lrc_ar.ts +++ b/translations/lrc_ar.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>أنا</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>يتم الإتصال</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>تم الإنتهاء</translation> </message> @@ -70,21 +70,28 @@ <translation>تم إنجاز الإتصال</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>تم تلقي دعوة</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>تم Ø¥Ø¶Ø§ÙØ© جهة إتصال</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>مكالمة خارجة</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>مكالمة خارجة ÙØ§Ø¦ØªØ©</translation> </message> @@ -106,8 +113,9 @@ <translation>مكالمة داخلة ÙØ§Ø¦ØªØ©</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>تم قبول الدعوة</translation> </message> @@ -118,279 +126,279 @@ <translation>Ø§ÙØªØ±Ø§Ø¶Ù‰</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>ÙØ§Ø±Øº</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Ù…ØØ§ÙˆÙ„Ø©</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>يرنّ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>تتم Ø¥ØØ§Ù„ته</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>قائمة الإنتظار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>تقدم</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>مواÙÙ‚</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>مقبول</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>خيارات متعددة</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>انتقال بشكل دائم</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>انتقال مؤقت</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>استخدام وكيل</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>خدمة بديلة</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>طلب غير صالØ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>يرجى Ø§Ù„Ø¯ÙØ¹</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Ù…ØØ¸ÙˆØ±</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>لم يتم العثور</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Ù†ÙØ§Ø° مدة الطلب</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>مشغول</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Ù…Ù„Ø§ØØ¸Ø©: يمكنك قبول هذه الدعوة بشكل تلقائي عبر إرسال رسالة.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>تم الإلغاء</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>منذ %d أيام</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>منذ %d ساعات</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>منذ %d دقيقة</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>منذ يوم</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>منذ ساعة</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>ÙÙŠ هذه Ø§Ù„Ù„ØØ¸Ø©</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Ø¥Ø®ÙØ§Ù‚</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>ØØ°Ù</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>إعادة Ø§Ù„Ù…ØØ§ÙˆÙ„Ø©</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>يتم Ø§Ù„Ø¨ØØ«...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_bg.ts b/translations/lrc_bg.ts index 58b500c0ed21912d08b2ec3d3eba17cee9fc6721..78c352f4a0bce62787b3cca478067ff1066c3861 100644 --- a/translations/lrc_bg.ts +++ b/translations/lrc_bg.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ðз</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Свързване</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>КомуникациÑта е уÑтановена</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Поканата е приета</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Контактът е добавен</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>ИзходÑщо обаждане</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ПропуÑнато изходÑщо обаждане</translation> </message> @@ -106,8 +113,9 @@ <translation>ПропуÑнато входÑщо обаждане</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>ПозвънÑване</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Добре</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Време за изчакване на заÑвката</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Зает</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Отменено</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Изтриване</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>ТърÑене...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_ca.ts b/translations/lrc_ca.ts index 3aa0c418c6352b776214014f4c430645eb3897ff..c582f81138c56a9aa05dd709898c63ecd0c640de 100644 --- a/translations/lrc_ca.ts +++ b/translations/lrc_ca.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Jo</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Connectant</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>S'ha rebut una invitació</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacte afegit</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Trucada sortint</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Trucada sortint perduda</translation> </message> @@ -106,8 +113,9 @@ <translation>Trucada entrant perduda</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Trucant</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>D'acord</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: pot acceptar automà ticament aquesta invitació enviant un missatge.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Fa %d dies</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Fa %d hores</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Fa %d minuts</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>Fa un dia</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>Fa una hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Ara mateix</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fallida</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirma</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Suprimeix</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Reintentar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_cs_CZ.ts b/translations/lrc_cs_CZ.ts index b3750a028d2819ad908c8db245dadfd0437572e0..eceb5dff8a98e424f34e57b7176730af9fdeb1b5 100644 --- a/translations/lrc_cs_CZ.ts +++ b/translations/lrc_cs_CZ.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Já</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>SpojovánÃ</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>DokonÄeno</translation> </message> @@ -70,21 +70,28 @@ <translation>Spojenà navázáno</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Pozvánà pÅ™ijato</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt pÅ™idán</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Odchozà hovor</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>NepÅ™ijatý odchozà hovor</translation> </message> @@ -106,8 +113,9 @@ <translation>ZmeÅ¡kaný pÅ™Ãchozà hovor</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Pozvánà pÅ™ijato</translation> </message> @@ -118,279 +126,279 @@ <translation>výchozÃ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Žádný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Pokus</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>VyzvánÄ›nÃ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>PÅ™esmÄ›rovává se</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Fronta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>PrůbÄ›h</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>PÅ™ijato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>VÃce voleb</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Trvale pÅ™emÃstÄ›n</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>DoÄasnÄ› pÅ™emÃstÄ›n</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Použità proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternativnà služba</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Nesprávný pÅ™Ãkaz</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Neautorizovaný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Požadována platba</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Zakázáno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nenalezen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metoda nenà povolena</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Nenà pÅ™ijatelný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Požadovaná autentizace proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>ÄŒasový limit pÅ™Ãkazu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Je pryÄ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entita pÅ™Ãkazu je pÅ™ÃliÅ¡ velká</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI pÅ™Ãkazu je pÅ™ÃliÅ¡ dlouhý</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Typ média nenà podporován</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Plán URI nenà podporován</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Nesprávná pÅ™Ãpona</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Je požadována pÅ™Ãpona</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>ÄŒasovaÄ relace je pÅ™ÃliÅ¡ krátký</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval je pÅ™ÃliÅ¡ krátký</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>DoÄasnÄ› nenà k dispozici</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Hovor/transakce neexistuje</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Detekována smyÄka</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>PÅ™ÃliÅ¡ mnoho skoků</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresa nenà úplná</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Nejasný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ZaneprázdnÄ›ný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>PÅ™Ãkaz ukonÄen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Nesprávná událost</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>PÅ™Ãkaz aktualizován</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>PÅ™Ãkaz Äeká</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>NerozluÅ¡titelný</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>VnitÅ™nà chyba serveru</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Neimplementováno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Nesprávná brána</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Služba nenà k dispozici</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>ÄŒasový limit serveru</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Verze nenà podporována</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Zpráva je pÅ™ÃliÅ¡ velká</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>PÅ™edběžná podmÃnka selhala</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>VÅ¡e je zaneprázdnÄ›no</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Hovor odmÃtnut</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Nikde neexistuje</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Nikde nenà pÅ™ijatelný</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Poznámka: můžete tuto pozvánku automaticky pÅ™ijmout poslánÃm zprávy</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>ZruÅ¡eno</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>pÅ™ed %d dny</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>pÅ™ed %d hodinami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>pÅ™ed %d minutami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>vÄera</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>pÅ™ed hodinou</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>teÄ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>SelhánÃ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Potvrdit</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Odstranit</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Zkusit znovu</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Hledá se…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Neplatné ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Nebylo možné vyhledat…</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Å patné schéma URI</translation> </message> diff --git a/translations/lrc_da.ts b/translations/lrc_da.ts index 69da1c4dab070da3ea6dcf3032c470ab3dcbff23..9468691f31cbe9a17935147278db283e6d5340ca 100644 --- a/translations/lrc_da.ts +++ b/translations/lrc_da.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Mig</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Forbinder</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Afsluttet</translation> </message> @@ -70,21 +70,28 @@ <translation>Kommunikation etableret</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation modtaget</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt tilføjet</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>UdgÃ¥ende opkald</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Ubesvarede udgÃ¥ende opkald</translation> </message> @@ -106,8 +113,9 @@ <translation>Ubesvarede indgÃ¥ende opkald</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation accepteret</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Ringer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Anmodning fik timeout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Optaget</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulleret</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Slet</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Søger…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ugyldigt ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Ugyldigt URI-skema</translation> </message> diff --git a/translations/lrc_de.ts b/translations/lrc_de.ts index 16bb5b7c2974583cab36989ea1edffc7f426b45d..2b7d203b1b7539dbf4154a39093431523999293a 100644 --- a/translations/lrc_de.ts +++ b/translations/lrc_de.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>lch</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Verbindet</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Abgeschlossen</translation> </message> @@ -70,21 +70,28 @@ <translation>Kommunikation hergestellt</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Einladung erhalten</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt hinzugefügt</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Ausgehender Anruf</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Ausgehender Anruf fehlgeschlagen</translation> </message> @@ -106,8 +113,9 @@ <translation>Verpasster eingehender Anruf</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Einladung angenommen</translation> </message> @@ -118,279 +126,279 @@ <translation>Standard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Versuche</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Klingelt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Wird weitergeleitet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In Warteschlange</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Fortschritt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Angenommen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Mehrere Wahlmöglichkeiten</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Permanent verschoben</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Vorübergehend verschoben</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Proxy nutzen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternativer Dienst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Ungültige Anfrage</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Nicht autorisiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Zahlung notwendig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Unzulässig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nicht gefunden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Methode nicht zulässig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Nicht annehmbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy Authentifizierung notwendig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Anfragezeitüberschreitung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Verschwunden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Anfrage zu groß</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Anfragen-URI zu lang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Medientyp nicht unterstützt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>URI-Schema nicht unterstützt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Ungültige Erweiterung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Erweiterung notwendig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Sitzungstimer zu klein</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervall zu kurz</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporär nicht verfügbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Anruf TSX existiert nicht</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Schleife erkannt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Zu viele Hops</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresse unvollständig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Nicht eindeutig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Beschäftigt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Anfrage terminiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Ungültiges Ereignis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Anfrage aktualisiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Anfrage ausstehend</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Nicht entschlüsselbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Interner Serverfehler</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Nicht implementiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Ungültiges Gateway</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Dienst nicht verfügbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Serverzeitüberschreitung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Version nicht unterstützt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Nachricht zu groß</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Vorbedingung fehlgeschlagen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Überall beschäftigt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Anruf abgelehnt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Existiert nirgendswo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Nirgendwo annehmbar</translation> </message> @@ -447,7 +455,7 @@ <message> <location filename="../src/chatview.cpp" line="40"/> <source>Add emoji</source> - <translation type="unfinished"/> + <translation>Emoji einfügen</translation> </message> <message> <location filename="../src/chatview.cpp" line="41"/> @@ -465,22 +473,52 @@ <translation>Schreibe an {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Kein Kontakt möglich</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Wartet auf Kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Eingehende Übertragung</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Zeitüberschreitung beim Warten auf Kontakt</translation> </message> @@ -500,87 +538,77 @@ <translation>ist nicht in deinen Kontakten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Hinweis: Durch Senden einer Nachricht wird diese Einladung automatisch angenommen.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>vor {0} Tagen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>vor {0} Stunden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>vor {0} Minuten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Abgebrochen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Laufend</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>vor %d Tagen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>vor %d Stunden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>vor %d Minuten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>vor einem Tag</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>vor einer Stunde</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>gerade eben</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bestätigen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Ablehnen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Wiederholen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Suchen…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ungültige ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> - <translation type="unfinished"/> + <translation>Benutzername nicht gefunden</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Konnte nicht nachschlagen...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Ungültiges URI-Schema</translation> </message> diff --git a/translations/lrc_de_DE.ts b/translations/lrc_de_DE.ts index 84370bbe45b9cca0d82c1b383f4951f257aa0549..4294e025f42133681035c2c26728d3e9e2e294b7 100644 --- a/translations/lrc_de_DE.ts +++ b/translations/lrc_de_DE.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ich</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Verbinden</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Erledigt</translation> </message> @@ -70,21 +70,28 @@ <translation>Verbindung hergestellt</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Einladung erhalten</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt hinzugefügt</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Ausgehende Anruf</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Verpasster ausgehender Anruf</translation> </message> @@ -106,8 +113,9 @@ <translation>Verpasster eingehender Anruf</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Einladung akzeptiert</translation> </message> @@ -118,279 +126,279 @@ <translation>Standard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Nichts</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Versuche</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Klingeln</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Wird weitergeleitet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In der Warteschlange</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Fortschritt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Okay</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Akzeptiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Mehrfachauswahl</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Dauerhaft verschoben</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Zeitlich begrenzt verschoben</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Benutze einen Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternativer Dienst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Unmögliche Anfrage</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Keine Berechtigung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Bezahlung erforderlich</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Nicht erlaubt!</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nicht gefunden!</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Diese Art und Weise ist nicht erlaubt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Inakzeptabel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Für diesen Proxy werden Anmeldedaten benötigt!</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Zeitüberschreitung der Anforderung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Verlassen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Das Anfrageobjekt ist zu groß!</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Die formulierte Anfrage ist zu lang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Nicht unterstützter Medientyp</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Diese Art die Anfrage zu formulieren wird nicht unterstützt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Fehlerhafte Erweiterung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Eine Erweiterung wird benötigt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Sitzungstimer zu klein</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervall zu kurz</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporär nicht verfügbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Anruf TSX existiert nicht</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Unendlicher Zirkelbezug erkannt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Zu viele Netzwerksprünge</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresse unvollständig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Nicht eindeutig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Besetzt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Anfrage erfolglos abgebrochen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Ungültiges Ereignis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Anfrage aktualisiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Anfrage ausstehend</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Nicht entschlüsselbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Interner Server Fehler</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Nicht implementiert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Ungültige Zwischenstelle</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Dienst nicht verfügbar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Serverzeitüberschreitung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Version nicht unterstützt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Nachricht zu groß</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Vorbedingung fehlgeschlagen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Überall beschäftigt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Anruf abgelehnt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Existiert nirgendswo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation> Nirgendwo annehmbar</translation> </message> @@ -465,22 +473,52 @@ <translation>Nach [0] schreiben</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Kontakt kann nicht hergestellt werden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Auf Kontakt warten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Eingehende Übertragung</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Frist für das Warten auf Kontakt verstrichen</translation> </message> @@ -500,87 +538,77 @@ <translation>ist nicht in Ihrer Kontaktliste</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Hinweis: Sie können diese Einladung automatisch annehmen, indem sie eine Nachricht schicken. </translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>vor {0} Tagen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>vor {0} Stunden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>vor {0} Minuten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Abgebrochen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Übertragung läuft</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>vor %d Tagen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>vor %d Stunden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>vor %d Minuten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>vor einem Tag</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>vor einer Stunde</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>gerade eben</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fehlgeschlagen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bestätigen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Ablehnen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Wiederholen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Suche ...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ungültige Identifikation (ID)</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Nicht gefunden ...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Diese Art die Anfrage zu formulieren wird nicht unterstützt</translation> </message> diff --git a/translations/lrc_el.ts b/translations/lrc_el.ts index c85ce8ce16f30cc94a9b803a83be097b9f4becbb..abf85838a903062496c4814e83d02895c3735109 100644 --- a/translations/lrc_el.ts +++ b/translations/lrc_el.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Εγώ</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>ΣυνδÎεται</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>Επικοινωνία επιτεÏχθηκε</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Η επαφή Ï€ÏοστÎθηκε</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>ΕξεÏχόμενη κλήση</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Αναπάντητη εξεÏχόμενη κλήση</translation> </message> @@ -106,8 +113,9 @@ <translation>Αναπάντητη εισεÏχόμενη κλήση</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Κουδουνίζει</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Αίτημα Εκτός ΧÏόνου</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ΑπασχολημÎνο</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>ΔιαγÏαφή</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_en.ts b/translations/lrc_en.ts index 113a6dae01cc4f9fcb3a7b4c4d5307587b6e1e67..4c735b1cf82ed5948043740651de5ecab85f3b8a 100644 --- a/translations/lrc_en.ts +++ b/translations/lrc_en.ts @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_US" sourcelanguage="en"> +<TS version="2.0" language="en_US" sourcelanguage="en"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"></translation> </message> @@ -35,7 +35,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"></translation> </message> @@ -52,7 +52,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"></translation> </message> @@ -72,21 +72,28 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"></translation> </message> @@ -98,7 +105,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"></translation> </message> @@ -108,8 +115,9 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"></translation> </message> @@ -120,279 +128,279 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"></translation> </message> @@ -467,22 +475,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"></translation> </message> @@ -502,87 +540,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"></translation> </message> @@ -590,22 +618,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"></translation> </message> @@ -613,7 +641,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"></translation> </message> diff --git a/translations/lrc_eo.ts b/translations/lrc_eo.ts index b57a01d99c0b3bb5f0ab309a0b0d2672332ab1e6..410bd32756a55cd680718cf6ad781a93e083859b 100644 --- a/translations/lrc_eo.ts +++ b/translations/lrc_eo.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Mi</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>Konektita</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Eliranta voko</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>SonoriÄanta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Okej</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>EltempiÄo de Peto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Okupata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Forigi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_es.ts b/translations/lrc_es.ts index 3b0fb9b6e1e3cc705362e39af810b1f7e150d277..c07f1e3e476d4ffb40181e978a45c321c207737c 100644 --- a/translations/lrc_es.ts +++ b/translations/lrc_es.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Yo</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Conectando</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminado</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicación establecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitación recibida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacto añadido</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Llamada saliente</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Llamada saliente perdida</translation> </message> @@ -106,8 +113,9 @@ <translation>Llamada entrante perdida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitación aceptada</translation> </message> @@ -118,279 +126,279 @@ <translation>Por defecto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Conectando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sonando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Derivando llamada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>En cola</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Progreso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceptada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Varias opciones</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido definitivamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido temporalmente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Servicio alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Solicitud incorrecta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>No autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Pago requerido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Denegado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>No encontrado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método no permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>No aceptable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Autenticación del proxy requerida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Tiempo de repuesta agotado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Acabado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entidad solicitada demasiado larga</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Solicitud URI demasiado larga</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Formato multimedia no soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Esquema de URI no soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensión no válida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extensión requerida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador de sesión demasiado pequeño</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo demasiado breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporalmente no disponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>La llamada TSX no existe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Bucle detectado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Demasiados saltos -too many hops.</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Dirección incompleta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambiguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Solicitud terminada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento no válido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Solicitud actualizada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Solicitud pendiente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indecifrable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Error del servidor interno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>No implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Puerta de enlace no válida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Expiró el tiempo de espera del servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versión no soportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensaje demasiado extenso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Falla de la condición previa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupado en todas partes</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Llamada rechazada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>No existe en ningún lugar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>No aceptable en ningún lugar</translation> </message> @@ -465,22 +473,52 @@ <translation>Escribir a {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>No se pudo contactar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Esperando al contacto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Transferencia entrante</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Expiró el tiempo de espera al contacto</translation> </message> @@ -500,87 +538,77 @@ <translation>no está en tus contactos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: Puedes aceptar esta invitación automáticamente enviando un mensaje</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>Hace {0} dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>Hace {0} horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>Hace {0} minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelado</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>En curso</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Hace 1%d dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Hace 1%d horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Hace %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>hace un dÃa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>hace una hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>justo ahora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Error</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Rechazar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Reintentar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Buscando</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID inválida</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nombre de usuario no encontrado</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>No se ha podido buscar...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Mal esquema de URI</translation> </message> diff --git a/translations/lrc_es_AR.ts b/translations/lrc_es_AR.ts index a81825dc0b91665b551dfdcbffdb36b079545c5d..fb4c60efc2d551a598fae1722a832c110eec3dff 100644 --- a/translations/lrc_es_AR.ts +++ b/translations/lrc_es_AR.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Yo</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Conectando</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Finalizado</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicación establecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitación recibida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacto añadido</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Llamada saliente</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Llamada saliente perdida</translation> </message> @@ -106,8 +113,9 @@ <translation>Llamada entrante perdida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitación aceptada</translation> </message> @@ -118,279 +126,279 @@ <translation>Por defecto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Intentando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sonando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Derivando llamada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Llamada en espera</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Progreso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Ok</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceptada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Múltiples elecciones</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido definitivamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido temporalmente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Servicio alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Solicitud incorrecta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>No autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Pago requerido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Denegado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>No encontrado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método no permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>No aceptable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Se requiere autenticación del proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Tiempo de espera caducado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Retirado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entidad solicitada demasiado grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI solicitada demasiado extensa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo de medio no soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Esquema URI no soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensión errónea</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extensión requerida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador de sesión demasiado bajo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo demasiado breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporalmente no disponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Llamada TSX inexistente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Bucle detectado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Demasiados saltos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Dirección incompleta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambiguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Solicitud terminada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento erróneo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Solicitud actualizada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Solicitud pendiente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indescifrable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Error de servidor interno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>No implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Puerta de salida errónea</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tiempo de espera del servidor agotado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versión no soportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensaje demasiado extenso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Falla de precondición</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupado en todas partes</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Llamada rechazada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>No existe en ningún lado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>No aceptable en ningún lado</translation> </message> @@ -465,22 +473,52 @@ <translation>Escribir a {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>No se pudo contactar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Esperando al contacto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Transferencia entrante</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Expiró el tiempo de espera al contacto</translation> </message> @@ -500,87 +538,77 @@ <translation>no está en tus contactos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: podés aceptar automáticamente esta invitación enviando un mensaje.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>Hace {0} dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>Hace {0} horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>Hace {0} minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelado</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>En curso</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>hace %d dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>hace %d horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>hace %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>hace un dÃa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>hace una hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>hace un momento</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Falla</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Rechazar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Reintentar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Buscando...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID inválido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nombre de usuario no encontrado</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>No se pudo buscar...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Esquema URI erróneo</translation> </message> diff --git a/translations/lrc_es_CO.ts b/translations/lrc_es_CO.ts index aef68c53524cd33828d48aaa785316de6cf3f896..6ee258e15553c769e606ffab7b92ef01cd0a8eab 100644 --- a/translations/lrc_es_CO.ts +++ b/translations/lrc_es_CO.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CO" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CO" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Aceptar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: puede aceptar automáticamente esta invitación enviando un mensaje.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Hace %d dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>hace %d horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>hace %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>hace un dÃa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>hace una hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>hace unos segundos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Falló</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Reintentar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_es_MX.ts b/translations/lrc_es_MX.ts index 6bb46f5fc35982c4c44a015c9fd5a3f49a7a85bf..4d082bd0149363016a3b0252bcbb014cf9cef216 100644 --- a/translations/lrc_es_MX.ts +++ b/translations/lrc_es_MX.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Conectado</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Marcando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_et_EE.ts b/translations/lrc_et_EE.ts index 45ebec3eeaf2d21367ca5b86e89e5ec5b5076065..e91e623b0481080d6c67cfca99a7350ae38fac0b 100644 --- a/translations/lrc_et_EE.ts +++ b/translations/lrc_et_EE.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Ühendab</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Heliseb</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Kinni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_eu.ts b/translations/lrc_eu.ts index 1b7ea3f9d73f85d24fc54d640740244e68de71f1..d1b922b7d02cdec427a566bec24ecb11135c9490 100644 --- a/translations/lrc_eu.ts +++ b/translations/lrc_eu.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ni</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Konektatzen</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Gonbidapena jasota</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontaktua gehituta</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Irteera-deia</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Galdutako irteera-deia</translation> </message> @@ -106,8 +113,9 @@ <translation>Galdutako sarrera-deia</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Deitzen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Ados</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Lanpetuta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_fa.ts b/translations/lrc_fa.ts index 6c49c135ef34453e7355c1babf69a8852011d094..61b06d663e6cf7abbeae688a7fa9f6209cd77da3 100644 --- a/translations/lrc_fa.ts +++ b/translations/lrc_fa.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>تماس خروجی بی پاسخ</translation> </message> @@ -106,8 +113,9 @@ <translation>تماس ورودی بی پاسخ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_fa_IR.ts b/translations/lrc_fa_IR.ts index d1e6ff724be1c75747f6041c27e89d201c6a2888..4db252752f043b21d06d7feff8a85a1fe5be97ff 100644 --- a/translations/lrc_fa_IR.ts +++ b/translations/lrc_fa_IR.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>من</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>در ØØ§Ù„ اتّصال</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>پایان ÛŒØ§ÙØªÙ‡</translation> </message> @@ -70,21 +70,28 @@ <translation>ارتباط برقرار شد.</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>دعوت نامه Ø¯Ø±ÛŒØ§ÙØª شد</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>مخاطب Ø§ÙØ²ÙˆØ¯Ù‡ شد</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>تماس خروجی</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>تماس خروجی از دست Ø±ÙØªÙ‡</translation> </message> @@ -106,8 +113,9 @@ <translation>تماس ورودی از دست Ø±ÙØªÙ‡</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>دعوت Ù¾Ø°ÛŒØ±ÙØªÙ‡ شد</translation> </message> @@ -118,279 +126,279 @@ <translation>Ù¾ÛŒØ´â€ŒÙØ±Ø¶</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>خالی</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>در ØØ§Ù„ تلاش</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>در ØØ§Ù„ زنگ خوردن</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>ÙØ±Ø³ØªØ§Ø¯Ù‡ شده است</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>در صÙ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>در جریان</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>خب</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Ù¾Ø°ÛŒØ±ÙØªÙ‡â€ŒØ´Ø¯Ù‡</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>چندین انتخاب</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>برای همیشه منتقل شد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>به طور موقت منتقل شد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Ø§Ø³ØªÙØ§Ø¯Ù‡ از پروکسی</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>سرویس جایگزین</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>درخواست بی‌اعتبار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>غیرمجاز</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>مستلزم پرداخت</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>ممنوع</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>ÛŒØ§ÙØª نشد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>روش مجاز نمی‌باشد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>قابل‌قبول نیست</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Ø§ØØ±Ø§Ø² هویت پروکسی مورد نیاز است</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>زمان انقضای درخواست</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>از بین Ø±ÙØªÙ‡</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>درخواست Ø¨ÛŒØ´â€ŒØ§Ø²â€ŒØØ¯ بزرگ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>درخواست URI بیش از ØØ¯ طولانی</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>نوع رسانه پشتیبانی‌نشده</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Ø·Ø±Ø URI پشتیبانی‌نشده</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Ø§ÙØ²ÙˆÙ†Ù‡ بی‌اعتبار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Ø§ÙØ²ÙˆÙ†Ù‡ مورد‌نیاز است</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>زمان‌سنج جلسه خیلی Ú©ÙˆÚ†Ú© است</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>بازه زمانی خیلی کوتاه</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>به طور موقت در‌دسترس نیست</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>TSX تماس وجود ندارد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>ØÙ„قه شناسایی شد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>تعداد Ø¨ÛŒØ´â€ŒØ§Ø²â€ŒØØ¯ پرش (گام)</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>آدرس ناقص</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>مبهم</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>مشغول</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>درخواست خاتمه ÛŒØ§ÙØª</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>رویداد بی‌اعتبار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>درخواست به‌روز شد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>درخواست در‌انتظار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>غیرقابل رمز‌گشایی</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>خطای داخلی سرور</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>پیاه‌سازی نشده</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>دروازه بی‌اعتبار</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>سرویس غیر‌قابل‌دسترس</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>انقضای سرور</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>این نسخه پشتیبانی نمی‌شود</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>پیام Ø¨ÛŒØ´â€ŒØ§Ø²â€ŒØØ¯ بزرگ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>پیش‌شرط ناموÙÙ‚</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>همه‌جا مشغول</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>تماس رد شد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>هیچ‌جایی وجود ندارد</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>هیچ‎‌جا قابل قبول نیست</translation> </message> @@ -465,22 +473,52 @@ <translation>نوشتن به {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>برقراری تماس امکان‌پذیر نیست</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation> در انتظار برقراری تماس</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>انتقال ورودی</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>زمان انتظار برای تماس به پایان رسید</translation> </message> @@ -500,87 +538,77 @@ <translation>در مخاطبین شما نیست</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>توجه: شما Ù…ÛŒ توانید با ارسال پیام به طور خودکار این دعوت را بپذیرید.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} روز پیش</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} ساعت قبل</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} دقیقه قبل</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>لغو شده</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>در جریان</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d روز پیش</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d ساعت پیش</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d دقیقه قبل</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>یک روز پیش</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>یک ساعت پیش</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>همین الان</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>عدم موÙقیت</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>تایید</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>رد کردن</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>ØØ°Ù</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>تلاش دوباره</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>در ØØ§Ù„ جستجو...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>شناسهٔ نامعتبر</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>ناتوانی در جستجو...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>شمای نشانی بد</translation> </message> diff --git a/translations/lrc_fi.ts b/translations/lrc_fi.ts index f4041c1608856745ee96a06c7b40a229f8dd3c25..58b0c8176684e3a74d09568f683b2be4fc8a4f06 100644 --- a/translations/lrc_fi.ts +++ b/translations/lrc_fi.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Minä</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Yhdistää</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Valmis</translation> </message> @@ -70,21 +70,28 @@ <translation>Yhteys muodostettu</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Kutsu vastaanotettu</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Yhteystieto lisätty</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Lähtevä puhelu</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Vastaamaton lähtevä puhelu</translation> </message> @@ -106,8 +113,9 @@ <translation>Vastaamaton puhelu</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Kutsu hyväksytty</translation> </message> @@ -118,279 +126,279 @@ <translation>oletus</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Tyhjä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Yritetään</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Soi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Välitetään eteenpäin</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Jonossa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Edistyminen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Hyväksytty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Useita vaihtoehtoja</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Siirretty pysyvästi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Siirretty tilapäisesti</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Käytä välityspalvelinta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Vaihtoehtoinen palvelu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Virheellinen pyyntö</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Luvaton</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Maksu vaaditaan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Kielletty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Ei löydy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Menetelmää ei sallita</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Ei hyväksyttävä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Välityspalvelimen todennus vaaditaan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Pyyntö aikakatkaistu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Mennyt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Pyyntö on liian suuri</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Pyynnön verkko-osoite liian pitkä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Ei tuettu mediatyyppi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Verkko-osoitteen mallia ei tueta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Virheellinen laajennus</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Laajennus vaaditaan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Istunnon ajastin on liian pieni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Väli liian lyhyt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Tilapäisesti poissa käytöstä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>TSX-puhelua ei ole</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Silmukka havaittu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Liian monta hyppyä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Osoite epätäydellinen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Epäselvä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Varattu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Pyyntö lopetettu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Huono tapahtuma</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Pyyntö päivitetty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Pyyntö odottaa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Ei purettavissa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Sisäinen palvelinvirhe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Ei toteutettu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Huono yhdyskäytävä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Palvelua ei käytettävissä</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Palvelimen aikakatkaisu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versiota ei tueta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Viesti on liian suuri</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Ennakkoehdon virhe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Varattu kaikkialla</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Puhelu evätty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Ei ole missään</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Ei hyväksytä missään</translation> </message> @@ -465,22 +473,52 @@ <translation>Kirjoittaa {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Yhteyden muodostaminen epäonnistui</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Odotetaan yhteyttä</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Saapuva siirto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Aikakatkaisu odottavalle yhteydelle</translation> </message> @@ -500,87 +538,77 @@ <translation>ei ole yhteystiedoissasi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Huomaa: voit automaattisesti hyväksyä tämän kutsun lähettämällä viestin.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} päivää sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} tuntia sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minuuttia sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Peruttu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Käynnissä</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d päivää sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d tuntia sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuuttia sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>yksi päivä sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>yksi tunti sitten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>juuri nyt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Virhe</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Vahvista</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Estä</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Poista</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Yritä uudelleen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Etsitään...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Virheellinen tunnus</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Käyttäjää ei löydy</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Ei voitu etsiä...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Virheellinen verkko-osoitteen malli</translation> </message> diff --git a/translations/lrc_fr.ts b/translations/lrc_fr.ts index 781f1007522dd14d40488a65517fbf251c795bfc..780c568d0d4d5c719f9fb6b6b4fe23cfa890a8e3 100644 --- a/translations/lrc_fr.ts +++ b/translations/lrc_fr.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Moi</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>En cours de connexion</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Complété</translation> </message> @@ -70,21 +70,28 @@ <translation>Communication établie</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation reçue</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact ajouté</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Appel sortant</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Appel sortant manqué</translation> </message> @@ -106,8 +113,9 @@ <translation>Appel entrant manqué</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation acceptée</translation> </message> @@ -118,279 +126,279 @@ <translation>défaut</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Essai en cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sonne</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>En cours de transfert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Mis dans la file d'attente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>En cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Choix multiples</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Définitivement déplacé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Temporairement déplacé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Utiliser un serveur délégataire</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Service alternatif</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Requête invalide</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Non authorisé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Payement nécessaire</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Interdit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Introuvable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Méthode non permise</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>N'est pas acceptable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Authentification au serveur mandataire nécessaire</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Requête expirée</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Parti</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>L'élément demandé est trop gros</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>l'URI demandée est trop longue</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Type de média non supporté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Schéma d'URI non supporté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Mauvaise extension</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extension nécessaire</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Compteur de session trop petit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalle trop court</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporairement non disponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>L'appel TSX n’existe pas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Boucle détectée</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Trop de sauts</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresse incomplète</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambigu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Occupé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>La requête est terminée</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Événement incorrect</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Requête modifiée</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Requête en attente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indéchiffrable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Erreur Interne du Serveur</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Non Implémenté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Mauvaise passerelle</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Service indisponible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Dépassement de délai du serveur</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Version non supportée</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Message Trop Large</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Échec de Précondition </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Occupé partout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Appel refusé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>N'existe nul part</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>N'est pas acceptable ici</translation> </message> @@ -465,22 +473,52 @@ <translation>Écrire à {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Impossible de contacter l'interlocuteur</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>En attente de votre contact</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Transfert entrant</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Délai d'attente de votre contact dépassé</translation> </message> @@ -500,87 +538,77 @@ <translation>ne fait pas parti de vos contacts</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Remarque: vous pouvez automatiquement accepter une invitation en lui répondant.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>Il y a {0} jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>il y a {0} heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>il y a {0} minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>En cours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Il y a %d jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Il y a %d heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Il y a %d minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>il y a une journée</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>il y a une heure</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>juste maintenant</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Échec</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmer</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Refuser</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Réessaie</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recherche en cours ...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID invalide</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nom d'utilisateur non trouvé</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Impossible de vérifier le nom d'utilisateur</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Schéma d'URI non supporté</translation> </message> diff --git a/translations/lrc_fr_BE.ts b/translations/lrc_fr_BE.ts index 6f9557066b122513ea65946b63ad776e43029d07..ed57f5cd6ccbc71053f39970842898a5cfb96e17 100644 --- a/translations/lrc_fr_BE.ts +++ b/translations/lrc_fr_BE.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_BE" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_BE" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Moi</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>En cours de connexion</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminé</translation> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation reçue</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact ajouté</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Appel sortant</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Appel sortant manqué</translation> </message> @@ -106,8 +113,9 @@ <translation>Appel entrant manqué</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation acceptée</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>ok</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recherche...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_fr_CA.ts b/translations/lrc_fr_CA.ts index 0aef3cc12e1043d6d07196b2120fd43e84883111..d4d72cb5372baab616568768c7feaec9a7d029f5 100644 --- a/translations/lrc_fr_CA.ts +++ b/translations/lrc_fr_CA.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Moi</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Connexion en cours</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminé</translation> </message> @@ -70,21 +70,28 @@ <translation>Communication établie</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation reçue</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact ajouté</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Appel sortant</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Appel sortant manqué</translation> </message> @@ -106,8 +113,9 @@ <translation>Appel entrant manqué</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation acceptée</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Essai en cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sonnerie en cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Délai de la requête dépassé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Occupé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>En attente de votre contact</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>Il y a {0} jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>il y a {0} heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>il y a {0} minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Il y a %d jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Il y a %d heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Il y a %d minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>il y a une journée</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>il y a une heure</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>juste maintenant</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Réessaie</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recherche...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID invalide</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Impossible de vérifier le nom d'utilisateur</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_fr_CH.ts b/translations/lrc_fr_CH.ts index 5e5d081513042f5ba199cc677188ff9f51e95a6e..3ce9e3b2cad3d1b9569c16237c05a1d514382f72 100644 --- a/translations/lrc_fr_CH.ts +++ b/translations/lrc_fr_CH.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CH" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CH" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Moi</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminé</translation> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation reçue</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact ajouté</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Appel sortant</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation acceptée</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>ok</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recherche...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_fr_FR.ts b/translations/lrc_fr_FR.ts index 7bc89e61355b59518ca4c2723b7e16b7e0179bdd..b90ceef8af5146e3f722af597f5b5051976b1e82 100644 --- a/translations/lrc_fr_FR.ts +++ b/translations/lrc_fr_FR.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Moi </translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>En cours de connexion</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminé</translation> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitation reçue</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact ajouté</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Appel sortant</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Appel sortant manqué</translation> </message> @@ -106,8 +113,9 @@ <translation>Appel entrant manqué</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitation acceptée</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Essai en cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sonnerie en cours</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>ok</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Interdit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Introuvable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Occupé</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>Il y a {0} jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>il y a {0} heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>il y a {0} minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annulé</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Il y a %d jours</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Il y a %d heures</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Il y a %d minutes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>il y a une journée</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>il y a une heure</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>juste maintenant</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Réessaie</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recherche...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID invalide</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Impossible de vérifier le nom d'utilisateur</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_gl.ts b/translations/lrc_gl.ts index f9f0377fda88a2fa876a6d0a543feb4158f0e8c9..a98245ace6340e260a24b562a41407bf118dd8e2 100644 --- a/translations/lrc_gl.ts +++ b/translations/lrc_gl.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Eu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Conectando</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Rematada</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicación establecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Convite recibido</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacto engadido</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chamada saÃnte</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chamada sen resposta</translation> </message> @@ -106,8 +113,9 @@ <translation>Chamada entrante perdida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Convite aceptado</translation> </message> @@ -118,279 +126,279 @@ <translation>por omisión</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Intentando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Chamando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Reenviando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Na cola</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Progreso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceptado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Múltiples opcións</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido permanentemente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido temporalmente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Servizo alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Solicitude incorrecta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Non autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Require pagamento</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Prohibido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Non atopado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método non permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Non aceptable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>O Proxy require autenticación</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Caducou a solicitude</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Marchou</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entidade da solicitude demasiado longa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI da petición demasiado longa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo de multimedia non soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Esquema URI non soportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensión incorrecta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Require extensión</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador da sesión demasiado curto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo demasiado breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Non dispoñible temporalmente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Chamada TSX non existe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Bucle detectado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Demasiados saltos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Enderezo incompleto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>AmbÃguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Solicitude rematada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento incorrecto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Solicitude actualizada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Solicitude pendente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indescifrable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Fallo interno do servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Non implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Pasarela incorrecta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Servizo non dispoñible</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Caducidade do servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versión non soportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensaxe demasiado longa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Fallo da precondición</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Todos ocupados</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Chamada rexeitada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Non existe en ningures</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Non aceptable en ningures</translation> </message> @@ -465,22 +473,52 @@ <translation>Escribir a {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Non foi posible contactar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Agardando polo contacto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Transferencia entrante</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Caducou a espera polo contacto</translation> </message> @@ -500,87 +538,77 @@ <translation>non está nos teus contactos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: podes aceptar automáticamente este convite se envÃas unha mensaxe.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>fai {0} dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>fai {0} horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>fai {0} minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelado</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>SaÃnte</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>fai %d dÃas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>fai %d hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>fai %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>fai un dÃa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>fai unha hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>xusto agora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fallo</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Denegar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Volta a intentar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Buscando...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID non válido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Non se atopou a usuaria</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Non se puido establecer..</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Esquema URI incorrecto</translation> </message> diff --git a/translations/lrc_he.ts b/translations/lrc_he.ts index a4f4238fa90eecea3338aad62934a3ff4552c322..338d1f97fce45e51477e5b089d1675b6555f2f19 100644 --- a/translations/lrc_he.ts +++ b/translations/lrc_he.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>×× ×™</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>מתחבר</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>שיחה יוצ×ת</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>מצלצל</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>עסוק</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>הערה: × ×™×ª×Ÿ לקבל ×”×–×ž× ×” זו ×וטומטית על ידי שליחת הודעה.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>×œ×¤× ×™ %d ימי×</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>×œ×¤× ×™ %d שעות</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>×œ×¤× ×™ %d דקות</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>×œ×¤× ×™ יו×</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>×œ×¤× ×™ שעה</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>כישלון</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>מחק</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>× ×¡×” שוב</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>בחיפוש...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_hi.ts b/translations/lrc_hi.ts index 9305f9f60a63fa64203608ef35d7cf61f9d26030..8b37768f2efb0e712499ccc3dc2d4634b33275e4 100644 --- a/translations/lrc_hi.ts +++ b/translations/lrc_hi.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>आउटगोइंग कॉल</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>मिसà¥à¤¡ आउटगोइंग कॉल</translation> </message> @@ -106,8 +113,9 @@ <translation>मिसà¥à¤¡ इनकमिंग कॉल</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_hr.ts b/translations/lrc_hr.ts index 52c919972fda7b0cce7d4d652995fcf195a34d0e..fbddad58694b29c10a5c750f7a1042ae1e732241 100644 --- a/translations/lrc_hr.ts +++ b/translations/lrc_hr.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ja</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Spajanje</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>Poziv uspostavljen</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Poziv primljen</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt dodan</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Odlazni poziv</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>PropuÅ¡teni odlazni poziv</translation> </message> @@ -106,8 +113,9 @@ <translation>PropuÅ¡teni dolazni poziv</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Zvoni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>U redu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Zauzeto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>IzbriÅ¡i</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_hu.ts b/translations/lrc_hu.ts index bac7ab1cc12ad33fbe8b339cd220474d466eb9f5..89e8ec749577f94694334830c73b74553c053228 100644 --- a/translations/lrc_hu.ts +++ b/translations/lrc_hu.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Én</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Kapcsolódás</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Befejezett</translation> </message> @@ -70,21 +70,28 @@ <translation>A közlés létrejött</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>MeghÃvás megérkezett</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kapcsolat hozzáadva</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>KimenÅ‘ hÃvás</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Nem fogadott kimenÅ‘ hÃvás</translation> </message> @@ -106,8 +113,9 @@ <translation>Nem fogadott bejövÅ‘ hÃvás</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>MeghÃvás elfogadott</translation> </message> @@ -118,279 +126,279 @@ <translation>alapértelmezett</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Semmis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Próbálkozik…</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Csörögni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>HÃvásátirányÃtás…</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Sorban áll</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Készültségi fok</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Rendben</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Elfogadott</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Több választási lehetÅ‘ség</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Véglegesen áthelyezve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Ãtmenetileg áthelyezve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Meghatalmazás használata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>AlternatÃv szolgáltatás</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Rossz kérés</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Jogtalan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Fizetés szükséges</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Tiltott</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nem található</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Nem megengedett módszer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Elfogadhatatlan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Meghatalmazott hitelesÃtés szükséges</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>IdÅ‘t kér</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Elmúlt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>A kérelem entitása túl nagy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI kérés túl hosszú</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Nem támogatott médiatÃpus</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Nem támogatott URI rendszer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Hibás bÅ‘vÃtmény</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>BÅ‘vÃtmény szükséges</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>A munkamenet idÅ‘zÃtÅ‘je túl rövid</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Túl rövid idÅ‘intervallum</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Ideiglenesen nem elérhetÅ‘</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>A TSX nem létezik</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Érzékelt hurok</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Túl sok komló</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>A cÃm hiányos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Kétértelmű</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Foglalt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Kérés megszűnt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Rossz esemény</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>A kérelem frissÃtése megtörtént</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>A kérelem függÅ‘ben</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Megfejthetetlen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>BelsÅ‘ kiszolgálóhiba</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Nincs végrehajtott</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Rossz átjáró</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>A szolgáltatás nem elérhetÅ‘</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Kiszolgáló idÅ‘túllépése</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Verzió nem támogatott</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Üzenet túl hosszú</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>ElÅ‘feltétel meghiúsulása</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Mindenhol elfoglalt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>HÃvás visszautasÃtott</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Sehol nem létezik</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Bárhol nem elfogadható</translation> </message> @@ -465,22 +473,52 @@ <translation>Ãrj a következÅ‘knek: {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Nem sikerült kapcsolatba lépni</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Várakozás a kapcsolatfelvételre</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>BejövÅ‘ fájlátvitel</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>IdÅ‘túllépés várt a kapcsolattartásra</translation> </message> @@ -500,87 +538,77 @@ <translation>nincs a kapcsolataiban</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Megjegyzés: az üzenet elküldésével önműködÅ‘en elfogadhatja ezt a meghÃvást.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} napja</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} órája</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} perce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Törölve</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Folyamatban lévÅ‘</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d napja</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d órája</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d perce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>egy napja</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>egy órája</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>most</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Hiba</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>MegerÅ‘sÃtés</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Megtagadás</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Törlés</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Újra</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Keresés…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Érvénytelen azonosÃtó</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Felhasználónév nem található</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Betekintés sikertelen…</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Rossz URI rendszer</translation> </message> diff --git a/translations/lrc_id.ts b/translations/lrc_id.ts index 2f5f7ff27b035ae7554e0c9c1d82454a222edd3f..1ff28b74617ac9f9117e5817bf8d216ca092d703 100644 --- a/translations/lrc_id.ts +++ b/translations/lrc_id.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Saya</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Menghubungkan</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontak ditambahkan</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Panggilan keluar</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Panggilan keluar tidak terjawab</translation> </message> @@ -106,8 +113,9 @@ <translation>Panggilan masuk tidak terjawab</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Berdering</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Oke</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Sibuk</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Hapus</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_it.ts b/translations/lrc_it.ts index 721978b5de81798d3e6010fb3f50ed801e6917d9..9cb4d79435504f86a7a0fbbc6d5aaf1bfa5d9b92 100644 --- a/translations/lrc_it.ts +++ b/translations/lrc_it.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Io</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Connessione in corso </translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Completato</translation> </message> @@ -70,21 +70,28 @@ <translation>Connessione stabilita</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invito ricevuto</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contatto aggiunto</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chiamata in uscita</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chiamata in uscita persa</translation> </message> @@ -106,8 +113,9 @@ <translation>Chiamata in entrata persa</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invito accettato</translation> </message> @@ -118,279 +126,279 @@ <translation>predefinito</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Tentativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sta squillando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>In inoltro</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In coda</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>In corso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Richiesta scaduta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Non disponibile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entità richiesta troppo grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo di Media non supportato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Occupato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tempo scaduto per il server</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation>Scrivi a {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Tempo scaduto in attesa di contatto</translation> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: puoi accettare automaticamente questo invito inviando un messaggio.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d giorni fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d ore fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuti fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>un giorno fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>un'ora fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>ora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fallimento</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Riprova</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Ricerca in corso...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nome utente non trovato</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_it_IT.ts b/translations/lrc_it_IT.ts index 877dc667410b7e2aab1c40caa26fdc2d3a36cc62..43f3ac328bae1dd5a03d992437367a5e0aefef86 100644 --- a/translations/lrc_it_IT.ts +++ b/translations/lrc_it_IT.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Io</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Collegamento</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Finito</translation> </message> @@ -70,21 +70,28 @@ <translation>Connessione stabilita</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invito ricevuto</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contatto aggiunto</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chiamata in uscita</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chiamata persa in uscita</translation> </message> @@ -106,8 +113,9 @@ <translation>Chiamata persa in arrivo</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invito accettato</translation> </message> @@ -118,279 +126,279 @@ <translation>predefinito</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Tentativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sta squillando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>In inoltro</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In coda</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>In corso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accettato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Scelta multipla</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Spostato definitivamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Spostato temporaneamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usa proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Servizio alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Richiesta errata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Non autorizzato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Pagamento richiesto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Vietato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Non trovato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metodo non permesso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Non accettabile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Richiesta autenticazione proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Tempo scaduto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Non disponibile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entità richiesta troppo grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI richiesta troppo lungo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo di Media non supportato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Schema URI non supportato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Estensione errata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Estensione obbligatoria</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Timer di sessione troppo piccolo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervallo troppo breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporaneamente non disponibile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Chiamata TSX non esiste</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Rilevato loop</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Troppi Hop</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Indirizzo incompleto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambiguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Occupato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Richiesta terminata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento negativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Richiesta aggiornata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Richiesta in corso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indecifrabile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Errore interno del server</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Non implementato</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Gateway incorretto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Servizio non disponibile</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tempo scaduto per il server</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versione non supportata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Messaggio troppo grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Fallimento della precondizione</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Occupato ovunque</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Chiamata rifiutata</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Non esiste da nessuna parte</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Non accettabile ovunque</translation> </message> @@ -465,22 +473,52 @@ <translation>Scrivi a {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Impossibile prendere contatto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>In attesa di contatto</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Trasferimento in entrata</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Tempo scaduto in attesa di contatto</translation> </message> @@ -500,87 +538,77 @@ <translation>non è nei tuoi contatti</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: puoi accettare automaticamente questo invito inviando un messaggio.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} giorni fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} ore fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minuti fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Annullato</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>In corso</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d giorni fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d ore fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuti fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>un giorno fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>un'ora fa</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>proprio adesso</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fallito</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Conferma</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Nega</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Riprova</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Ricerca...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID non valido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nome utente non trovato</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Lookup non possibile…</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Schema URI errato</translation> </message> diff --git a/translations/lrc_ja.ts b/translations/lrc_ja.ts index 70e6130d0f290c4c7934f55d8f9ee9e7d6f39398..415fe8fc04a315c9ed1318f3bd3d009277617631 100644 --- a/translations/lrc_ja.ts +++ b/translations/lrc_ja.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>自分</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>接続ä¸</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>通話終了</translation> </message> @@ -70,21 +70,28 @@ <translation>通信を確立ã—ã¾ã—ãŸ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>招待をå—ä¿¡ã—ã¾ã—ãŸ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>é€£çµ¡å…ˆã‚’è¿½åŠ ã—ã¾ã—ãŸ</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>発信</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ä¸åœ¨ç™ºä¿¡</translation> </message> @@ -106,8 +113,9 @@ <translation>ä¸åœ¨ç€ä¿¡</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>招待をå—ã‘入れã¾ã—ãŸ</translation> </message> @@ -118,279 +126,279 @@ <translation>既定</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>ãªã—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>試行ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>ç€ä¿¡ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>転é€ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>待機ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>進行状æ³</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>å—諾済ã¿</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>複数ã®é¸æŠžè‚¢</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>完全ã«ç§»å‹•ã—ã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>一時的ã«ç§»å‹•ã—ã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>プãƒã‚シを使ã†</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>代替サービス</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>䏿£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>未èªè¨¼</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>支払ã„ãŒå¿…è¦</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>ç¦æ¢</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>見ã¤ã‹ã‚Šã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>許å¯ã•れã¦ã„ãªã„æ–¹å¼</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>å—ã‘入れä¸å¯</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>プãƒã‚シーèªè¨¼ãŒå¿…è¦</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>リクエストタイムアウト</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>退去</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>リクエストサイズãŒå¤§ãã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>リクエストURLãŒé•·ã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>サãƒãƒ¼ãƒˆã•れã¦ã„ãªã„メディア形å¼</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>サãƒãƒ¼ãƒˆã•れã¦ã„ãªã„URLスã‚ーム</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>䏿£ãªæ‹¡å¼µå</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>æ‹¡å¼µåãŒå¿…è¦</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>セッションタイマーãŒçŸã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>é–“éš”ãŒçŸã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>一時的ã«åˆ©ç”¨ã§ãã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Call TSXãŒå˜åœ¨ã—ã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>ãƒ«ãƒ¼ãƒ—ãŒæ¤œå‡ºã•れã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>ホップ数ãŒå¤šã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>アドレスãŒä¸å®Œå…¨ã§ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>䏿˜Žçž</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>通話ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>リクエストãŒå¼·åˆ¶çµ‚了ã•れã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>䏿£ãªã‚¤ãƒ™ãƒ³ãƒˆ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>リクエストを更新ã—ã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>リクエストãŒä¿ç•™ä¸ã§ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>復å·ã§ãã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>内部サーãƒãƒ¼ã‚¨ãƒ©ãƒ¼</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>未実装ã§ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>䏿£ãªã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>サービス利用ä¸å¯</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>サーãƒãƒ¼ã‚¿ã‚¤ãƒ アウト</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>サãƒãƒ¼ãƒˆã•れã¦ã„ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>メッセージãŒå¤§ãã™ãŽã¾ã™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>é€šè©±ãŒæ‹’å¦ã•れã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>ã©ã“ã«ã‚‚å˜åœ¨ã—ã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>通知: メッセージをé€ä¿¡ã™ã‚‹ã¨ã€è‡ªå‹•çš„ã«ã“ã®æ‹›å¾…ã‚’å—ã‘入れã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>ã‚ャンセルã—ã¾ã—ãŸ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d æ—¥å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d 時間å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d 分å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>1 æ—¥å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>1 時間å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>ã¡ã‚‡ã†ã©ä»Š</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>確èª</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>削除</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>検索ä¸â€¦</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>䏿£ãªID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>見ã¤ã‘られã¾ã›ã‚“ã§ã—ãŸ...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>䏿£ãªURLスã‚ーム</translation> </message> diff --git a/translations/lrc_lt.ts b/translations/lrc_lt.ts index 00182f1362ee3107ba2c0827d3288dc4b7a75425..dd2e86c0e4bfb27dbdb85798f492ff475f1f89c1 100644 --- a/translations/lrc_lt.ts +++ b/translations/lrc_lt.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>AÅ¡</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Sujungiama</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Užbaigta</translation> </message> @@ -70,21 +70,28 @@ <translation>RyÅ¡ys užmegztas</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Gautas pakvietimas</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Adresatas pridÄ—tas</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>IÅ¡siunÄiamasis skambutis</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation>Praleistas gaunamasis skambutis</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Pakvietimas priimtas</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Bandoma</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Skambina</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Gerai</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Bloga Užklausa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Neleidžiama</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nerasta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Užklausos laikas baigÄ—si</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Nepalaikoma URI schema</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Aptiktas ciklas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Nepilnas adresas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Užimta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Blogas įvykis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>VidinÄ— Serverio Klaida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Neįgyvendinta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Blogas Tinklų Sietuvas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versija nÄ—ra palaikoma</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Pastaba: galite automatiÅ¡kai priimti šį pakvietimÄ… iÅ¡siųsdami žinutÄ™.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Atsisakyta</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>prieÅ¡ %d d.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>prieÅ¡ %d val.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>prieÅ¡ %d min.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>prieÅ¡ vienÄ… dienÄ…</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>prieÅ¡ vienÄ… valandÄ…</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>kÄ… tik</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>NesÄ—kmÄ—</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Patvirtinti</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>IÅ¡trinti</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>IeÅ¡koma…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Neteisingas ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Bloga URI schema</translation> </message> diff --git a/translations/lrc_ms.ts b/translations/lrc_ms.ts index 89487d9ef7603f5552851f3393fe744546c96ce1..1b8fbee7cb98faad252507ae68962bd05f1dd853 100644 --- a/translations/lrc_ms.ts +++ b/translations/lrc_ms.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ms" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ms" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Saya</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Menyambung</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>Komunikasi bersambung</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Panggilan keluar</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Berdering</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Masa permintaan tamat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Sibuk</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Hapus</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_nb.ts b/translations/lrc_nb.ts index 5a5c501c70e3405aaef8b2e46bc58dff03e1669e..16d1fcc281d1387c18a61be34871c2d07581ed96 100644 --- a/translations/lrc_nb.ts +++ b/translations/lrc_nb.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Meg</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Kobler opp</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Fullført</translation> </message> @@ -70,21 +70,28 @@ <translation>Kommunikasjon etablert</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitasjon mottatt</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt lagt til</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>UtgÃ¥ende samtale</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Tapt utgÃ¥ende anrop</translation> </message> @@ -106,8 +113,9 @@ <translation>Tapt innkommende anrop</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitasjon godtatt</translation> </message> @@ -118,279 +126,279 @@ <translation>standard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Prøver</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Ringer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Blir videresendt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>I kø</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Framdrift</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Godkjent</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Flere valg</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Flyttet permanent</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Flyttet midlertidig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Bruk mellomtjener</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternativ tjeneste</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>DÃ¥rlig forespørsel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Uautorisert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Betaling kreves</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Forbudt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Ikke funnet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metode ikke tillatt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Ikke akseptabelt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy-godkjenning er pÃ¥krevd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Tidsgrense for henvendelse</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Borte</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Enhetsforespørsel for stor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI forespørsel for lang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Media type ikke støttet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>URI-ordning støttes ikke</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Utvidelse ødelagt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Utvidelse obligatorisk</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Øktur for liten</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervall for kort</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Midlertidig utilgjengelig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>TSX samtale eksisterer ikke</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Løkke oppdaget</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>For mange hopp</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Ufullstendig adresse</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Tvetydig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Opptatt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Forespørsel avsluttet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Handling feilet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Forespørsel oppdatert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Forespørsel venter</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Ugjenkjennelig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Intern tjenerfeil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Ikke implementert</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Feil pÃ¥ mellomtjener</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Tjeneste utilgjengelig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tidsavbrudd tjener</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versjon ikke støttet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Melding for stor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Forutsetning feilet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Opptatt overalt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Samtale avslÃ¥tt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Eksisterer ingen steder</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Aksepteres ingen steder</translation> </message> @@ -465,22 +473,52 @@ <translation>Skriv til {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Kan ikke ta kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Venter pÃ¥ kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Innkommende overføring</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Tidsavbrudd ventet pÃ¥ kontakt</translation> </message> @@ -500,87 +538,77 @@ <translation>er ikke i dine kontakter</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Merk, du aksepterer automatisk denne invitasjonen ved Ã¥ sende en melding.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} dager siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} timer siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minutter siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Avbrutt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>PÃ¥gÃ¥ende</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dager siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d timer siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minutter siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>i gÃ¥r</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>en time siden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>akkurat nÃ¥</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Mislyktes</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bekreft</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>AvslÃ¥</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Slett</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Forsøk igjen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Søker...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ugyldig ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Kunne ikke søke opp...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Ukjent URI-type</translation> </message> diff --git a/translations/lrc_nl.ts b/translations/lrc_nl.ts index 7549ac364314e074f44325d9a3f3c12c65847f5d..e75bc7db77942319c2080664cf98213ad4c60a28 100644 --- a/translations/lrc_nl.ts +++ b/translations/lrc_nl.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ik</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Verbinden</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Beëindigd</translation> </message> @@ -70,21 +70,28 @@ <translation>Communicatie tot stand gebracht</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Uitnodiging ontvangen</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact toegevoegd</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Uitgaande oproep</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Gemiste uitgaande oproep</translation> </message> @@ -106,8 +113,9 @@ <translation>Gemiste inkomende oproep</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Uitnodiging geaccepteerd</translation> </message> @@ -118,279 +126,279 @@ <translation>standaard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Poging</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Gaat over</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Bezig met doorschakelen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In wachtrij</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Voortgang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Oké</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Geaccepteerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Meerdere mogelijkheden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Permanent verplaatst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Tijdelijk verplaatst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Proxy gebruiken</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternatieve dienst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Slecht verzoek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Niet geautoriseerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Betaling vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Verboden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Niet gevonden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Methode niet toegestaan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Niet acceptabel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy-authenticatie vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Time-out aanvragen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Weg</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Verzoeksentiteit te groot</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Verzoeks-URI te lang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Niet-ondersteund mediatype</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Niet-ondersteund URI-schema</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Slechte extensie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extensie vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Sessietimer te klein</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval te kort</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Tijdelijk niet beschikbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Oproep-TSX bestaat niet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Lus gedetecteerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Te veel sprongen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Onvolledig adres</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambigu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Bezet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Verzoek beëindigd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Slechte gebeurtenis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Verzoek bijgewerkt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Verzoek in afwachting</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Onleesbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Interne serverfout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Niet geïmplementeerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Slechte gateway</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Dienst niet beschikbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Servertime-out</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versie niet ondersteund</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Bericht te groot</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Pre-voorwaardefout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Overal bezet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Oproep geweigerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Bestaat nergens</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Nergens acceptabel</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Let op: u kunt deze uitnodiging automatisch accepteren door een bericht te sturen.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Geannuleerd</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dagen geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d uur geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuten geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>een dag geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>een uur geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>zonet</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fout</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bevestigen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Verwijderen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Opnieuw proberen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Bezig met zoeken…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ongeldig ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Verkeerd URI-schema</translation> </message> diff --git a/translations/lrc_nl_BE.ts b/translations/lrc_nl_BE.ts index 855a5d83735f4539ea2bbe5c123833dee39f16b0..1f4b974e79c42a8de53caae7231a106c79434501 100644 --- a/translations/lrc_nl_BE.ts +++ b/translations/lrc_nl_BE.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_BE" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_BE" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ik</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Verbinden</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Beëindigd</translation> </message> @@ -70,21 +70,28 @@ <translation>Communicatie tot stand gebracht</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Uitnodiging ontvangen</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact toegevoegd</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Uitgaande oproep</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Gemiste uitgaande oproep</translation> </message> @@ -106,8 +113,9 @@ <translation>Gemiste inkomende oproep</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Uitnodiging aanvaard</translation> </message> @@ -118,279 +126,279 @@ <translation>standaard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Poging</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Gaat over</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Bezig met doorschakelen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>In wachtrij</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Voortgang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>Oké</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aanvaard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Meerdere mogelijkheden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Voorgoed verplaatst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Tijdelijk verplaatst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Proxy gebruiken</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternatieve dienst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Slecht verzoek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Ongeautoriseerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Betaling vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Verboden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Niet gevonden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Methode niet toegelaten</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Onaanvaardbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy-authentificatie vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Time-out aanvragen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Weg</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Verzoeksentiteit te groot</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Verzoeks-URI te lang</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Onondersteund mediatype</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Onondersteund URI-schema</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Slechte extensie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extensie vereist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Sessietimer te klein</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval te kort</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Tijdelijk onbeschikbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Oproeps-TSX bestaat niet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Lus gedetecteerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Te veel sprongen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Onvolledig adres</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambigu</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Bezig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Verzoek beëindigd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Slechte gebeurtenis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Verzoek bijgewerkt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Verzoek in afwachting</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Onontcijferbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Interne serverfout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Niet geïmplementeerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Slechte gateway</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Dienst onbeschikbaar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Servertime-out</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versie niet ondersteund</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Bericht te groot</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Pre-voorwaardefout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Overal bezig</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Oproep geweigerd</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Bestaat nergens</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Nergens aanvaardbaar</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Let op: u kunt deze uitnodiging automatisch aanvaarden door een bericht te sturen.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Geannuleerd</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dagen geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d uur geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuten geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>een dag geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>een uur geleden</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Nu net</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fout</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bevestigen</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Verwijderen</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Herproberen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Bezig met zoeken…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ongeldige ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Verkeerd URI-schema</translation> </message> diff --git a/translations/lrc_oc.ts b/translations/lrc_oc.ts index 45dd6bfdf88730cc62545927fff4fb4079379c76..040f6eff56c0ec2ad5cfdc21159c26ecd81b9433 100644 --- a/translations/lrc_oc.ts +++ b/translations/lrc_oc.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="oc" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="oc" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ieu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Connexion</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Invitacion recebuda</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacte ajustat</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Sonada sortissenta mancada</translation> </message> @@ -106,8 +113,9 @@ <translation>Sonada dintrada mancada</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Invitacion acceptada</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>D’ACÃ’RDI</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Ara meteis</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Suprimir</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Tornar ensajar</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Recèrca…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_pa.ts b/translations/lrc_pa.ts index e8ff53f3c688080d6519f4986bf4f460e9a3cafd..9b2c7ba4fa52c66f97c5aa08c1236df3a8ba380d 100644 --- a/translations/lrc_pa.ts +++ b/translations/lrc_pa.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pa" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pa" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>ਮੈਂ</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>ਸੰਚਾਰ ਸ਼à©à¨°à©‚ ਹੋਇਆ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>ਸੱਦਾ ਮਿਲਿਆ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>ਸੰਪਰਕ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>ਜਾਂਦੀ ਕਾਲ</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ਖà©à©°à¨à©€ ਜਾਂਦੀ ਕਾਲ</translation> </message> @@ -106,8 +113,9 @@ <translation>ਖà©à©°à¨à©€ ਆਉਂਦੀ ਕਾਲ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>ਘੰਟੀ ਵੱਜ ਰਹੀ ਹੈ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ਰà©à¨à©‡à¨µà©‡à¨‚ ਵਿੱਚ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>ਮਿਟਾਓ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_pl.ts b/translations/lrc_pl.ts index a7f8ecec90a4c6876564b3e9624642b209ef99fa..8d3b60b5824121c0ae5c41811fed5fb786578bf3 100644 --- a/translations/lrc_pl.ts +++ b/translations/lrc_pl.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ja</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>ÅÄ…czenie</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>ZakoÅ„czono</translation> </message> @@ -70,21 +70,28 @@ <translation>Połączenie siÄ™ powiodÅ‚o </translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Otrzymano zaproszenie</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt dodany</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Połączenie wychodzÄ…ce</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Nieodebrane połączenie wychodzÄ…ce</translation> </message> @@ -106,8 +113,9 @@ <translation>Nieodebrane połączenie przychodzÄ…ce</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Zaakceptowano zaproszenie</translation> </message> @@ -118,279 +126,279 @@ <translation>domyÅ›lne</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Próbowanie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Dzwonienie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Jest Przekazywane</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>W kolejce</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Progres</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Zaakceptowane</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Wiele Wyborów</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Przeniesione Na StaÅ‚e</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Przeniesione Tymczasowo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Używaj Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternatywna UsÅ‚uga</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>NieprawidÅ‚owe zapytanie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Nieautoryzowany</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Wymagana PÅ‚atność</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Zabroniony</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nie Znaleziono</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Nieakceptowalne</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Wymagane Uwierzytelnienie Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>ProÅ›ba przekroczyÅ‚a czas oczekiwania</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>ZniknÄ…Å‚</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ZajÄ™ty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation>Napisz do {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Nie udaÅ‚o siÄ™ nawiÄ…zać kontaktu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Czekanie na kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>PrzychodzÄ…cy transfer</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Przekroczono czas czekajÄ…c na kontakt</translation> </message> @@ -500,87 +538,77 @@ <translation>nie jest w twoich kontaktach</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Uwaga: możesz automatycznie zaakceptować to zaproszenie poprzez wysÅ‚anie wiadmoÅ›ci.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} dni temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} godzin temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minut temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Anulowano</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>W trakcie</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dni temu </translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d godzin temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minut temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>jeden dzieÅ„ temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>jednÄ… godzinÄ™ temu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>teraz</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Nie powiodÅ‚o siÄ™</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Potwierdź</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Odmów</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>UsuÅ„</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Ponów</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Szukanie...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>NieprawidÅ‚owe ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nazwa użytkownika nieznaleziona</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>ZÅ‚e URI</translation> </message> diff --git a/translations/lrc_pl_PL.ts b/translations/lrc_pl_PL.ts index e80ebd26d29e5beb3606df8f6a4bdbb003d12ec9..eeb8fc56517f72d619957fc0eea8969b44aa0921 100644 --- a/translations/lrc_pl_PL.ts +++ b/translations/lrc_pl_PL.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ja</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>ÅÄ…czenie</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>ZakoÅ„czono</translation> </message> @@ -70,21 +70,28 @@ <translation>Połączenie siÄ™ powiodÅ‚o </translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Otrzymano zaproszenie</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt dodany</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Połączenie wychodzÄ…ce</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Nieodebrane połączenie wychodzÄ…ce</translation> </message> @@ -106,8 +113,9 @@ <translation>Nieodebrane połączenie przychodzÄ…ce</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Zaakceptowano zaproszenie</translation> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Dzwonienie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>PostÄ™p</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ZajÄ™ty</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation>Napisz do {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>UsuÅ„</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Ponów</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Szukanie</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_pt.ts b/translations/lrc_pt.ts index 753c436957e11e1e2ee7010ca220d0f78a354316..a2d730403485927bc7dfdb4fbe4d7194e8e50765 100644 --- a/translations/lrc_pt.ts +++ b/translations/lrc_pt.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Eu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>A conectar</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminado</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicação estabelecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Convite recebido</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacto adicionado</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chamada efetuada</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chamadas efetuadas perdidas</translation> </message> @@ -106,8 +113,9 @@ <translation>Chamadas recebidas perdidas</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Convite aceite</translation> </message> @@ -118,279 +126,279 @@ <translation>padrão</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Nulo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>A tentar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>A tocar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>A ser reencaminhado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Na fila</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>A decorrer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Várias escolhas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido permanentemente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido temporariamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Serviço alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Pedido inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Não autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Necessário pagamento</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Proibido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Não encontrado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método não permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Não aceitável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Necessário autenticação de proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>O pedido excedeu o tempo limite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Foi-se</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entidade do pedido demasiado grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI de pedido demasiado longo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo de media não suportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Esquema URI não suportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensão inválida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Necessária extensão</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador de sessão demasiado pequeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo demasiado breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Não disponÃvel temporariamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation> A chamada TSX não existe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Detetado loop</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Demasiados saltos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Endereço incompleto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>AmbÃguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado(a)</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Pedido terminado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Pedido atualizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Pedido pendente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Não decifrável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Erro interno do servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Não implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Gateway inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Serviço indisponÃvel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tempo de resposta do servidor excedido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versão não suportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensagem demasiado grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Falha nos pré-requisitos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupado em todo o lado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Chamada recusada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Não existe em lugar nenhum</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Não aceite em lugar nenhum</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: pode aceitar este convite automaticamente enviando uma mensagem.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelada</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>há %d dias</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>há %d horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>há %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>há um dia</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>há uma hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>agora mesmo</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Falha</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>A pesquisar…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID inválido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Mau esquema de URI</translation> </message> diff --git a/translations/lrc_pt_BR.ts b/translations/lrc_pt_BR.ts index e468b28470d968734844905dce054d0547ca0772..76554f3eac79e69ae09dbd571ced2053cc5591ff 100644 --- a/translations/lrc_pt_BR.ts +++ b/translations/lrc_pt_BR.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Eu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Conectando</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminado</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicação estabelecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Convite recebido</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contato adicionado</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chamada efetuada</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chamadas efetuadas perdidas</translation> </message> @@ -106,8 +113,9 @@ <translation>Chamadas recebidas perdidas</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Convite aceito</translation> </message> @@ -118,279 +126,279 @@ <translation>padrão</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Nulo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Tentando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Tocando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Está sendo encaminhado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Esperando</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Progresso</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceito</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Múltiplas Escolhas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido Permanentemente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido Temporariamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Serviço Alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Pedido Inadequado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Não autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Pagamento Requerido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Proibido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Não Encontrado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método Não Permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Não Aceitável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Autenticação de Proxy Necessária</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>A requisição excedeu o tempo limite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Perdido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Pedido Muito Grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Pedido de URI Muito Longo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>MÃdia Não Suportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Tipo de URI Sem Suporte</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Complemento Inadequado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Complemento Necessário</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador de Sessão Muito Pequeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo Muito Curto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporariamente IndisponÃvel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Chamada TSX Não Existe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Loop Detectado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Muitos Ressaltos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Endereço Incompleto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>AmbÃguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Pedido Terminado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento Inadequado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Pedido Atualizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Pedido Pendente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indecifrável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Erro Interno do Servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Não Implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Gateway Inadequado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Serviço IndisponÃvel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tempo do Servidor Esgotou</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versão Não Suportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensagem Muito Grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Requisito Insuficiente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupado em Toda Parte</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Chamada Recusada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Não Existe em Nenhum Lugar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Não Aceitável em Qualquer Lugar</translation> </message> @@ -465,22 +473,52 @@ <translation>Escrever para {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Não é possÃvel fazer contato</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Aguardando pelo contato</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Recebendo transferência</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>O tempo de aguardo pelo contato chegou ao fim</translation> </message> @@ -500,87 +538,77 @@ <translation>não está em seus contatos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Observação: você pode aceitar automaticamente este convite enviando uma mensagem.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} dias atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} horas atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minutos atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelada</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Em andamento</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dias atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d horas atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minutos atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>um dia atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>uma hora atrás</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Agora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Falha</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Negar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Deletar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Tente novamente</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Buscando...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID inválido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Nome de usuário não encontrado</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Não consegui procurar...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Mau esquema de URI</translation> </message> diff --git a/translations/lrc_pt_PT.ts b/translations/lrc_pt_PT.ts index ff9847df0092a96c421bc6b5568918063d73b8c8..4dfbc35416922b90f1729f86c349feb8357e3805 100644 --- a/translations/lrc_pt_PT.ts +++ b/translations/lrc_pt_PT.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Eu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>A conectar</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminado</translation> </message> @@ -70,21 +70,28 @@ <translation>Comunicação estabelecida</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Convite recebido</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contacto adicionado</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Chamada efetuada</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Chamadas efetuadas perdidas</translation> </message> @@ -106,8 +113,9 @@ <translation>Chamadas recebidas perdidas</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Convite aceite</translation> </message> @@ -118,279 +126,279 @@ <translation>padrão</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Nulo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>A tentar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>A tocar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>A ser reencaminhado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Na fila</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>A decorrer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Várias escolhas</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Movido permanentemente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Movido temporariamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Usar proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Serviço alternativo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Pedido inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Não autorizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Necessário pagamento</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Proibido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Não encontrado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Método não permitido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Não aceitável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Necessário autenticação de proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>O pedido excedeu o tempo limite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Foi-se</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Entidade do pedido demasiado grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI de pedido demasiado longo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tipo de media não suportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Esquema URI não suportado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensão inválida</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Necessária extensão</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Temporizador de sessão demasiado pequeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Intervalo demasiado breve</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Não disponÃvel temporariamente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation> A chamada TSX não existe</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Detetado loop</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Demasiados saltos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Endereço incompleto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>AmbÃguo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupado(a)</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Pedido terminado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Evento inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Pedido atualizado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Pedido pendente</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Não decifrável</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Erro interno do servidor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Não implementado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Gateway inválido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Serviço indisponÃvel</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Tempo de resposta do servidor excedido</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versão não suportada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mensagem demasiado grande</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Falha nos pré-requisitos</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupado em todo o lado</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Chamada recusada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Não existe em lugar nenhum</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Não aceite em lugar nenhum</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation>is not in your contacts</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Nota: pode aceitar este convite automaticamente enviando uma mensagem.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} days ago</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} hours ago</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minutes ago</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Cancelada</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>há %d dias</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>há %d horas</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>há %d minutos</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>há um dia</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>há uma hora</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>agora mesmo</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Falha</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmar</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>A pesquisar…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID inválido</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Não foi possÃvel encontrar...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Mau esquema de URI</translation> </message> diff --git a/translations/lrc_ro_RO.ts b/translations/lrc_ro_RO.ts index 932a86ed510c37d18a4999795b3a57e4a76f3067..ba619533028d072d588a408de1ea3c48cf5de5cc 100644 --- a/translations/lrc_ro_RO.ts +++ b/translations/lrc_ro_RO.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Eu</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Se conectează</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Terminat</translation> </message> @@ -70,21 +70,28 @@ <translation>Legătură stabilită</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>InvitaÈ›ie primită</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Contact adăugat</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Apel efectuat</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Apel efectuat nepreluat</translation> </message> @@ -106,8 +113,9 @@ <translation>Apel pierdut</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>InvitaÈ›ie acceptată</translation> </message> @@ -118,279 +126,279 @@ <translation>prestabilit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Nul</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Probă</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Sună</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Se trimite</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>ÃŽn aÈ™teptare</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>ÃŽn curs</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Aceptat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Alegeri multiple</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Mutat permanent</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Mutat temporar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>FoloseÈ™te Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Serviciu alternativ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Cerere greÈ™ită</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Neautorizat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Plată obligatorie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Interzis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Nu a fost găsit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metodă nepermisă</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Inacceptabil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Autentificare pentru Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Timpul a expirat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Indisponibil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Elementul cerut este prea mare</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI-ul cerut este prea lung</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Tip de media neacceptat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Schemă URI neacceptată</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Extensie greÈ™ită</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extensie necesară</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Timpul sesiunii este prea scurt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval prea scurt</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporar indisponibil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Apelul TSX nu există</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Loop descoperit</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Prea multe Hop-uri</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresă incompletă</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Neclar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Ocupat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Cerere terminată</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Eveniment greÈ™it</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Cerere actualizată</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Cerere în curs</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Indescifrabil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Eroare internă a serverului</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Neimplementat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Poartă greÈ™ită</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Serviciu indisponibil</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Timpul a expirat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Versiune incompatibilă</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mesaj prea mare</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>EÈ™ec al precondiÈ›iei</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ocupat peste tot</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Apel refuzat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Nu există nicăieri</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Nu este acceptat nicăieri</translation> </message> @@ -465,22 +473,52 @@ <translation>Scrie pentru {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Imposibil de contactat</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>ÃŽn aÈ™teptare</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Transfer primit</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Timpul de aÈ™teptare a expirat</translation> </message> @@ -500,87 +538,77 @@ <translation>nu e în contactele tale</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Aviz: poÈ›i accepta automat această invitaÈ›ie trimițînd un mesaj.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>acum {0} zile</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>acum {0} ore</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>acum {0} minute</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Anulat</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>ÃŽn curs</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>acum %d zile</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>acum %d ore</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>acum %d minute</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>acum o zi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>acum o oră</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>chiar acum</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>EÈ™ec</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Confirmă</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Refuză</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Șterge</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>ÃŽncearcă din nou</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Căutare...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID greÈ™it</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Numele de utilizator nu a fost găsit</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Căutare imposibilă...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Schemă URI greÈ™ită</translation> </message> diff --git a/translations/lrc_ru.ts b/translations/lrc_ru.ts index 6348f9151e93ccc24d7dfa089c48c0330ae59df5..af2b2721d68f7223fa57490139ec4bf78dc91105 100644 --- a/translations/lrc_ru.ts +++ b/translations/lrc_ru.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Я</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Подключение</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Завершён</translation> </message> @@ -70,21 +70,28 @@ <translation>Соединение уÑтановлено</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Получено приглашение</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Контакт добавлен</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>ИÑходÑщий вызов</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ÐепринÑтый иÑходÑщий вызов</translation> </message> @@ -106,8 +113,9 @@ <translation>Пропущенный входÑщий вызов</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Приглашение принÑто</translation> </message> @@ -118,279 +126,279 @@ <translation>По умолчанию</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>ПуÑтой</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Попытка</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Звонок</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Было отправлено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>ПоÑтавлено в очередь</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>ПрогреÑÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>ОК</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>ПринÑто</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>МножеÑтво вариантов</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Переехал навÑегда</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Временно перехал</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>ИÑпользовать прокÑи</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>ÐÐ»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ð°Ñ Ñлужба</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Ðеверный запроÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Ðеавторизовано</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>ТребуетÑÑ Ð¾Ð¿Ð»Ð°Ñ‚Ð°</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Запрещено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Ðе найдено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Метод не разрешен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>ÐедопуÑтимо</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>ТребуетÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° подлинноÑти прокÑи</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Прошло</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Запрошенный объект Ñлишком большой</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Запрошенный URL Ñлишком длинный</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Ðеподдерживаемый тип медиа</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Ðеподдерживаемый Ñхема URI</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Ðеверное раÑширение</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>ТребуетÑÑ Ñ€Ð°Ñширение</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Таймер ÑеÑÑии Ñлишком мал</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Интервал Ñлишком короткий</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Временно недоÑтупен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Вызываемый TSX не ÑущеÑтвует</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Обнаружена петлÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Слишком много переходов</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Ðеполный адреÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>ДвуÑмыÑленный</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ЗанÑто</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‰ÐµÐ½</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Ðекорректное Ñобытие</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ выполнениÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Ðеразборчивый</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° Ñервера</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Ðе реализовано</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Ðекорректный шлюз</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Ð¡ÐµÑ€Ð²Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Тайм-аут Ñервера</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>ВерÑÐ¸Ñ Ð½Ðµ поддерживаетÑÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Слишком большое Ñообщение</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Сбой предуÑловиÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>ЗанÑÑ‚ везде</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Вызов отклонен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Ðе ÑущеÑтвует нигде</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Ðе приемлемо нигде</translation> </message> @@ -465,22 +473,52 @@ <translation>ЗапиÑÑŒ в {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>Ðе удалоÑÑŒ уÑтановить контакт</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Ожидание контакта</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>ВходÑщий перевод</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Тайм-аут Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°</translation> </message> @@ -500,87 +538,77 @@ <translation>отÑутÑтвует в ваших контактах</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Примечание: Ð’Ñ‹ можете автоматичеÑки принÑть Ñто приглашение, отправив Ñообщение.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} дней назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} чаÑов назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} минут назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Отменено</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Текущий</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d дней назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d чаÑов назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d минут назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>один день назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>один Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>прÑмо ÑейчаÑ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Подтвердить</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Отказать</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Повторить</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>ПоиÑк…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ðеверный ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Ðе могу найти ...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñхема URI</translation> </message> diff --git a/translations/lrc_ru_RU.ts b/translations/lrc_ru_RU.ts index 09bf19d2fb2e737d52349d3925c6d19cb9ec05f3..1e91e868f99e1b25ff5408bf14a0d9e6e32f1ab4 100644 --- a/translations/lrc_ru_RU.ts +++ b/translations/lrc_ru_RU.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Мне</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Подключение</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Завершено</translation> </message> @@ -70,21 +70,28 @@ <translation>Соединение уÑтановлено</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Получено приглашение</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Контакт добавлен</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>ИÑходÑщий вызов</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Пропущенный иÑходÑщий</translation> </message> @@ -106,8 +113,9 @@ <translation>Пропущенный входÑщий</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Приглашение принÑто</translation> </message> @@ -118,279 +126,279 @@ <translation>по-умолчанию</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>ПытаемÑÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Вызов</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Будет перенаправлено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Ð’ очереди</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Вызов</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>ПринÑто</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>МножеÑтвенный выбор</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Перемещено навÑегда</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Временно перемещено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>ИÑпользовать прокÑи</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Ðльтернативный ÑервиÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Ðеверный запроÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Ðеавторизовано</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>ТребуетÑÑ Ð¾Ð¿Ð»Ð°Ñ‚Ð°</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Запрещено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Ðе найдено</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Метод не поддерживаетÑÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Ðе принÑто</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>ТребуетÑÑ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñлишком большой</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Запрошенный URI Ñлишком большой</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Ðеподдерживаемый тип медиа</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ñхема данных</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Таймер ÑеÑÑии Ñлишком мал</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Временно недоÑтупно</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Вызываемый TSX не ÑущеÑтвует</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Ð’ÑÑ‘ зациклилоÑÑŒ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Слишком много прыжков</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ЗанÑÑ‚</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° Ñервера</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Ð¡ÐµÑ€Ð²Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Сервер не отвечает</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>ВерÑÐ¸Ñ Ð½Ðµ поддерживаетÑÑ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Сообщение Ñлишком большое</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Звонок Ñброшен</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation>нет в ваших контактах</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Справка: вы можете автоматичеÑки принÑть Ñто приглашение отправив Ñообщение.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} дней назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} чаÑов назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} минут назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d дней назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d чаÑов назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d минут назад</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>вчера</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>только что</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Подтвердить</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Повтор</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>ПоиÑк...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ðеверный ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Ðевозможно найти...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñхема URI</translation> </message> diff --git a/translations/lrc_sk_SK.ts b/translations/lrc_sk_SK.ts index 644a8b765a894ae52df7d38b4c8b8e2b7773767e..625a3910a6c4ed4325e3b09ded2a7bacb15ddf9b 100644 --- a/translations/lrc_sk_SK.ts +++ b/translations/lrc_sk_SK.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ja</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Pripájanie</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>UkonÄený</translation> </message> @@ -70,21 +70,28 @@ <translation>Spojenie nadviazané</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Bola prijatá pozvánka</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt pridaný</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Odchádzajúci hovor</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ZmeÅ¡kaný odchádzajúci hovory</translation> </message> @@ -106,8 +113,9 @@ <translation>ZmeÅ¡kaný prÃchodzà hovor</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Pozvánka prijatá</translation> </message> @@ -118,279 +126,279 @@ <translation>default</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Pokúšam sa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Zvonenie</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Presmeruje sa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Zaradené</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Priebeh</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Prijaté</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Viaceré možnosti</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Moved Permanently</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Moved Temporarily</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>PoužiÅ¥ Proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>AlternatÃvna služba</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Bad Request</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Unauthorized</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Payment Required</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Forbidden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Not Found</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Method Not Allowed</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Not Acceptable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy Authentication Required</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>ÄŒas na splnenie žiadosti vyprÅ¡al</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>Gone</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Request Entity Too Large</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>Request URI Too Long</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Unsupported Media Type</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Unsupported URI Scheme</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Bad Extension</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Extension Required</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Session Timer Too Small</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval Too Brief</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Temporarily Unavailable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Call TSX Does Not Exist</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Loop Detected</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Too Many Hops</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Address Incomplete</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Ambiguous</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Obsadené</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Request Terminated</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Bad Event</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Request Updated</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Request Pending</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Undecipherable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Internal Server Error</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Not Implemented</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Bad Gateway</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Service Unavailable</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Server Timeout</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Version Not Supported</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Správa prÃliÅ¡ veľká</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Precondition Failure</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Busy Everywhere</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Hovor odmietnutý</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Neexistuje</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Neprijateľný</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Poznámka: poslanÃm správy môžete automaticky prijaÅ¥ toto pozvanie</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>ZruÅ¡ené</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Pred %d dňami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Pred %d hodinami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Pred %d minútami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>VÄera</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>Pred hodinou</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Práve teraz</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>PotvrdiÅ¥</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>VymazaÅ¥</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>SkúsiÅ¥ znovu</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Vyhľadávanie...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Neplatné ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Nenájdené</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Zlá URI schéma</translation> </message> diff --git a/translations/lrc_sl.ts b/translations/lrc_sl.ts index c1773088e268a5fef63d3af74121eeb15bc138c5..8a9f63c127f0c815c44aba93036f886894a53593 100644 --- a/translations/lrc_sl.ts +++ b/translations/lrc_sl.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Jaz</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Povezovanje</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>KonÄano</translation> </message> @@ -70,21 +70,28 @@ <translation>Komunikacija vzpostavljena</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Povabilo je sprejeto</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Stik je dodan</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Odhodni klic</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>ZgreÅ¡en odhodni klic</translation> </message> @@ -106,8 +113,9 @@ <translation>ZgreÅ¡en dohodni klic</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Povabilo je potrjeno</translation> </message> @@ -118,279 +126,279 @@ <translation>privzeto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>PoskuÅ¡am</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Zvoni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Preusmerjanje naprej</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>V Äakalni vrsti</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Napredek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>V redu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Sprejeto</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>VeÄ izbir</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Permanentno preseljen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>ZaÄasno preseljen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Uporabi posredniÅ¡ki strežnik</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Aternativna storitev</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>NapaÄen zahtevek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>Ni avtorizacije</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Zahtevano je plaÄilo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Prepovedano</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Ni najdeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metoda ni dovoljena</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Ni sprejemljivo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Zahtevana je overitev posredniÅ¡kega strežnika</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Zahteva je potekla</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>OdlÅ¡loOdÅ¡lo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Zahtevana entiteta je prevelika</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI zahtevek je predolg</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Nepodprta vrsta medija</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>URI shema ni podprta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>NapaÄna razÅ¡iritev</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Zahtevana je razÅ¡iritev</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>ÄŒasovnik seje je premajhen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval je prekratek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Trenutno ni na voljo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Klicni TSX ne obstaja</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Zaznana zanka</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>PreveÄ preskokov</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Nepopoln naslov</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Dovumno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Zasedeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Zahteva je prekinjena</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>NapaÄen dogodek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Zahtevek je posodobljen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Zahtevek Äaka</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Å ifriranje ni možno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Interna strežniÅ¡ka napaka</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Ni implementirano</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>NapaÄen prehod</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Storitev ni na voljo</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>ÄŒasovna omejitev strežnika</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>RazliÄica ni podprta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>SporoÄilo je preveliko</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Napaka zaradi predpogojev</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Vse je zasedeno</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Zavrnjen klic</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Nikjer ne obstaja</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Ni sprjemljivo kjerkoli</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation>med vaÅ¡imi stiki</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Opomba: s poÅ¡iljanjem sporoÄila lahko samodejno sprejmete to povabilo.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>pred {0} dnevi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>pred {0} urami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>pred {0} minutami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Preklicano</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>Pred %d dnevi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>Pred %d ur(ami)</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>Pred %d minutami</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>pred enim dnevom</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>pred eno uro</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>ravnokar</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Ni uspelo</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Potrdi</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>PobriÅ¡i</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Poskusi znova</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Iskanje</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>NapaÄen ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Nisem mogel pridobiti...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>NapaÄna URI shema</translation> </message> diff --git a/translations/lrc_sq_AL.ts b/translations/lrc_sq_AL.ts index 8aed2c3e72adab91a032b29e66aae3f5049d82f2..487c4358c3354baac23dbd69a1ae1c4a201bf91a 100644 --- a/translations/lrc_sq_AL.ts +++ b/translations/lrc_sq_AL.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sq_AL" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sq_AL" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Unë</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Po lidhet</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Përfundoi</translation> </message> @@ -70,21 +70,28 @@ <translation>Komunikimi u vendos</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Ftesa u mor</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakti u shtua</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Thirrje për</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Thirrje ikse të humbura</translation> </message> @@ -106,8 +113,9 @@ <translation>Thirrje ardhëse të humbura</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Ftesa u pranua</translation> </message> @@ -118,279 +126,279 @@ <translation>parazgjedhje</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Po provohet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Po i bihet ziles</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Po Përcillet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Në Radhë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>Ecuri</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>E pranuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Zgjedhje të Shumta</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Lëvizur Përgjithmonë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Lëvizur Përkohësisht</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Përdor Ndërmjetës</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Shërbim Alternativ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Kërkesë e Gabuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>E paautorizuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Lypset Pagesë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>E ndaluar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>S’u Gjet</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metodë e Palejuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>E papranueshme</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Lypset Mirëfilltësim Ndërmjetësi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Mbarim Kohe për Kërkesën</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>U avullua</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Njësi Kërkese Shumë e Gjatë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI Kërkese Shumë i Gjatë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Lloj Media i Pambuluar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Skemë URI e Pambuluar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Zgjatim i Gabuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Zgjatim i Domosdoshëm</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Kohëmatës Sesioni Shumë i Vogël</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Interval Shumë i Shkurtër</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Përkohësisht Jo i Passhëm</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>S’ekziston TSX Thirrjeje</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>U pikas Qerthull</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Shumë Kërcime</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adresë e Paplotë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>E dykuptimtë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>I zënë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>Kërkesa u Përfundua</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Akt i Gabuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>Kërkesa u Përditësua</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>Kërkesë Pezull</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>E padeshifrueshme</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>Gabim i Brendshëm Shërbyesi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>E pasendërtuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Kanal i Gabuar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Shërbim i Pakapshëm</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Mbarim Kohe Shërbyesi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Version i Pambuluar</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mesazh Shumë i Gjatë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Dështim Parakushti</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Ngado i Zënë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Thirrje e Hedhur Poshtë</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>S’ekziston Gjëkundi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>E papranuar Gjëkundi</translation> </message> @@ -465,22 +473,52 @@ <translation>Shkruaje te {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>S’arrihet të vendoset kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>Po pritet për kontakt</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Shpërngulje ardhëse</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>Mbaroi koha duke pritur për kontakt</translation> </message> @@ -500,87 +538,77 @@ <translation>s’gjendet në kontaktet tuaja</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Shënim: mund ta pranoni automatikisht këtë ftesë duke dërguar një mesazh.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} ditë më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} orë më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} minuta më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>U anulua</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>Në punë e sipër</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d ditë më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d orë më parë </translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuta më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>një ditë më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>një orë më parë</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>mu tani</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Dështim</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Ripohoje</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>Mohoje</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Fshije</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Riprovoni</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Po kërkohet…</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>ID e pavlefshme</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>S’u gjet emër përdoruesi</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>S’u kërkua dot…</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Skemë URI i gabuar</translation> </message> diff --git a/translations/lrc_sr_RS.ts b/translations/lrc_sr_RS.ts index 1f03935f27b7543313deef058afd67669b8634b9..b7ad9b75a3c1950a30fe157807674a0fdecb7d2e 100644 --- a/translations/lrc_sr_RS.ts +++ b/translations/lrc_sr_RS.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr_RS" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr_RS" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Primljen poziv</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt dodat</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Poziva se</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>PropuÅ¡ten odlazeći poziv</translation> </message> @@ -106,8 +113,9 @@ <translation>PropuÅ¡ten dolazeći poziv</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>IzbriÅ¡i</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_sv.ts b/translations/lrc_sv.ts index 12bcb17a5adc0027bfd9ba3ba5c632fe0d7548e6..d87224625d88380d5bed8aa900c74a92288a068b 100644 --- a/translations/lrc_sv.ts +++ b/translations/lrc_sv.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Jag</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>Ansluter</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Slutförd</translation> </message> @@ -70,21 +70,28 @@ <translation>Kommunikation etablerad</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Inbjudan mottagen</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Kontakt tillagt</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>UtgÃ¥ende samtal</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Missat utgÃ¥ende samtal</translation> </message> @@ -106,8 +113,9 @@ <translation>Missat inkommande samtal</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Inbjudan accepterad</translation> </message> @@ -118,279 +126,279 @@ <translation>standard</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Försöker</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Ringer</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Köat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Accepterat</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Flera val</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Permanent flyttad</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>TIllfälligt flyttad</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Använd proxy</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternativ tjänst</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>Tidsgräns för begäran överskriden</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>Upptagen</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Notera att du kan acceptera denna inbjudan automatiskt, genom att skicka ett meddelande.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>Avbruten</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d dagar sedan</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d timmar sedan</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d minuter sedan</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>en dag sedan</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>en timma sedan</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>just nu</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Fel</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Bekräfta</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Ta bort</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Försök igen</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Söker...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Ogiltigt ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Felaktigt URI-schema</translation> </message> diff --git a/translations/lrc_tr.ts b/translations/lrc_tr.ts index 1660244d33f5a4b485b1a21cf4f5c04913455eee..6716805fe06996e075adde71985f0e88da87a451 100644 --- a/translations/lrc_tr.ts +++ b/translations/lrc_tr.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Ben</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>BaÄŸlanılıyor</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>Bitti</translation> </message> @@ -70,21 +70,28 @@ <translation>BaÄŸlantı saÄŸlandı</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Davetiye alındı</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>KiÅŸi eklendi</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Giden arama</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Yanıtsız giden arama</translation> </message> @@ -106,8 +113,9 @@ <translation>Yanıtsız gelen arama</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>Davetiye alındı</translation> </message> @@ -118,279 +126,279 @@ <translation>öntanımlı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>BoÅŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>Deneniyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Çalıyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>Yönlendiriliyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>Sırada</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>İlerleme</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>TAMAM</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>Kabul edildi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>Çoklu Seçimler</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>Kalıcı Olarak Taşındı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>Geçici Olarak Taşındı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>Vekil Kullan</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>Alternatif servis</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>Geçersiz istek</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>YetkilendirilmemiÅŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>Ödeme Gerekli</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>Yasak</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>Bulunamadı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>Metod Kabul Edilmiyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>Kabul Edilemez</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>Proxy Kimlik DoÄŸrulaması Gerekiyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>İstek Zaman Aşımına UÄŸradı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>GitmiÅŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>Girilen veri çok fazla</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>URI İsteÄŸi Çok Uzun</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>Desteklenmeyen Ortam Türü</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>Desteklenmeyen URI Düzeni</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>Hatalı Uzantı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>Uzantı Gerekli</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>Oturum Zamanlayıcısı Çok Küçük</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>Aralık Çok Kısa</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>Geçici olarak kullanım dışı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>TSX ÇaÄŸrısı Yok</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>Döngü Algılandı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>Çok Fazla Atlama</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>Adres Eksik</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>Belirsiz</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>MeÅŸgul</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>İstek Sonlandırıldı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>Kötü Etkinlik</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>İstek Güncellendi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>İstek Beklemede</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>Anlaşılamaz</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>İç Sunucu Hatası</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>Uygulanmadı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>Bozuk AÄŸ Geçidi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>Hizmet kullanılamıyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>Sunucu Zaman Aşımı</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>Sürüm Desteklenmiyor</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>Mesaj Çok Büyük</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>Ön KoÅŸul Hatası</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>Her Yerde MeÅŸgul</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>Arama reddedildi</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>Herhangi Bir Yerde Yok</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>Hiçbir Yerde Kabul Edilemez</translation> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>Gelen aktarım</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation>kiÅŸilerinizde yok</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Anımsatma: ileti göndererek bu davetiyeyi kendiliÄŸinden kabul edebilirsiniz.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} gün önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} saat önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} dakika önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>İptal edildi</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d gün önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d saat önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d dakika önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>bir gün önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>bir saat önce</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>Åžu an</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>BaÅŸarısız</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>Onayla</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Yeniden dene</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>Arıyor...</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>Geçersiz kimlik</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>Kullanıcı adı bulunamadı</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>Arama yapılamadı…</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>Hatalı URI ÅŸeması</translation> </message> diff --git a/translations/lrc_uk.ts b/translations/lrc_uk.ts index b62cfb9472c589d68895f2586f23bffebf635946..07ac2a775d7526155541caf7aa1f9e3512dd50f6 100644 --- a/translations/lrc_uk.ts +++ b/translations/lrc_uk.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>Я</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>З'єднаннÑ</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation>Зв’Ñзок вÑтановлено</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>Отримано запрошеннÑ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>Контакт додано</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>Вихідний виклик</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>Пропущений вихідний виклик</translation> </message> @@ -106,8 +113,9 @@ <translation>Пропущений вхідний виклик</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>Дзвінок</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñу</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>ЗайнÑтий</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>Зважте: ви можете автоматично прийнÑти це запрошеннÑ, направивши повідомленнÑ.</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d днів тому</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d годин тому</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d хвилин тому</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>один день тому</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>одну годину тому</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>щойно</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>Ðевдача</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>Видалити</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>Спробувати ще</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_zh.ts b/translations/lrc_zh.ts index 3b1941100b5ba317bb363aa7db56420204eebde1..94a795787aec6377a905c3998d7d439e501af061 100644 --- a/translations/lrc_zh.ts +++ b/translations/lrc_zh.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation type="unfinished"/> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation type="unfinished"/> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation type="unfinished"/> </message> @@ -70,21 +70,28 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation type="unfinished"/> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation type="unfinished"/> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation type="unfinished"/> </message> @@ -106,8 +113,9 @@ <translation type="unfinished"/> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation type="unfinished"/> </message> @@ -118,279 +126,279 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation type="unfinished"/> </message> @@ -465,22 +473,52 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> - <source>Unable to make contact</source> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> <translation type="unfinished"/> </message> <message> <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> + <source>Unable to make contact</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation type="unfinished"/> </message> @@ -500,87 +538,77 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>刪除</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation type="unfinished"/> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation type="unfinished"/> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation type="unfinished"/> </message> diff --git a/translations/lrc_zh_CN.ts b/translations/lrc_zh_CN.ts index dd0b27e519be5df0396eeb1166912acd96c4d0e6..552253be1d7253a620f20f90ee95596e846070e0 100644 --- a/translations/lrc_zh_CN.ts +++ b/translations/lrc_zh_CN.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>我</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>æ£åœ¨è¿žæŽ¥</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>完æˆ</translation> </message> @@ -70,21 +70,28 @@ <translation>通信已建立</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>已接å—邀请</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>å·²åŠ å…¥é€šè®¯å½•</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>去电</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>去电未接</translation> </message> @@ -106,8 +113,9 @@ <translation>未接æ¥ç”µ</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>已接å—邀请</translation> </message> @@ -118,279 +126,279 @@ <translation>默认</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>æ— æ•ˆ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>æ£åœ¨å°è¯•</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>æ£åœ¨å‘¼å«</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>æ£åœ¨è½¬æŽ¥</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>排队ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>进度</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>确定</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>已接å—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>多选</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>永久移动 </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>暂时移动 </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>使用代ç†</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>替代æœåŠ¡ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>ä¸å¯ç”¨çš„请求</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>未授æƒçš„</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>需è¦ä»˜æ¬¾</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>ç¦æ¢çš„</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>未找到</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>æ–¹å¼ä¸å…许</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>ä¸å¯æŽ¥å—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>需è¦ä»£ç†æœåŠ¡å™¨è®¤è¯</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>请求超时</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>已离开</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>请求的实体太大</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>请求的 URI 太长</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>䏿”¯æŒçš„媒体类型</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>ä¸å—支æŒçš„ URI 方案</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>错误的扩展å </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>éœ€è¦æ‰©å±•å</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>会è¯è®¡æ—¶å™¨å¤ªå° </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>é—´éš”å¤ªçŸ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>暂时ä¸å¯ç”¨ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>Call TSX ä¸å˜åœ¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>检测到环路</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>跳数太多</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>地å€ä¸å®Œæ•´ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>å«ç³Š</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>忙碌</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>è¯·æ±‚ç»ˆæ¢ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>ä¸è‰¯äº‹ä»¶ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>请求已更新</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>è¯·æ±‚å¾…å¤„ç† </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>æ— æ³•è§£ç </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>内部æœåŠ¡å™¨é”™è¯¯ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>未实现 </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>æ— æ•ˆç½‘å…³</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>æœåŠ¡ä¸å¯ç”¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>æœåŠ¡å™¨è¶…æ—¶</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>䏿”¯æŒçš„版本 </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>消æ¯å°ºå¯¸å¤ªå¤§</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>剿æ¡ä»¶å¤±è´¥</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>æœåС噍ç¹å¿™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>呼å«è¢«æ‹’</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>任何地方都ä¸å˜åœ¨ </translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>任何地方都ä¸å¯æŽ¥å—</translation> </message> @@ -465,22 +473,52 @@ <translation>写给 {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>æ— æ³•è”ç³»</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>æ£åœ¨ç‰å¾…è”系人</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>å…¥ç«™ä¼ é€</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>ç‰å¾…è”系人超时</translation> </message> @@ -500,87 +538,77 @@ <translation>䏿˜¯æ‚¨çš„è”系人</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>注:您å¯ä»¥é€šè¿‡å‘逿¶ˆæ¯è‡ªåŠ¨æŽ¥å—æ¤é‚€è¯·ã€‚</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} 天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} å°æ—¶å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} 分钟å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>已喿¶ˆ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>æ£åœ¨è¿›è¡Œ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%då°æ—¶å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d分钟å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>一天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>䏀尿—¶å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>刚æ‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>失败</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>确认</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>æ‹’ç»</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>åˆ é™¤</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>é‡è¯•</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>æ£åœ¨æœç´¢â€¦</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>éžæ³• ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>未找到用户å</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>æ— æ³•æŸ¥æ‰¾...</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>错误的 URI 方案 </translation> </message> diff --git a/translations/lrc_zh_TW.ts b/translations/lrc_zh_TW.ts index b5c410571428fa80ea84c5d1492a0a40b63e64d7..3e85904201fe8dd2d8d9e56e5e5ff148018a2b87 100644 --- a/translations/lrc_zh_TW.ts +++ b/translations/lrc_zh_TW.ts @@ -1,8 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" sourcelanguage="en" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" sourcelanguage="en" version="2.0"> <context> <name>QObject</name> <message> - <location filename="../src/qtwrapper/callmanager_wrap.h" line="328"/> + <location filename="../src/qtwrapper/callmanager_wrap.h" line="393"/> <source>Me</source> <translation>我</translation> </message> @@ -33,7 +33,7 @@ </message> <message> <location filename="../src/api/call.h" line="71"/> - <location filename="../src/chatview.cpp" line="63"/> + <location filename="../src/chatview.cpp" line="71"/> <source>Connecting</source> <translation>連接ä¸</translation> </message> @@ -50,7 +50,7 @@ <message> <location filename="../src/api/call.h" line="77"/> <location filename="../src/api/call.h" line="83"/> - <location filename="../src/chatview.cpp" line="70"/> + <location filename="../src/chatview.cpp" line="78"/> <source>Finished</source> <translation>å·²çµæŸ</translation> </message> @@ -70,21 +70,28 @@ <translation>已建立通訊</translation> </message> <message> + <location filename="../src/api/interaction.h" line="218"/> <location filename="../src/authority/storagehelper.cpp" line="130"/> - <location filename="../src/authority/storagehelper.cpp" line="898"/> + <location filename="../src/authority/storagehelper.cpp" line="918"/> <source>Invitation received</source> <translation>已收到邀請</translation> </message> <message> + <location filename="../src/api/interaction.h" line="222"/> + <source>Contact left conversation</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/api/interaction.h" line="216"/> <location filename="../src/authority/storagehelper.cpp" line="127"/> - <location filename="../src/authority/storagehelper.cpp" line="896"/> + <location filename="../src/authority/storagehelper.cpp" line="916"/> <source>Contact added</source> <translation>已新增è¯çµ¡äºº</translation> </message> <message> <location filename="../src/authority/storagehelper.cpp" line="104"/> <location filename="../src/authority/storagehelper.cpp" line="110"/> - <location filename="../src/authority/storagehelper.cpp" line="894"/> + <location filename="../src/authority/storagehelper.cpp" line="914"/> <source>Outgoing call</source> <translation>撥出電話</translation> </message> @@ -96,7 +103,7 @@ </message> <message> <location filename="../src/authority/storagehelper.cpp" line="112"/> - <location filename="../src/authority/storagehelper.cpp" line="892"/> + <location filename="../src/authority/storagehelper.cpp" line="912"/> <source>Missed outgoing call</source> <translation>未接去電</translation> </message> @@ -106,8 +113,9 @@ <translation>未接來電</translation> </message> <message> + <location filename="../src/api/interaction.h" line="220"/> <location filename="../src/authority/storagehelper.cpp" line="132"/> - <location filename="../src/authority/storagehelper.cpp" line="900"/> + <location filename="../src/authority/storagehelper.cpp" line="920"/> <source>Invitation accepted</source> <translation>已接å—邀請</translation> </message> @@ -118,279 +126,279 @@ <translation>é è¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="53"/> + <location filename="../src/newcallmodel.cpp" line="55"/> <source>Null</source> <translation>Null</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="54"/> + <location filename="../src/newcallmodel.cpp" line="56"/> <source>Trying</source> <translation>æ£åœ¨å˜—試</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="55"/> + <location filename="../src/newcallmodel.cpp" line="57"/> <source>Ringing</source> <translation>響鈴ä¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="56"/> + <location filename="../src/newcallmodel.cpp" line="58"/> <source>Being Forwarded</source> <translation>已轉寄</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="57"/> + <location filename="../src/newcallmodel.cpp" line="59"/> <source>Queued</source> <translation>已進入佇列</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="58"/> + <location filename="../src/newcallmodel.cpp" line="60"/> <source>Progress</source> <translation>排程</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="59"/> + <location filename="../src/newcallmodel.cpp" line="61"/> <source>OK</source> <translation>確定</translation> </message> <message> - <location filename="../src/chatview.cpp" line="64"/> - <location filename="../src/newcallmodel.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="72"/> + <location filename="../src/newcallmodel.cpp" line="62"/> <source>Accepted</source> <translation>已接å—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="61"/> + <location filename="../src/newcallmodel.cpp" line="63"/> <source>Multiple Choices</source> <translation>多é¸</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="62"/> + <location filename="../src/newcallmodel.cpp" line="64"/> <source>Moved Permanently</source> <translation>永久移動</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="63"/> + <location filename="../src/newcallmodel.cpp" line="65"/> <source>Moved Temporarily</source> <translation>暫時移動</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="64"/> + <location filename="../src/newcallmodel.cpp" line="66"/> <source>Use Proxy</source> <translation>使用代ç†ä¼ºæœå™¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="65"/> + <location filename="../src/newcallmodel.cpp" line="67"/> <source>Alternative Service</source> <translation>替代æœå‹™</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="66"/> + <location filename="../src/newcallmodel.cpp" line="68"/> <source>Bad Request</source> <translation>ä¸è‰¯çš„請求</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="67"/> + <location filename="../src/newcallmodel.cpp" line="69"/> <source>Unauthorized</source> <translation>未授權</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="68"/> + <location filename="../src/newcallmodel.cpp" line="70"/> <source>Payment Required</source> <translation>需è¦ä»˜æ¬¾</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="69"/> + <location filename="../src/newcallmodel.cpp" line="71"/> <source>Forbidden</source> <translation>è¢«ç¦æ¢</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="70"/> + <location filename="../src/newcallmodel.cpp" line="72"/> <source>Not Found</source> <translation>找ä¸åˆ°</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="71"/> + <location filename="../src/newcallmodel.cpp" line="73"/> <source>Method Not Allowed</source> <translation>ä¸å…許的方法</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="72"/> - <location filename="../src/newcallmodel.cpp" line="92"/> + <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="94"/> <source>Not Acceptable</source> <translation>無法接å—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="73"/> + <location filename="../src/newcallmodel.cpp" line="75"/> <source>Proxy Authentication Required</source> <translation>需è¦ä»£ç†ä¼ºæœå™¨é©—è‰</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="74"/> + <location filename="../src/newcallmodel.cpp" line="76"/> <source>Request Timeout</source> <translation>請求逾時</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="75"/> + <location filename="../src/newcallmodel.cpp" line="77"/> <source>Gone</source> <translation>消失</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="76"/> + <location filename="../src/newcallmodel.cpp" line="78"/> <source>Request Entity Too Large</source> <translation>請求實體太大</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="77"/> + <location filename="../src/newcallmodel.cpp" line="79"/> <source>Request URI Too Long</source> <translation>請求 URI 太長</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="78"/> + <location filename="../src/newcallmodel.cpp" line="80"/> <source>Unsupported Media Type</source> <translation>䏿”¯æ´çš„媒體類型</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="79"/> + <location filename="../src/newcallmodel.cpp" line="81"/> <source>Unsupported URI Scheme</source> <translation>䏿”¯æ´çš„ URI çµæ§‹</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="80"/> + <location filename="../src/newcallmodel.cpp" line="82"/> <source>Bad Extension</source> <translation>ä¸è‰¯çš„副檔å</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="81"/> + <location filename="../src/newcallmodel.cpp" line="83"/> <source>Extension Required</source> <translation>需è¦å‰¯æª”å</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="82"/> + <location filename="../src/newcallmodel.cpp" line="84"/> <source>Session Timer Too Small</source> <translation>工作階段計時器太å°äº†</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="83"/> + <location filename="../src/newcallmodel.cpp" line="85"/> <source>Interval Too Brief</source> <translation>間隔太çŸ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="84"/> + <location filename="../src/newcallmodel.cpp" line="86"/> <source>Temporarily Unavailable</source> <translation>暫時ä¸å¯ç”¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="85"/> + <location filename="../src/newcallmodel.cpp" line="87"/> <source>Call TSX Does Not Exist</source> <translation>å‘¼å« TSX ä¸å˜åœ¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="86"/> + <location filename="../src/newcallmodel.cpp" line="88"/> <source>Loop Detected</source> <translation>嵿¸¬åˆ°è¿´åœˆ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="87"/> + <location filename="../src/newcallmodel.cpp" line="89"/> <source>Too Many Hops</source> <translation>太多跳èº</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="88"/> + <location filename="../src/newcallmodel.cpp" line="90"/> <source>Address Incomplete</source> <translation>地å€ä¸å®Œæ•´</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="89"/> + <location filename="../src/newcallmodel.cpp" line="91"/> <source>Ambiguous</source> <translation>曖昧</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="90"/> + <location filename="../src/newcallmodel.cpp" line="92"/> <source>Busy</source> <translation>忙碌</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="91"/> + <location filename="../src/newcallmodel.cpp" line="93"/> <source>Request Terminated</source> <translation>請求已終çµ</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="93"/> + <location filename="../src/newcallmodel.cpp" line="95"/> <source>Bad Event</source> <translation>ä¸è‰¯çš„æ´»å‹•</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="94"/> + <location filename="../src/newcallmodel.cpp" line="96"/> <source>Request Updated</source> <translation>請求已更新</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="95"/> + <location filename="../src/newcallmodel.cpp" line="97"/> <source>Request Pending</source> <translation>請求擱置</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="96"/> + <location filename="../src/newcallmodel.cpp" line="98"/> <source>Undecipherable</source> <translation>無法解密</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="97"/> + <location filename="../src/newcallmodel.cpp" line="99"/> <source>Internal Server Error</source> <translation>內部伺æœå™¨éŒ¯èª¤</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="98"/> + <location filename="../src/newcallmodel.cpp" line="100"/> <source>Not Implemented</source> <translation>未實作</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="99"/> + <location filename="../src/newcallmodel.cpp" line="101"/> <source>Bad Gateway</source> <translation>ä¸è‰¯çš„é–˜é“</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="100"/> + <location filename="../src/newcallmodel.cpp" line="102"/> <source>Service Unavailable</source> <translation>æœå‹™ä¸å¯ç”¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="101"/> + <location filename="../src/newcallmodel.cpp" line="103"/> <source>Server Timeout</source> <translation>伺æœå™¨é€¾æ™‚</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="102"/> + <location filename="../src/newcallmodel.cpp" line="104"/> <source>Version Not Supported</source> <translation>ç‰ˆæœ¬ä¸æ”¯æ´</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="103"/> + <location filename="../src/newcallmodel.cpp" line="105"/> <source>Message Too Large</source> <translation>訊æ¯å¤ªå¤§</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="104"/> + <location filename="../src/newcallmodel.cpp" line="106"/> <source>Precondition Failure</source> <translation>剿æ¢ä»¶å¤±æ•—</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="105"/> + <location filename="../src/newcallmodel.cpp" line="107"/> <source>Busy Everywhere</source> <translation>到處都忙碌</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="106"/> + <location filename="../src/newcallmodel.cpp" line="108"/> <source>Call Refused</source> <translation>通話被拒絕</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="107"/> + <location filename="../src/newcallmodel.cpp" line="109"/> <source>Does Not Exist Anywhere</source> <translation>到處都ä¸å˜åœ¨</translation> </message> <message> - <location filename="../src/newcallmodel.cpp" line="108"/> + <location filename="../src/newcallmodel.cpp" line="110"/> <source>Not Acceptable Anywhere</source> <translation>åˆ°è™•éƒ½ä¸æŽ¥å—</translation> </message> @@ -465,22 +473,52 @@ <translation>寫入到 {0}</translation> </message> <message> - <location filename="../src/chatview.cpp" line="62"/> + <location filename="../src/chatview.cpp" line="49"/> + <source>has sent you a conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="51"/> + <source>Hello, do you want to join the conversation?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="53"/> + <source>You have accepted the conversation request.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="55"/> + <source>We are waiting for another device to synchronize the conversation.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="66"/> + <source>Accept</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="67"/> + <source>Refuse</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/chatview.cpp" line="70"/> <source>Unable to make contact</source> <translation>ç„¡æ³•åŠ ç‚ºè¯çµ¡äºº</translation> </message> <message> - <location filename="../src/chatview.cpp" line="67"/> + <location filename="../src/chatview.cpp" line="75"/> <source>Waiting for contact</source> <translation>ç‰å¾…è¯çµ¡äºº</translation> </message> <message> - <location filename="../src/chatview.cpp" line="68"/> + <location filename="../src/chatview.cpp" line="76"/> <source>Incoming transfer</source> <translation>來電轉發</translation> </message> <message> - <location filename="../src/chatview.cpp" line="69"/> + <location filename="../src/chatview.cpp" line="77"/> <source>Timed out waiting for contact</source> <translation>ç‰å¾…è¯çµ¡äººé€¾æ™‚</translation> </message> @@ -500,87 +538,77 @@ <translation>ä¸åœ¨æ‚¨çš„通訊錄ä¸</translation> </message> <message> - <location filename="../src/chatview.cpp" line="49"/> + <location filename="../src/chatview.cpp" line="57"/> <source>Note: you can automatically accept this invitation by sending a message.</source> <translation>注æ„:您å¯ä»¥é€éŽå‚³é€è¨Šæ¯ä¾†è‡ªå‹•æŽ¥å—æ¤é‚€è«‹ã€‚</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>{0} days ago</source> <translation>{0} 天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>{0} hours ago</source> <translation>{0} å°æ™‚å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>{0} minutes ago</source> <translation>{0} 分é˜å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="65"/> + <location filename="../src/chatview.cpp" line="73"/> <source>Canceled</source> <translation>已喿¶ˆ</translation> </message> <message> - <location filename="../src/chatview.cpp" line="66"/> + <location filename="../src/chatview.cpp" line="74"/> <source>Ongoing</source> <translation>進行ä¸</translation> </message> <message> - <location filename="../src/chatview.cpp" line="50"/> + <location filename="../src/chatview.cpp" line="58"/> <source>%d days ago</source> <translation>%d 天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="51"/> + <location filename="../src/chatview.cpp" line="59"/> <source>%d hours ago</source> <translation>%d å°æ™‚å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="53"/> + <location filename="../src/chatview.cpp" line="61"/> <source>%d minutes ago</source> <translation>%d 分é˜å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="54"/> + <location filename="../src/chatview.cpp" line="62"/> <source>one day ago</source> <translation>1 天å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="55"/> + <location filename="../src/chatview.cpp" line="63"/> <source>one hour ago</source> <translation>1 å°æ™‚å‰</translation> </message> <message> - <location filename="../src/chatview.cpp" line="56"/> + <location filename="../src/chatview.cpp" line="64"/> <source>just now</source> <translation>ç¾åœ¨</translation> </message> <message> - <location filename="../src/chatview.cpp" line="57"/> + <location filename="../src/chatview.cpp" line="65"/> <source>Failure</source> <translation>失敗</translation> </message> <message> - <location filename="../src/chatview.cpp" line="58"/> - <source>Confirm</source> - <translation>確èª</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="59"/> - <source>Deny</source> - <translation>拒絕</translation> - </message> - <message> - <location filename="../src/chatview.cpp" line="60"/> + <location filename="../src/chatview.cpp" line="68"/> <source>Delete</source> <translation>刪除</translation> </message> <message> - <location filename="../src/chatview.cpp" line="61"/> + <location filename="../src/chatview.cpp" line="69"/> <source>Retry</source> <translation>é‡è©¦</translation> </message> @@ -588,22 +616,22 @@ <context> <name>lrc::ContactModelPimpl</name> <message> - <location filename="../src/contactmodel.cpp" line="459"/> + <location filename="../src/contactmodel.cpp" line="438"/> <source>Searching…</source> <translation>æ£åœ¨æœå°‹â€¦â€¦</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="960"/> + <location filename="../src/contactmodel.cpp" line="952"/> <source>Invalid ID</source> <translation>無效 ID</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="963"/> + <location filename="../src/contactmodel.cpp" line="955"/> <source>Username not found</source> <translation>找ä¸åˆ°ä½¿ç”¨è€…å稱</translation> </message> <message> - <location filename="../src/contactmodel.cpp" line="966"/> + <location filename="../src/contactmodel.cpp" line="958"/> <source>Couldn't lookup…</source> <translation>無法查詢……</translation> </message> @@ -611,7 +639,7 @@ <context> <name>lrc::api::ContactModel</name> <message> - <location filename="../src/contactmodel.cpp" line="420"/> + <location filename="../src/contactmodel.cpp" line="399"/> <source>Bad URI scheme</source> <translation>錯誤的 URI çµæ§‹</translation> </message>