diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts index a49e0615ed3eae00dde329b3a92d0c544f2a0fac..43644d63d595fc27466f0449f67b602a2b2e35b8 100644 --- a/translations/ring_client_windows.ts +++ b/translations/ring_client_windows.ts @@ -36,12 +36,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"></translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"></translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"></translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"></translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"></translation> </message> diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts index 17c6a85cbe5509a24b524786c71edccfcae403b3..8f54a5037348e848592636785ec8041d44b113e1 100644 --- a/translations/ring_client_windows_ar.ts +++ b/translations/ring_client_windows_ar.ts @@ -35,12 +35,12 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation> <translation>أحدثه:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>مصمم العمل الفني:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>يستند على مشروع SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>أضف إلى الاتصال</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>لا يوجد حساب Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>تقاسم كل الشاشة</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>تقاسم منطقة من الشاشة</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>تقاسم الوثيقة</translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>اختار اسم المستخدم</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>اختر اسم مستخدمك</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>كلمة السر</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>إحداث حسابك Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>التالي</translation> </message> diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts index 5aab049a6d1ae916807fc718d309c82dba7070d9..51b14ad68af45e0968d8fc2db725991c5e3d9029 100644 --- a/translations/ring_client_windows_bg.ts +++ b/translations/ring_client_windows_bg.ts @@ -35,12 +35,12 @@ Ring е сигурен и разпределен софтуер за общув <translation>Създаден от:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>С изображения от:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Основан на проекта „SFLPhone“</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>Добавяне към контакт</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Свържете се с мен в Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Моят ид. за Ring е:</translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>НЕ Е ОТКРИТ АКАУНТ ЗА RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Споделяне на целия екран</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Споделяне на област от екрана</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Споделяне на файл</translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Свързване на това устройство с акаунт</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Изберете потребителското си име:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Изберете потребителско име</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Парола</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Потвърдете паролата</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Създаване на Вашия акаунт в Ring…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Предишен</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Напред</translation> </message> diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts index 050a7c6ec86ad7ea7f890d1495a4d29c1b519e25..aa1fde6878102450662707b055874c39a46d0ab8 100644 --- a/translations/ring_client_windows_ca.ts +++ b/translations/ring_client_windows_ca.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copieu i compartiu amb les vostres amistats!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copieu i compartiu amb les vostres amistats!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copieu i compartiu amb les vostres amistats!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Compartir pantalla</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Compartir arxiu</translation> </message> @@ -1225,105 +1225,110 @@ Copieu i compartiu amb les vostres amistats!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Contrasenya</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generant el vostre compte de Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Següent</translation> </message> diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts index db5da1f7c31a9301c19d0f5dd858904e9c8728e7..04c575b5ee5a13f985a09e31322e1855fafc44df 100644 --- a/translations/ring_client_windows_cs_CZ.ts +++ b/translations/ring_client_windows_cs_CZ.ts @@ -35,12 +35,12 @@ Ring je bezpečný a distribuovaný komunikační program.</translation> <translation>Vytvořili:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Grafika:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Postaveno na projektu SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Kopírujte a sdílejte jej s přáteli!</translation> <translation>Přidat do kontaktů</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Spojte se se mnou přes Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mé Ring ID je :</translation> </message> @@ -627,13 +627,13 @@ Kopírujte a sdílejte jej s přáteli!</translation> <translation>ŽÁDNÝ ÚČET RING NENALEZEN</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopírujte a sdílejte jej s přáteli!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Sdílet celou obrazovku</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Sdílet část obrazovky</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Sdílet soubor</translation> </message> @@ -1226,105 +1226,110 @@ Kopírujte a sdílejte jej s přáteli!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Připojit toto zařízení k účtu</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Vytvořit vlastní profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Vytvořit vlastní účet</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Zvolte si vaše uživatelské jméno:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Zvolte si uživatelské jméno</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Zaregistrovat jméno veřejně (experimentální)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Zadejte PIN</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Heslo</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Potvrdit heslo</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Vytváří se váš účet Ring…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Předchozí</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Další</translation> </message> diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts index 05d16daca46de961e9c1886dc5a920b190c2c7e8..2b6641d9679e947aea3034fd07c4cc86c6715cf0 100644 --- a/translations/ring_client_windows_da_DK.ts +++ b/translations/ring_client_windows_da_DK.ts @@ -35,12 +35,12 @@ Ring er software til sikker og distribueret kommunikation.</translation> <translation>Skabt af:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Grafik af:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Baseret på SFLPhone-projektet</translation> </message> @@ -567,12 +567,12 @@ Kopier og del den med dine venner!</translation> <translation>Føj til kontakt</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Kontakt mig på Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Min Ring-ID er:</translation> </message> @@ -627,13 +627,13 @@ Kopier og del den med dine venner!</translation> <translation>INGEN RING KONTO FUNDET</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopier og del den med dine venner!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Del hele skærmen</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Del skærmområde</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Del fil</translation> </message> @@ -1226,105 +1226,110 @@ Kopier og del den med dine venner!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Tilknyt denne enhed til en konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Opret din profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Opret din konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Vælg dit brugernavn:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Vælg dit brugernavn</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Kodeord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Bekræft kodeord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Genererer din Ring-konto...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Tilbage</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Næste</translation> </message> diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts index 0f04d3275d493f96699084c01f9dacf27d34fc14..04863c23d2d39a95fdac0a962eeb15f2f0599d18 100644 --- a/translations/ring_client_windows_de.ts +++ b/translations/ring_client_windows_de.ts @@ -35,12 +35,12 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation> <translation>Erstellt von:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Visuelle Gestaltung:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Basierend auf dem SFLPhone-Projekt</translation> </message> @@ -567,12 +567,12 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation> <translation>Kontakt hinzufügen</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Kontaktieren Sie mich über Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Meine RingId ist:</translation> </message> @@ -627,13 +627,13 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation> <translation>KEIN RING KONTO GEFUNDEN</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Gesamten Bildschirm teilen</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Bildschirmbereich teilen</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Datei teilen</translation> </message> @@ -1226,105 +1226,110 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Dieses Gerät mit einem Konto verknüpfen</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Erstellen Sie Ihr Profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Legen Sie ein Benutzerkonto an</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Nutzernamen wählen:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Nutzername wählen</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Geben Sie Ihre PIN ein</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Passwort bestätigen</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Ihr Ring-Konto wird generiert...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Vorherige</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Weiter</translation> </message> diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts index 0c03ef7c483b0b0d2363c184f9564bc664d58029..cfab77f973cd487d900bc3af40507e4967f132e3 100644 --- a/translations/ring_client_windows_de_DE.ts +++ b/translations/ring_client_windows_de_DE.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Konto bestätigen</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Weiter</translation> </message> diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts index 3133ecb1c2e1d45fd6c1e64ae7848dbe55c5a429..cb9262a8697dc627b46708c67767167f6a68a3a3 100644 --- a/translations/ring_client_windows_el.ts +++ b/translations/ring_client_windows_el.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Μοίρασμα περιοχής της οθόνης</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Μοίρασμα αρχείου</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Συνθηματικό</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Προηγούμενο</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Επόμενο</translation> </message> diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts index e1169b737e09df0aad5e237293f5c60d7e7b64e5..a22ed4c7f693732737bad4848fcf9fc4ecc3c833 100644 --- a/translations/ring_client_windows_en_GB.ts +++ b/translations/ring_client_windows_en_GB.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts index e56fa44dc4da0175beadb488b964afe9f767798b..bc8e17f26bbc0b1c36aa97bd2a40e383b94976c3 100644 --- a/translations/ring_client_windows_eo.ts +++ b/translations/ring_client_windows_eo.ts @@ -35,12 +35,12 @@ Ring estas sekura kaj disa komunikprogramo.</translation> <translation>Kreita de:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Grafiko de:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Surbaze de la SFLPhone projekto</translation> </message> @@ -567,12 +567,12 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation> <translation>Aldoni al kontakto</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Kontaktu min per Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mia RingID estas:</translation> </message> @@ -627,13 +627,13 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation> <translation>NENIU RING KONTO TROVITA</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Kunhavigi tutan ekranon</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Kunhavigi areon de ekrano</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Kunhavigi dosieron</translation> </message> @@ -1226,105 +1226,110 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Elektu vian uzantnomon:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Elektu vian uzantnomon</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Pasvorto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Konfirmu pasvorton</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generanta vian Ring-an konton...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Antaŭa</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Sekva</translation> </message> diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts index 873ff01488006bf4e24abc9cdf38fad05fa6b23e..727e50d97211a70552f7aa7d8fb78a37d1f5d508 100644 --- a/translations/ring_client_windows_es.ts +++ b/translations/ring_client_windows_es.ts @@ -35,12 +35,12 @@ Ring es un programa de comunicación distribuido y seguro.</translation> <translation>Creado por:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Diseñado por:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Basado en el proyecto SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>Agregar a Contactos</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Contactame por Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mi RingID es:</translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>No existe cuenta de RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Compartir toda la pantalla</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Compartir la ventana</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Compartir archivo</translation> </message> @@ -1226,118 +1226,110 @@ Copy and share it with your friends!</source> <translation>Error de red.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Crear cuenta de Ring</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Conectar este dispositivo a una cuenta</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Cómo agregar un dispositivo</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> - <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Para vincular este dispositivo a otra cuenta, primero </span><span style=" font-size:12pt; font-weight:600;"> -necesitas obtener un código PIN</span><span style=" font-size:12pt;">. Para generar el código PIN: </span></p><ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ir a <span style=" font-weight:600;">Configuración de administración de cuentas</span>de un dispositivo anterior</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Elegir la <span style=" font-weight:600;"> cuenta de Ring</span> que quiera usar</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ir a <span style=" font-weight:600;"> pestaña de </span> dispositivos</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Seleccionar <span style=" font-weight:600;">Añadir dispositivo</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Usted recibirá el PIN necesario para completar este formulario. El PIN sólo es válido para </span><span style=" font-size:12pt; font-weight:600;">10 minutos</span><span style=" font-size:12pt;">.</span></p></body></html> - - - -Para generar el código PIN: 961011Go a la configuración 12Account management12 de un dispositivo anterior1113Choose la cuenta 14Ring14 que desea usar1315Go a la 16Devices16 tab1517Seleccionar 18Agregar un dispositivo1817101920Va obtener el PIN necesario para completar este formulario. El PIN sólo es válido para 202110 minutos2122.221951 242</translation> - </message> - <message> - <location filename="../wizarddialog.ui" line="159"/> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Crea tu perfil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>Introduzca su nombre completo:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Crea tu cuenta</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Elige tu nombre de usuario:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Elije un nombre de usuario para ti</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Buscando...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation>Registre su nombre de usuario en Ring. Esto reservará el nombre de usuario para que solo tú puedas usarlo. Sus amigos podrán llamarle con su nombre de usuario en lugar de usar su RingID.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registrar un nombre público (experimental)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Escribe tu PIN</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Contraseña</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Confirmar contraseña</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generando tu cuenta Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Anterior</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Siguiente</translation> </message> diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts index 6f9422f516489277b5849a8cb816767fa647dda9..1d9d553c58f5828388dcdd61389ff3039d765ad0 100644 --- a/translations/ring_client_windows_et_EE.ts +++ b/translations/ring_client_windows_et_EE.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts index 01669883c6c1d0326d3a313cc679ae10f964ee47..ea2ae60032d425bde21e10ddbf6b985a1f83a999 100644 --- a/translations/ring_client_windows_fa_IR.ts +++ b/translations/ring_client_windows_fa_IR.ts @@ -35,12 +35,12 @@ Ring is a secured and distributed communication software.</source> <translation>ساختهشده توسط:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>برمبنای پروژه SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>همرسانی پرونده</translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>پیوند این افزاره به یک حساب</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>نمایه خود را بسازید</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>حساب کاربری خود را بسازید</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>ثبت نام کاربری عمومی (آزمایشی)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>گذرواژه</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>تأیید گذرواژه</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>پیشین</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>بعدی</translation> </message> diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts index 69e4b777ab4a373caec46bd603e76ce4dc3e677c..e18e6324842b8828eec8bb5c6c0d31ba3d1c6500 100644 --- a/translations/ring_client_windows_fi.ts +++ b/translations/ring_client_windows_fi.ts @@ -35,12 +35,12 @@ Ring on turvallinen ja hajautettu keskustelusovellus.</translation> <translation>Luonut:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Grafiikka:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Pohjautuu SFLPhone projektiin</translation> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation>Lisää yhteystietoon</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Ota yhteyttä minuun Ringillä</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Ring tunnisteeni on:</translation> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Jaa näyttö</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Jaa osa näytöstä</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Jaa tiedosto</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Valitse käyttäjänimesi:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Valitse käyttäjänimesi</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Salasana</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Varmista salasana</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Seuraava</translation> </message> diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts index 65c804827831c7ca2727705b4d6e05da2beaa27a..1e680727dfa81f8abac91b42677813dff106c50a 100644 --- a/translations/ring_client_windows_fr.ts +++ b/translations/ring_client_windows_fr.ts @@ -35,12 +35,12 @@ Ring est un logiciel de communication sécurisé et distribué.</translation> <translation>Créé par :</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Graphismes par :</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Basé sur le projet SFLphone</translation> </message> @@ -567,12 +567,12 @@ Copiez-le et partagez-le avec vos amis !</translation> <translation>Ajouter aux contacts</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Contactez-moi sur Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mon identifiant Ring est : </translation> </message> @@ -627,13 +627,13 @@ Copiez-le et partagez-le avec vos amis !</translation> <translation>AUCUN COMPTE RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copiez-le et partagez-le avec vos amis !</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Partager tout l'écran</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Partager une partie de l'écran</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Partager un fichier</translation> </message> @@ -1226,107 +1226,112 @@ Copiez-le et partagez-le avec vos amis !</translation> <translation>Erreur de réseau</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Créer un compte Ring</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Lier cet appareil à un compte</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Comment ajouter un appareil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Créer votre profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>Entrer votre nom complet :</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Créer votre compte</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Choisissez votre nom d'utilisateur :</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Choisissez un nom d'utilisateur</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Recherche de disponibilité...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation>Enregistre votre nom d'utilisateur Ring. Ceci réserve ce nom de façon définitive et uniquement pour votre usage. Vos amis pourront vous appeler avec ce nom plutôt que votre RingID.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Enregistrer un nom d'utilisateur public (expérimental)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Entrer votre code pin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Mot de passe</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Confirmer le mot de passe</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Génération de votre compte Ring…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Précédent</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Suivant</translation> </message> diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts index 325287e5c0f02b80124c3970ebbbc188d53bec67..62d5b67dd5d19d05e42ce5dc398ac0bd5fc51067 100644 --- a/translations/ring_client_windows_fr_CA.ts +++ b/translations/ring_client_windows_fr_CA.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation>Créé par:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Basé sur le projet SFLPhone</translation> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation>Ajouter un contact</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Contactez-moi sur Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mon identifiant Ring est:</translation> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation>AUCUN COMPTE RING N'A ÉTÉ TROUVÉ</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Partager la totalité de l'écran</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Partager une partie de l'écran</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Partager le fichier</translation> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Associer cet appareil à un compte</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Créer votre profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Choisir votre nom d'utilisateur</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Enregistrer un nom d'utilisateur public (expérimental)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Mot de passe</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Suivant</translation> </message> diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts index d37fa5f7d1e68006b334f061167e81b379765141..7d352b349f0d8f8cad25c53b66bc56e0f92f7584 100644 --- a/translations/ring_client_windows_fr_FR.ts +++ b/translations/ring_client_windows_fr_FR.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>mot de passe</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Suivant</translation> </message> diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts index 607bb802e116f3504fb238e4a78169192a9bd03b..5bafd9afb04651f475a616386a2b585990639aaa 100644 --- a/translations/ring_client_windows_he.ts +++ b/translations/ring_client_windows_he.ts @@ -35,12 +35,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>מבוסס על הפרויקט SFLPhone</translation> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation>הוסף לאיש קשר</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>שתף אזור מסך</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>שתף קובץ</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>סיסמה</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>כעת מפיק חשבון Ring שלך...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>קדימה</translation> </message> diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts index f3a779163ef744b7be53d167240a4b56397854e4..b03b190fb648cd388936e832f55e7ee1ac7b2114 100644 --- a/translations/ring_client_windows_hi_IN.ts +++ b/translations/ring_client_windows_hi_IN.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts index bd56f4e0be1efc4b93fa295bacc9f4a727a7b140..b5c36e4d30e54f6aca55b88487292dec88ba7f15 100644 --- a/translations/ring_client_windows_hr.ts +++ b/translations/ring_client_windows_hr.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation>Napravio:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Bazirano na SFLPhone projektu</translation> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation>Dodaj u kontakt</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation>NIJEDAN RING RAČUN NIJE PRONAĐEN</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Dijelite područje zaslona</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Dijeli datoteku</translation> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Napravite vaš profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Napravite vaš račun</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Izaberite vaše korisničko ime:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Izaberite vaše korisničko ime</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Lozinka</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Potvrdi lozinku</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Slijedeće</translation> </message> diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts index dbd73199363f244d983e33669af62805fce4d970..5a37d65dd78e0857632deb04d9e49c809b4202ec 100644 --- a/translations/ring_client_windows_hu.ts +++ b/translations/ring_client_windows_hu.ts @@ -35,12 +35,12 @@ A Ring egy biztonságos és osztott kommunikációs szoftver</translation> <translation>Szerző:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Művészi elemek készítője:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Az SFLPhone projekt alapjain</translation> </message> @@ -567,12 +567,12 @@ Másolja ki és ossza meg a barátaival!</translation> <translation>Hozzáadás a partnerek listájához</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Az elérhetőségem a Ringen</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>A Ringazonosítóm:</translation> </message> @@ -627,13 +627,13 @@ Másolja ki és ossza meg a barátaival!</translation> <translation>RINGFIÓK NEM TALÁLHATÓ</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Másolja ki és ossza meg a barátaival!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Az egész képernyő megosztása</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Képernyő részének megosztása</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Fájl megosztása</translation> </message> @@ -1226,105 +1226,110 @@ Másolja ki és ossza meg a barátaival!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Válasszon egy felhasználónevet:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Jelszó</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>A Ringfiókja létrehozása…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Vissza</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Következő</translation> </message> diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts index 33754d6985e620e701e8fda0f5c22ac1ab4f55b2..f093f82b52d16f4b4bb8ecf2e78e29b70dabed7a 100644 --- a/translations/ring_client_windows_id.ts +++ b/translations/ring_client_windows_id.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Selanjutnya</translation> </message> diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts index ae1ae8f00eda07270b798c3ca1040952232f6314..7a16c0ebbf91a08377cb94d47f5071b521174d46 100644 --- a/translations/ring_client_windows_it.ts +++ b/translations/ring_client_windows_it.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Da copiare e condividere con gli amici!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Da copiare e condividere con gli amici!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Da copiare e condividere con gli amici!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Condividere una porzione dello schermo</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Condividere file</translation> </message> @@ -1225,105 +1225,110 @@ Da copiare e condividere con gli amici!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Confermare password</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generazione del account Ring in corso…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Seguente</translation> </message> diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts index 98debe011a74f101d7314fa1bc2aa8f4817bca66..d59e9073571a8b443466839b97166275917273a8 100644 --- a/translations/ring_client_windows_it_IT.ts +++ b/translations/ring_client_windows_it_IT.ts @@ -35,12 +35,12 @@ Ring è un software per comunicazioni sicure e distribuite.</translation> <translation>Creato da:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Tema di:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Basato sul progetto SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copialo e condividilo con i tuoi amici!</translation> <translation>Aggiungi ai contatti</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Contattami su RIng</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Il mio Ring ID è:</translation> </message> @@ -627,13 +627,13 @@ Copialo e condividilo con i tuoi amici!</translation> <translation>NESSUN ACCOUNT RING TROVATO</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copialo e condividilo con i tuoi amici!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Condividi l'intero schermo</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Condividi l'area dello schermo</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Condividi file</translation> </message> @@ -1226,105 +1226,110 @@ Copialo e condividilo con i tuoi amici!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Collega questo dispositivo ad un account</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Crea il tuo profilo</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Crea il tuo account</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Scegli il tuo Username</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registra un nome utente pubblico (sperimentale)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Conferma password</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generazione del tuo account Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Precedente</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Prossimo</translation> </message> diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts index 45cb83520948824f065aa4807dc31ce8e53c3fad..a3da5bb7c27f5f866623115457e4ac24de8c4490 100644 --- a/translations/ring_client_windows_ja.ts +++ b/translations/ring_client_windows_ja.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>このデバイスをアカウントへリンク</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>プロフィールを作成</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>公開ユーザー名を登録 (実験的)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>パスワード</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>パスワードの再入力</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>次へ</translation> </message> diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts index 847839bbf4f0846379e201ac0211f153fcb22e71..53d6edb8d0d2bd6b6345f2b05d83230e75220ab4 100644 --- a/translations/ring_client_windows_lt.ts +++ b/translations/ring_client_windows_lt.ts @@ -15,7 +15,7 @@ <message utf8="true"> <location filename="../aboutdialog.ui" line="541"/> <source>Liberté, Égalité, Fraternité - Version 1.0</source> - <translation type="unfinished"/> + <translation>Liberté, Égalité, Fraternité - Versija 1.0</translation> </message> <message> <location filename="../aboutdialog.ui" line="557"/> @@ -35,12 +35,12 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation> <translation>Sukūrė:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Apipavidalino:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Pagrįsta SFLPhone projektu</translation> </message> @@ -567,12 +567,12 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation> <translation>Pridėti prie kontaktų</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Susisiekite su manimi per Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mano RingId yra : </translation> </message> @@ -627,13 +627,13 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation> <translation>NERASTA RING PASKYRA</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Bendrinti visą ekraną</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Bendrinti ekrano sritį</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Bendrinti failą</translation> </message> @@ -1198,7 +1198,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation> <message> <location filename="../wizarddialog.cpp" line="159"/> <source>Registering your public username, it may take a few minutes...</source> - <translation type="unfinished"/> + <translation>Registruojamas jūsų viešasis naudotojo vardas, tai gali užtrukti kelias minutes...</translation> </message> <message> <location filename="../wizarddialog.cpp" line="220"/> @@ -1226,105 +1226,110 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation> <translation>Tinklo klaida.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Sukurti Ring paskyrą</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Susieti šį įrenginį su paskyra</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Kaip pridėti įrenginį</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Susikurkite savo profilį</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Susikurkite savo paskyrą</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Pasirinkite savo naudotojo vardą:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Pasirinkite savo naudotojo vardą</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Ieškoma...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registruoti viešąjį naudotojo vardą (eksperimentinis)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Įveskite savo pin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Slaptažodis</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Patvirtinkite slaptažodį</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Kuriama jūsų Ring paskyra...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Ankstesnis</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Kitas</translation> </message> diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts index a6e8c54401e9c2c86c6de1ab699def56c99c5e12..00aa858314c9e2afe4430f019173ef6c7b669f6e 100644 --- a/translations/ring_client_windows_ms.ts +++ b/translations/ring_client_windows_ms.ts @@ -35,12 +35,12 @@ Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation> <translation>Dicipta oleh:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Kerja seni oleh:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Berdasarkan projek </translation> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Sambungkan perangkat ini dengan akaun</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Kara laluan</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Sahkan kata laluan</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts index c47aa15492cc637835c0bdc9ba077cb979d3110c..ddce0bc426bc35ca783d9da524dce82d85ebab21 100644 --- a/translations/ring_client_windows_nb.ts +++ b/translations/ring_client_windows_nb.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Kopier og del den med dine venner!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Kopier og del den med dine venner!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Kopier og del den med dine venner!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Del skjermområde</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Del fil</translation> </message> @@ -1225,105 +1225,110 @@ Kopier og del den med dine venner!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Passord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Bekreft passord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Lager din Ring-konto...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Neste</translation> </message> diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts index 05e3b51fb31daa56b1fbf478dc0503f60b0f0fc0..61887c53f812df92f537e0b8b7ed3bba05f59f4b 100644 --- a/translations/ring_client_windows_nl.ts +++ b/translations/ring_client_windows_nl.ts @@ -15,7 +15,7 @@ <message utf8="true"> <location filename="../aboutdialog.ui" line="541"/> <source>Liberté, Égalité, Fraternité - Version 1.0</source> - <translation type="unfinished"/> + <translation>Liberté, Égalité, Fraternité - versie 1.0</translation> </message> <message> <location filename="../aboutdialog.ui" line="557"/> @@ -35,12 +35,12 @@ Ring is software voor beveiligde en gedistribueerde communicatie.</translation> <translation>Geschreven door:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Illustraties door:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Gebaseerd op het SFLPhone-project</translation> </message> @@ -567,12 +567,12 @@ Deel hem met je vrienden!</translation> <translation>Aan contact toevoegen</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Contacteer mij via Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mijn Ring-ID is:</translation> </message> @@ -627,13 +627,13 @@ Deel hem met je vrienden!</translation> <translation>GEEN RING-ACCOUNT GEVONDEN</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Deel hem met je vrienden!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Scherm delen</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Schermruimte delen</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Bestand delen</translation> </message> @@ -1226,114 +1226,110 @@ Deel hem met je vrienden!</translation> <translation>Netwerkfout.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Ring-account aanmaken</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Dit apparaat aan een account koppelen</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Hoe voeg ik een apparaat toe</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> - <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Om dit apparaat aan een andere account te koppelen moet je eerst </span><span style=" font-size:12pt; font-weight:600;">een pincode verkrijgen</span><span style=" font-size:12pt;">. Om de pincode te beheren:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ga naar de <span style=" font-weight:600;">accountbeheerinstellingen</span> van een vorig apparaat</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Kies de <span style=" font-weight:600;">Ring-account</span> die je wil gebruiken</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ga naar het tabblad <span style=" font-weight:600;">Apparaten</span></li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Selecteer <span style=" font-weight:600;">Een apparaat toevoegen</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts </span><span style=" font-size:12pt; font-weight:600;">10 minuten</span>geldig<span style=" font-size:12pt;">.</span></p></body></html></translation> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Maak je profiel aan</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>Voer je volledige naam in:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Maak je account aan</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Kies je gebruikersnaam:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Kies je gebruikersnaam</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Zoeken...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation>Registreer je gebruikersnaam op de Ring, zodat enkel jij ze kan gebruiken. Je vrienden zullen je kunnen bellen met je gebruikersnaam ipv je Ring-ID.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registreer een publieke gebruikersnaam (experimenteel)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Voer je pincode in</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Wachtwoord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Bevestig wachtwoord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Je Ring-account wordt aangemaakt...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Vorige</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Volgende</translation> </message> diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts index da2c0bb2ee549cbcf15bc4f579484277cd046953..953da6e297eef583e7658a70c9913edb759b88bd 100644 --- a/translations/ring_client_windows_nl_NL.ts +++ b/translations/ring_client_windows_nl_NL.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Wachtwoord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts index d5959d8a85723560e4a11ae5816bdeafb9940e74..faa693a81c2cd01f550b6c7e5647b20510dc432b 100644 --- a/translations/ring_client_windows_pa.ts +++ b/translations/ring_client_windows_pa.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts index 61b7597960abf75836cf5b73a03212bffa5c3d70..f74524523f081b25dac2a9095b8da0997f7659de 100644 --- a/translations/ring_client_windows_pl.ts +++ b/translations/ring_client_windows_pl.ts @@ -35,12 +35,12 @@ Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation> <translation>Stworzone przez:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Obrazki przez:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Na podstawie projektu SFLPhone</translation> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation>Dodaj do kontaku</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Skontaktuj się ze mną na Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mój RingId to:</translation> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation>NIE ZNALEZIONO ŻADNEGO KONTA RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Podziel się obszarem ekranu</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Podziel się obszar ekranu</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Podziel się plikiem</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Połącz to urządzenie z kontem</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Stwórz swój profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Stwórz konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Wybierz swoją nazwę użytkownika:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Wybierz swoją nazwę użytkownika</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Zarejestruj publiczną nazwę użytkownika (eksperymentalne)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Hasło</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Potwierdź hasło</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Generowanie twojego konta Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Następne</translation> </message> diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts index adafd66b80c8cf57e38fbc0a4f9798fce2c9e74d..7c779572acb05df29a2620f1eca146d0a0e5fa78 100644 --- a/translations/ring_client_windows_pl_PL.ts +++ b/translations/ring_client_windows_pl_PL.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts index 3b17bb79a94fb901b9f37f9c575a7a52675db14e..0c376560cfbaef7192c8453af63993784c3f46ba 100644 --- a/translations/ring_client_windows_pt.ts +++ b/translations/ring_client_windows_pt.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copie e avise seus amigos!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -626,13 +626,13 @@ Copie e avise seus amigos!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copie e avise seus amigos!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Compartilhar tela</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Anexar arquivo</translation> </message> @@ -1225,105 +1225,110 @@ Copie e avise seus amigos!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Senha</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Gerando sua conta Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Próximo</translation> </message> diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts index 00e6f6d3baf4dd0b0af125dbe3da03be975242a2..446763717c49585c3125ad6138e3f611253670e7 100644 --- a/translations/ring_client_windows_pt_BR.ts +++ b/translations/ring_client_windows_pt_BR.ts @@ -35,12 +35,12 @@ Ring é um software de comunicação distribuído e seguro.</translation> <translation>Criado por:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Artwork por:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Baseado no projeto SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Salve e compartilhe com seus amigos!</translation> <translation>Adicionar a contato</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Encontre-me no Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Meu RingID é : </translation> </message> @@ -627,13 +627,13 @@ Salve e compartilhe com seus amigos!</translation> <translation>Nenhuma conta Ring entrada</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Salve e compartilhe com seus amigos!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Compartilhar tela inteira</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Compartilhar área da tela</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Compartilhar arquivo</translation> </message> @@ -1226,105 +1226,110 @@ Salve e compartilhe com seus amigos!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Associar este dispositivo a uma conta</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Criar um Perfil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Criar uma conta</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Escolha seu nome de usuário:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Escolha seu nome de usuário</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registrar usuário público (experimental)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Entre o seu pin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Senha</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Confirmar senha</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Criando sua conta Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Anterior</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Próximo</translation> </message> diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts index a70d77b50f868e2fa1149291c2072ab011782256..0530a2474b0976ce79c9f77141e25f05c38d50ee 100644 --- a/translations/ring_client_windows_ro.ts +++ b/translations/ring_client_windows_ro.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Parola</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Confirmă parola</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message> diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts index cab3a9c382fccf4021245de1ee7b86c3a222391f..743d666c7578749b86f1aa6dec98e7b47bf82a97 100644 --- a/translations/ring_client_windows_ru.ts +++ b/translations/ring_client_windows_ru.ts @@ -35,12 +35,12 @@ Ring – это приложение для безопасного и распр <translation>Авторы проекта:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Дизайн:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Основано на проекте SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>Добавить в контакт</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Свяжись со мной в Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Мой Ring ID:</translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>НЕ НАЙДЕН АККАУНТ RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Транслировать весь экран</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Транслировать область экрана</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Поделиться файлом</translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Привязать это устройство к аккаунту</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Создайте свой профиль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Создайте свой аккаунт</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Выберите имя пользователя:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Выберите ваше имя пользователя</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Зарегистрировать публичное имя (экспериментальная функция)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Введите ваш PIN</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Подтвердить пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Создание вашего аккаунта Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Назад</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Далее</translation> </message> diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts index c944c2c13c134423ed1870d4c6b60eeccedba7a9..178b2e5b862cc04d7b0b3f1a3d862389f7db1018 100644 --- a/translations/ring_client_windows_ru_RU.ts +++ b/translations/ring_client_windows_ru_RU.ts @@ -35,12 +35,12 @@ Ring защищенное и распределенное программное <translation><html><head/><body><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Это ваш RingID.</span></p><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Скопировать и поделиться с друзьями!</span></p></body></html></translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation>Добавить в контакты</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Мой RingId:</translation> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation>УЧАТНАЯ ЗАПИСЬ RING НЕ НАЙДЕНА</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Общий доступ к экрану</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Поделится файлом</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Выберите ваше имя пользователя:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Выберите ваше имя пользователя</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Подтвердите пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Создать вашу учетную запись Ring</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Далее</translation> </message> diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts index 3eab8de5385fcc44ee8c1f89b7af2df6bc3d54ff..17c90cb1bc3d3a6beddf0bb5b25c4805b6dced5c 100644 --- a/translations/ring_client_windows_sk_SK.ts +++ b/translations/ring_client_windows_sk_SK.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -565,12 +565,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation type="unfinished"/> </message> @@ -625,13 +625,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1161,17 +1161,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1224,105 +1224,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Ďalej</translation> </message> diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts index 45db07afd49e3c4e65a18e3d458e23b803259ac0..60af2cd7f5748bff9b731aaddd167e4cc5b9238b 100644 --- a/translations/ring_client_windows_sq_AL.ts +++ b/translations/ring_client_windows_sq_AL.ts @@ -35,12 +35,12 @@ Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</tr <translation>Krijuar nga:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Përkujdesja grafike:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Bazuar në projektin SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Kopjojeni dhe jepuani shokëve!</translation> <translation>Shtoje te kontakti</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Kontaktomëni në Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>RingID-ja ime është:</translation> </message> @@ -627,13 +627,13 @@ Kopjojeni dhe jepuani shokëve!</translation> <translation>S’U GJET LLOGARI RING</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopjojeni dhe jepuani shokëve!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation type="unfinished"/> </message> @@ -1226,105 +1226,110 @@ Kopjojeni dhe jepuani shokëve!</translation> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Lidheni këtë pajisje me një llogari</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Krijoni profilin tuaj</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Krijoni llogarinë tuaj</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Regjistroni emër përdoruesi publik (eksperimentale)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Fjalëkalim</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Ripohoni fjalëkalimin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Pasuesi</translation> </message> diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts index 3689fe2088417d98ae2b3f3aade456e14f436a76..39e802909eaa79467bd46c3c90561403f4783ce4 100644 --- a/translations/ring_client_windows_sv.ts +++ b/translations/ring_client_windows_sv.ts @@ -15,7 +15,7 @@ <message utf8="true"> <location filename="../aboutdialog.ui" line="541"/> <source>Liberté, Égalité, Fraternité - Version 1.0</source> - <translation type="unfinished"/> + <translation>Liberté, Égalité, Fraternité - Version 1.0</translation> </message> <message> <location filename="../aboutdialog.ui" line="557"/> @@ -35,12 +35,12 @@ Ring är säker och distribuerad kommunikationsmjukvara.</translation> <translation>Skapad av:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Bildkonst av:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Baserad på SFLPhone-projektet</translation> </message> @@ -494,7 +494,7 @@ Kopiera och dela det med dina vänner!</translation> <message> <location filename="../callwidget.ui" line="888"/> <source>Double-click to copy</source> - <translation type="unfinished"/> + <translation>Dubbelklicka för att kopiera</translation> </message> <message> <location filename="../callwidget.ui" line="923"/> @@ -567,12 +567,12 @@ Kopiera och dela det med dina vänner!</translation> <translation>Lägg till kontakt</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Kontakta mig på Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Mitt Ring-ID är:</translation> </message> @@ -627,13 +627,13 @@ Kopiera och dela det med dina vänner!</translation> <translation>INGET RING-KONTO HITTADES</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopiera och dela det med dina vänner!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Dela hela skärmen</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Dela skärmområde</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Dela fil</translation> </message> @@ -1226,114 +1226,110 @@ Kopiera och dela det med dina vänner!</translation> <translation>Nätverksfel.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Skapa Ring-konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Koppla denna enhet till ett konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Hur man lägger till en enhet</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> - <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">För att länka den här enheten till ett annat konto </span><span style=" font-size:12pt; font-weight:600;">måste du först skaffa en PIN-kod</span><span style=" font-size:12pt;">. För att generera PIN-koden:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Gå till <span style=" font-weight:600;">Kontohanteringsinställningarna</span> på en tidigare enhet.</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Välj det <span style=" font-weight:600;">Ring-konto</span> du vill använda</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Gå till <span style=" font-weight:600;">Enhetsfliken</span></li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Välj <span style=" font-weight:600;">Lägg till en enhet</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">Där får du din obligatoriska PIN-kod för att komplettera detta formulär. Pin-koden är endast giltig i </span><span style=" font-size:12pt; font-weight:600;">10 minuter</span><span style=" font-size:12pt;">.</span></p></body></html></translation> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Skapa din profil</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>Ange ditt fullständiga namn:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Skapa ditt konto</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Välj ditt användarnamn:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Välj användarnamn</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Söker...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation>Registrera ditt användarnamn på Ring. Detta reserverar användarnamnet så att endast du kan använda det. Dina vänner kan kontakt dig med ditt användarnamn istället för att använda ditt Ring-ID.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Registrera ett offentligt namn (experimentellt)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Ange din PIN-kod</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Lösenord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Bekräfta lösenord</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Genererar ditt Ring-konto...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Föregående</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Nästa</translation> </message> diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts index b5920b8584ba0d8b88cd0d87df11aecc64c7de7a..35d62f13d738a9966b15596e3d3e2c551a6a0fe0 100644 --- a/translations/ring_client_windows_tr.ts +++ b/translations/ring_client_windows_tr.ts @@ -35,12 +35,12 @@ Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation> <translation>Oluşturanlar:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Çizenler:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>SFLPhone tasarısı temel alınmıştır.</translation> </message> @@ -567,12 +567,12 @@ Kopyala ve arkadaşlarınla paylaş!</translation> <translation>Kişiye ekle</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Ring'de benimle iletişime geç</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Ring kimliğim:</translation> </message> @@ -627,13 +627,13 @@ Kopyala ve arkadaşlarınla paylaş!</translation> <translation>RING HESABI BULUNAMADI</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Kopyala ve arkadaşlarınla paylaş!</translation> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Tüm ekranı paylaş</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Ekran alanı paylaş</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Dosya paylaş</translation> </message> @@ -1226,105 +1226,110 @@ Kopyala ve arkadaşlarınla paylaş!</translation> <translation>Ağ hatası.</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>Ring Hesabı Oluştur</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>Bu aygıtı bir hesaba bağla</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>Bir aygıt nasıl eklenir</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>Profilinizi oluşturun</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>Tam adınızı girin:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>Hesabınızı oluşturun</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Kullanıcı adınızı seçin:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Kullanıcı adınızı seçin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>Arama yapılıyor...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>Halka açık kullanıcı adı kaydet (deneysel)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>Pin'inizi girin</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Parola</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Parolayı onayla</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Ring hesabınız oluşturuluyor...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>Önceki</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>İleri</translation> </message> diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts index 71f27196fb90c1edc2cac2522d587f2b8dc34b9e..70be5672449b2133209f3454d0dd034e4b83e238 100644 --- a/translations/ring_client_windows_uk.ts +++ b/translations/ring_client_windows_uk.ts @@ -35,12 +35,12 @@ Ring - це безпечне і децентралізоване програм <translation>Стоворено:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>Намальовано:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>Базується на проекті SFLPhone</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>Додати до контактів</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>Зв'яжись зі мною за допомогою Ring</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>Моє RingId : </translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>АККАУНТ RING НЕ ЗНАЙДЕНО</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>Поділитися частиною екрану</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>Поділитися екраном</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>Відправити файл</translation> </message> @@ -1226,105 +1226,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>Оберіть ваш логін:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>Оберіть ваше ім'я користувача</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>Підтвердити пароль</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Генерація вашого облікового запису Ring...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>Наступний</translation> </message> diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts index 2abb604de9d88e3ab73f48266cc747c9c92a6df7..cd611ae79db34eb69bbafae9789b1f547aa33f43 100644 --- a/translations/ring_client_windows_zh.ts +++ b/translations/ring_client_windows_zh.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation>加入通訊錄</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>透過Ring聯絡我</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>我的Ring ID是:</translation> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation>找不到Ring帳號</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation type="unfinished"/> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>分享整個螢幕</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>分享部分螢幕</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>分享檔案</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>選擇你的使用者名稱:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>選擇你的使用者名稱</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>密码</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>Ring 帳號產生中...</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>下一步</translation> </message> diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts index fe5e2b69e3352f4ee4c4c774d615f1116ebfd8a3..95ea46bf5d6585a15f6e9bbc92c5f515649ce3f9 100644 --- a/translations/ring_client_windows_zh_CN.ts +++ b/translations/ring_client_windows_zh_CN.ts @@ -35,12 +35,12 @@ Ring是安全的、分布式的通讯软件。</translation> <translation>开发者:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation>界面设计:</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation>基于SFLPhone项目</translation> </message> @@ -567,12 +567,12 @@ Copy and share it with your friends!</source> <translation>加入通讯录</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation>在Ring上联系我</translation> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>我的RingID是:</translation> </message> @@ -627,13 +627,13 @@ Copy and share it with your friends!</source> <translation>未找到Ring帐户</translation> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1163,17 +1163,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation>共享整个屏幕</translation> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation>共享屏幕区域</translation> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>共享文件</translation> </message> @@ -1226,114 +1226,110 @@ Copy and share it with your friends!</source> <translation>网络错误。</translation> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation>创建Ring帐户</translation> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>将此设备与一个帐户进行连接</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation>如何添加设备</translation> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> - <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">要将此设备与另一帐户进行连接,您首先 </span><span style=" font-size:12pt; font-weight:600;">需要获取一个PIN</span><span style=" font-size:12pt;">。要生成PIN:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">在您先前使用的设备上,前往<span style=" font-weight:600;">帐户管理</span></li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">选择您要使用的 <span style=" font-weight:600;">Ring帐户</span></li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">前往<span style=" font-weight:600;">设备</span>选项卡</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">点击 <span style=" font-weight:600;">添加设备</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">您将获得此处需要的PIN。该PIN仅在</span><span style=" font-size:12pt; font-weight:600;">10分钟</span><span style=" font-size:12pt;">内有效。</span></p></body></html></translation> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> + <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation>创建您的帐户资料</translation> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation>输入您的全名:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation>创建Ring帐户</translation> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation>设置您的用户名:</translation> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation>设置您的用户名</translation> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation>正在搜索…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation>在Ring上注册您的用户名。该用户名将由您独占。您的联系人将能够使用该用户名联系您,不必使用您的RingID。</translation> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation>注册公共用户名(试验性)</translation> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation>输入您的PIN</translation> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>密码</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>确认密码</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation>正在生成您的Ring帐户…</translation> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation>上一步</translation> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation>下一步</translation> </message> diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts index e628c9b7eb7440772ffeac826f459aeb74ada8f5..0dab0bb3db5f7a4214cea43861439841f1e8d6c9 100644 --- a/translations/ring_client_windows_zh_TW.ts +++ b/translations/ring_client_windows_zh_TW.ts @@ -34,12 +34,12 @@ Ring is a secured and distributed communication software.</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="70"/> + <location filename="../aboutdialog.cpp" line="71"/> <source>Artwork by:</source> <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="74"/> + <location filename="../aboutdialog.cpp" line="75"/> <source>Based on the SFLPhone project</source> <translation type="unfinished"/> </message> @@ -566,12 +566,12 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>Contact me on Ring</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="921"/> + <location filename="../callwidget.cpp" line="919"/> <source>My RingId is : </source> <translation>我的 RingId 是:</translation> </message> @@ -626,13 +626,13 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../callwidget.cpp" line="765"/> + <location filename="../callwidget.cpp" line="763"/> <source>%1</source> <comment>%1 is the contact username</comment> <translation>%1</translation> </message> <message> - <location filename="../callwidget.cpp" line="767"/> + <location filename="../callwidget.cpp" line="765"/> <source>%1</source> <comment>%1 is the contact unique identifier</comment> <translation>%1</translation> @@ -1162,17 +1162,17 @@ Copy and share it with your friends!</source> <context> <name>VideoView</name> <message> - <location filename="../videoview.cpp" line="235"/> + <location filename="../videoview.cpp" line="236"/> <source>Share entire screen</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="238"/> + <location filename="../videoview.cpp" line="239"/> <source>Share screen area</source> <translation type="unfinished"/> </message> <message> - <location filename="../videoview.cpp" line="245"/> + <location filename="../videoview.cpp" line="246"/> <source>Share file</source> <translation>分享檔案</translation> </message> @@ -1225,105 +1225,110 @@ Copy and share it with your friends!</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="85"/> + <location filename="../wizarddialog.ui" line="127"/> <source>Create Ring account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="98"/> + <location filename="../wizarddialog.ui" line="140"/> <source>Link this device to an account</source> <translation>連結這個裝置到一個帳號</translation> </message> <message> - <location filename="../wizarddialog.ui" line="127"/> + <location filename="../wizarddialog.ui" line="172"/> <source>How to add a device</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="134"/> + <location filename="../wizarddialog.ui" line="69"/> + <source> Welcome to</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../wizarddialog.ui" line="179"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p> -<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> -<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p> +<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li> +<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="159"/> + <location filename="../wizarddialog.ui" line="207"/> <source>Create your profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="244"/> + <location filename="../wizarddialog.ui" line="292"/> <source>Enter your full name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="297"/> + <location filename="../wizarddialog.ui" line="348"/> <location filename="../wizarddialog.cpp" line="223"/> <source>Create your account</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="322"/> + <location filename="../wizarddialog.ui" line="373"/> <source>Choose your username:</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="370"/> + <location filename="../wizarddialog.ui" line="421"/> <source>Choose your username</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="386"/> + <location filename="../wizarddialog.ui" line="437"/> <location filename="../wizarddialog.cpp" line="295"/> <source>Searching...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="395"/> + <location filename="../wizarddialog.ui" line="446"/> <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="398"/> + <location filename="../wizarddialog.ui" line="449"/> <source>Register public username (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="425"/> + <location filename="../wizarddialog.ui" line="476"/> <source>Enter your pin</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="455"/> + <location filename="../wizarddialog.ui" line="506"/> <source>Password</source> <translation>密碼</translation> </message> <message> - <location filename="../wizarddialog.ui" line="485"/> + <location filename="../wizarddialog.ui" line="536"/> <source>Confirm password</source> <translation>確認密碼</translation> </message> <message> - <location filename="../wizarddialog.ui" line="553"/> + <location filename="../wizarddialog.ui" line="604"/> <location filename="../wizarddialog.cpp" line="107"/> <source>Generating your Ring account...</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="589"/> + <location filename="../wizarddialog.ui" line="640"/> <source>Previous</source> <translation type="unfinished"/> </message> <message> - <location filename="../wizarddialog.ui" line="621"/> - <location filename="../wizarddialog.ui" line="624"/> + <location filename="../wizarddialog.ui" line="672"/> + <location filename="../wizarddialog.ui" line="675"/> <source>Next</source> <translation type="unfinished"/> </message>