diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 41e0ecaa8a69d7cd72858d9f4deb28ed5017488b..355e50603a05e5e150c6be830b4ea94d5389edfd 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -769,7 +769,7 @@ This action will abort any currently running synchronization.</source> <translation>هنالك مجلدات لم تتم مزامنتها لأن Øجمها كبيرٌ جدًا أو لأنها ÙˆØدات تخزين خارجية:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>هنالك مجلدات تجاوز Øجمها %1ميغا بايت: %2</translation> </message> @@ -3021,44 +3021,6 @@ Note that using any logging command line options will override this setting.</so <translation>وكيل SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>خطأ راجع من الخادوم:<em>1%</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Øدث خطأ عند Ù…Øاولة الوصول إلى token endpoint النقطة الØدّيّة للأَمَارَة : <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Ø¥Ùراغ JSON أو JSON Ùارغ من إعادة توجيه OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>تعذّر تØليل مل٠JSON المعاد من الخادوم:<em> 1%</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>لا ÙŠØتوي الرد من الخادوم على كاÙØ© الØقول المتوقعة</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>خطأ ÙÙŠ تسجيل الدخول</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Øساب غير صØÙŠØ</h1><p>أنت دخلت من الØساب <em>%1</em>, لكن يجب أن تدخل من الØساب<em>%2</em>.<br>رجاءً، أخرج من %3 ÙÙŠ تبويبة tab أخرى ثم <a href='%4'>إضغط هنا</a> Ùˆ ادخل بـ %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3245,19 +3207,6 @@ Note that using any logging command line options will override this setting.</so <translation>أدخل بيانات اعتماد المستخدم</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>اتصل بـ 1%</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>أدخل إلى متصÙØÙƒ</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5314,29 +5263,6 @@ Server replied with error: %2</source> <translation>&كلمة المرور</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>يرجى التبديل إلى المتصÙØ Ø§Ù„Ø®Ø§Øµ بك للمتابعة.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Øدث خطأ أثناء التوصيل. Øاول مرة أخرى من Ùضلك.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>أعد ÙØªØ Ø§Ù„Ù…ØªØµÙØ</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>إنسخ الرابط</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6256,6 +6182,57 @@ Server replied with error: %2</source> <translation>قم بتØرير المساØØ© المØلية</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>خطأ راجع من الخادوم:<em>1%</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Øدث خطأ عند Ù…Øاولة الوصول إلى token endpoint النقطة الØدّيّة للأَمَارَة : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Ø¥Ùراغ JSON أو JSON Ùارغ من إعادة توجيه OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>تعذّر تØليل مل٠JSON المعاد من الخادوم:<em> 1%</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>لا ÙŠØتوي الرد من الخادوم على كاÙØ© الØقول المتوقعة</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>خطأ ÙÙŠ تسجيل الدخول</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Øساب غير صØÙŠØ</h1><p>أنت دخلت من الØساب <em>%1</em>, لكن يجب أن تدخل من الØساب<em>%2</em>.<br>رجاءً، أخرج من %3 ÙÙŠ تبويبة tab أخرى ثم <a href='%4'>إضغط هنا</a> Ùˆ ادخل بـ %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>اتصل بـ 1%</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>أدخل إلى متصÙØÙƒ</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6284,4 +6261,27 @@ Server replied with error: %2</source> <translation>تنتهي الصلاØية ÙÙŠ:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>يرجى التبديل إلى المتصÙØ Ø§Ù„Ø®Ø§Øµ بك للمتابعة.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Øدث خطأ أثناء التوصيل. Øاول مرة أخرى من Ùضلك.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>أعد ÙØªØ Ø§Ù„Ù…ØªØµÙØ</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>إنسخ الرابط</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_bg.ts b/translations/client_bg.ts index d8a713abbaad51c0fd59698e66c3e3b46cd463c6..346027937dd66001d4b224e9d51d23cd1d1f406d 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -771,7 +771,7 @@ This action will abort any currently running synchronization.</source> <translation>Има папки, които не Ñа Ñинхронизирани защото Ñа твърде големи или Ñа външни хранилища:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3034,44 +3034,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 прокÑи</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Грешка, върната от Ñървъра: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Възникна грешка при доÑтъпа на крайната точка „маркер“: <br><em> %1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Изпразнете JSON от OAuth2, пренаÑочване</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ðе можа да Ñе анализира JSON върнат от Ñървъра:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Отговорът от Ñървъра не Ñъдържа вÑички очаквани полета</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Грешка при впиÑване</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Грешен профил</h1><p>ВпиÑахте Ñе Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» <em>%1</em>, но Ñ‚Ñ€Ñбва да Ñе впишете, като профил <em>%2</em>.<br>МолÑ, да Ñе отпишете от %3, в друг раздел, Ñлед което <a href='%4'>кликнете тук</a> и Ñе впишете, като %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3258,19 +3220,6 @@ Note that using any logging command line options will override this setting.</so <translation>Въвеждане на потребителÑки данни</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Свързване към %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Влезане във Ð²Ð°ÑˆÐ¸Ñ Ð±Ñ€Ð°ÑƒÐ·ÑŠÑ€</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5332,29 +5281,6 @@ Server replied with error: %2</source> <translation>Парола</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>МолÑ, превключете към браузъра Ñи, за да продължите.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Възникна грешка при Ñвързването. МолÑ, опитайте отново.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Отворете браузъра отново</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Копиране на връзката</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6274,6 +6200,57 @@ Server replied with error: %2</source> <translation>ОÑвобождаване на локално мÑÑто</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Грешка, върната от Ñървъра: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Възникна грешка при доÑтъпа на крайната точка „маркер“: <br><em> %1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Изпразнете JSON от OAuth2, пренаÑочване</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ðе можа да Ñе анализира JSON върнат от Ñървъра:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Отговорът от Ñървъра не Ñъдържа вÑички очаквани полета</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Грешка при впиÑване</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Грешен профил</h1><p>ВпиÑахте Ñе Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» <em>%1</em>, но Ñ‚Ñ€Ñбва да Ñе впишете, като профил <em>%2</em>.<br>МолÑ, да Ñе отпишете от %3, в друг раздел, Ñлед което <a href='%4'>кликнете тук</a> и Ñе впишете, като %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Свързване към %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Влезане във Ð²Ð°ÑˆÐ¸Ñ Ð±Ñ€Ð°ÑƒÐ·ÑŠÑ€</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6302,4 +6279,27 @@ Server replied with error: %2</source> <translation>Изтича:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>МолÑ, превключете към браузъра Ñи, за да продължите.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Възникна грешка при Ñвързването. МолÑ, опитайте отново.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Отворете браузъра отново</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Копиране на връзката</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_br.ts b/translations/client_br.ts index a81770eed27d4f4da744d3bed4929189115adfbe..e8f1f435def575ad551eae855b41c2b0273dcc53 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -766,7 +766,7 @@ This action will abort any currently running synchronization.</source> <translation>Teuliadoù so n'int ke bet kemredet peogwir e oant pe re vra pe lec'hioù klenkañ diavaez :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3016,44 +3016,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Ur fazi a zo bet kavet dre ar servijour : <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Dibosupl dielfennañ ar JSON distroet eus ar servijour : <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Nen doa ket respont ar servijour pep lec'hiad gortozet</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Fazi mont-tre</h1> <p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3240,19 +3202,6 @@ Note that using any logging command line options will override this setting.</so <translation>Lakaat titouroù identitelez an implijer</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Kenstagañ da %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Mont-tre gant ho furcher</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5306,29 +5255,6 @@ Server replied with error: %2</source> <translation>&Ger-tremen</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Cheñchit d'ho furcherevit kendec'hel.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ur fazi a zo bet en ur gemprennañ. Klaskit en dro.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Addigeri ar Furcher</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiañ al liamm</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6248,6 +6174,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Ur fazi a zo bet kavet dre ar servijour : <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Dibosupl dielfennañ ar JSON distroet eus ar servijour : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Nen doa ket respont ar servijour pep lec'hiad gortozet</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Fazi mont-tre</h1> <p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Kenstagañ da %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Mont-tre gant ho furcher</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6276,4 +6253,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Cheñchit d'ho furcherevit kendec'hel.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ur fazi a zo bet en ur gemprennañ. Klaskit en dro.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Addigeri ar Furcher</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiañ al liamm</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_ca.ts b/translations/client_ca.ts index d68c0b41fbe4039cc5866845ddc3aeb60cdde10f..1ecbad2b38a25fd136c632e5f4f550a689a8bda5 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -771,7 +771,7 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation> <translation>Hi ha carpetes que no s'han sincronitzat perquè són massa grans o són fonts d'emmagatzematge extern: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3017,44 +3017,6 @@ Note that using any logging command line options will override this setting.</so <translation>Servidor intermediari SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>S'ha produït un error en el servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No s'ha pogut analitzar el JSON retornat des del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La resposta del servidor no contenia tots els camps esperats</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error d'inici de sessió</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3241,19 +3203,6 @@ Note that using any logging command line options will override this setting.</so <translation>Introduïu les credencials de l'usuari</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connexió a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Inici de sessió al navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5307,29 +5256,6 @@ Server replied with error: %2</source> <translation>&Contrasenya</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Obriu el navegador per a continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>S'ha produït un error durant la connexió. Torneu-ho a provar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Torna a obrir el navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copia l'enllaç</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6249,6 +6175,57 @@ Server replied with error: %2</source> <translation>Allibera espai local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>S'ha produït un error en el servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No s'ha pogut analitzar el JSON retornat des del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La resposta del servidor no contenia tots els camps esperats</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error d'inici de sessió</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connexió a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Inici de sessió al navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6277,4 +6254,27 @@ Server replied with error: %2</source> <translation>Venciment:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Obriu el navegador per a continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>S'ha produït un error durant la connexió. Torneu-ho a provar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Torna a obrir el navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copia l'enllaç</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_cs.ts b/translations/client_cs.ts index ebedf71d597d5e21083fedd19a49a79d25492e98..71160fe6430c63dbc8a15956f775ca42ef3fdd23 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -773,7 +773,7 @@ SouÄasnÄ› tato akce zruÅ¡Ã jakoukoli právÄ› probÃhajÃcà synchronizaci.</tr <translation>Tyto složky nebyly synchronizovány, protože jsou pÅ™ÃliÅ¡ velké, nebo se nacházejà na externÃch úložiÅ¡tÃch:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Jsou zde složky, jejichž velikost pÅ™esáhla %1MB: %2</translation> </message> @@ -3036,44 +3036,6 @@ Poznamenejme, že použità jakékoli volby pÅ™Ãkazového řádku má pÅ™ed tà <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Chyba vrácené ze serveru: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>DoÅ¡lo k chybÄ› pÅ™i pÅ™Ãstupu ke koncovému bodu „token“: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Vyprázdnit JSON z OAuth2 pÅ™esmÄ›rovánÃ</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Nedařà se zpracovat JSON data vrácená serverem:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>OdpovÄ›Ä ze serveru neobsahovala vÅ¡echny oÄekávané kolonky</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Chyba pÅ™ihlášenÃ</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Nesprávný úÄet</h1><p>PÅ™ihlásili jste se úÄtem <em>%1</em>, ale je tÅ™eba, abyste se pÅ™ihlásili úÄtem <em>%2</em>.<br>Odhlaste se z %3 v jiné kartÄ›, pak <a href='%4'>kliknÄ›te sem</a> a pÅ™ihlaste se jako %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Poznamenejme, že použità jakékoli volby pÅ™Ãkazového řádku má pÅ™ed tà <translation>Zadejte pÅ™ihlaÅ¡ovacà údaje uživatele</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>PÅ™ipojit k %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>PÅ™ihlášenà v prohlÞeÄi</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Server odpovÄ›dÄ›l chybou: %2</translation> <translation>&Heslo</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>PÅ™epnÄ›te se do webového prohlÞeÄe a pokraÄujte v nÄ›m.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>PÅ™i pÅ™ipojovánà doÅ¡lo k chybÄ›. Zkuste to znovu.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Znovu otevÅ™Ãt prohlÞeÄ</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>ZkopÃrovat odkaz</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Server odpovÄ›dÄ›l chybou: %2</translation> <translation>Uvolnit lokálnà prostor</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Chyba vrácené ze serveru: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>DoÅ¡lo k chybÄ› pÅ™i pÅ™Ãstupu ke koncovému bodu „token“: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Vyprázdnit JSON z OAuth2 pÅ™esmÄ›rovánÃ</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nedařà se zpracovat JSON data vrácená serverem:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>OdpovÄ›Ä ze serveru neobsahovala vÅ¡echny oÄekávané kolonky</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Chyba pÅ™ihlášenÃ</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Nesprávný úÄet</h1><p>PÅ™ihlásili jste se úÄtem <em>%1</em>, ale je tÅ™eba, abyste se pÅ™ihlásili úÄtem <em>%2</em>.<br>Odhlaste se z %3 v jiné kartÄ›, pak <a href='%4'>kliknÄ›te sem</a> a pÅ™ihlaste se jako %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>PÅ™ipojit k %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>PÅ™ihlášenà v prohlÞeÄi</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Server odpovÄ›dÄ›l chybou: %2</translation> <translation>Platnost skonÄÃ:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>PÅ™epnÄ›te se do webového prohlÞeÄe a pokraÄujte v nÄ›m.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>PÅ™i pÅ™ipojovánà doÅ¡lo k chybÄ›. Zkuste to znovu.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Znovu otevÅ™Ãt prohlÞeÄ</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>ZkopÃrovat odkaz</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_da.ts b/translations/client_da.ts index 05777e5285012349864d754616c8b981933341a4..ea5ef143d6ccf50d6545c4bec9d0013e97e3068b 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -770,7 +770,7 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran <translation>Der er mapper som ikke blev synkroniseret fordi de er for store eller eksterne lagre:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3021,44 +3021,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Fejl meddelelse fra serveren: <em>%1</em> </translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Kunne ikke analysere den modtaget JSON fra serveren: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Svaret fra serveren indeholder ikke alle forventede informationer.</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Login fejl</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3245,19 +3207,6 @@ Note that using any logging command line options will override this setting.</so <translation>Angiv brugeroplysninger</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Forbind til %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Forbind i din browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5311,29 +5260,6 @@ Server replied with error: %2</source> <translation>&Adgangskode</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Venligst skift til din browser for at fortsætte.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Der opstod en fejl under forsøget pÃ¥ at oprette forbindelse. Prøv venligst igen.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Ã…bn browser igen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiér link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6253,6 +6179,57 @@ Server replied with error: %2</source> <translation>Frigør lokal lagerplads</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fejl meddelelse fra serveren: <em>%1</em> </translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kunne ikke analysere den modtaget JSON fra serveren: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Svaret fra serveren indeholder ikke alle forventede informationer.</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Login fejl</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Forbind til %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Forbind i din browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6281,4 +6258,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Venligst skift til din browser for at fortsætte.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Der opstod en fejl under forsøget pÃ¥ at oprette forbindelse. Prøv venligst igen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ã…bn browser igen</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiér link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_de.ts b/translations/client_de.ts index 5887c243af4e7427b76ee77b0cbe1bb8bd01fda8..ee52e24aa76b848e62a37710f6403ba989932b28 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -772,7 +772,7 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> <translation>Es gibt Ordner, die nicht synchronisiert werden konnten, da sie zu groß oder externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Es gibt Ordner, deren Größe über %1 MB hinaus gewachsen ist: %2</translation> </message> @@ -3036,44 +3036,6 @@ Beachten Sie, dass die Verwendung von Befehlszeilenoptionen für die Protokollie <translation>SOCKS5-Proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Fehler vom Server zurückgegeben: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Fehler beim Zugriff auf den "Token"-Endpunkt: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Leeres JSON aus OAuth2-Redirect</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Die JSON-Antwort des Servers konnte nicht geparst werden: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Die Antwort des Servers hat nicht alle erwarteten Felder beinhaltet</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Anmeldefehler </h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Falsches Konto</h1><p>Sie haben sich mit dem Konto <em>%1</em> angemeldet, müssen aber das Konto <em>%2</em> verwenden.<br>Bitte melden von %3 in einem anderen Tab abmelden und <a href='%4'>klicken Sie hier</a> um sich mit %2 anzumelden</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Beachten Sie, dass die Verwendung von Befehlszeilenoptionen für die Protokollie <translation>Geben Sie Ihre Benutzer-Anmeldeinformationen ein</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Verbinden mit %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Melden Sie sich in Ihrem Browser an</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Server antwortete mit Fehler: %2</translation> <translation>&Passwort</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Bitte wechseln Sie zum Fortfahren in Ihren Browser.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Es ist ein Fehler während des Verbindungsaufbau aufgetreten. Bitte erneut versuchen.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Browser erneut öffnen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Link kopieren</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Server antwortete mit Fehler: %2</translation> <translation>Lokalen Speicherplatz freigeben</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fehler vom Server zurückgegeben: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Fehler beim Zugriff auf den "Token"-Endpunkt: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Leeres JSON aus OAuth2-Redirect</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Die JSON-Antwort des Servers konnte nicht geparst werden: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Die Antwort des Servers hat nicht alle erwarteten Felder beinhaltet</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Anmeldefehler </h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Falsches Konto</h1><p>Sie haben sich mit dem Konto <em>%1</em> angemeldet, müssen aber das Konto <em>%2</em> verwenden.<br>Bitte melden von %3 in einem anderen Tab abmelden und <a href='%4'>klicken Sie hier</a> um sich mit %2 anzumelden</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Verbinden mit %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Melden Sie sich in Ihrem Browser an</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Server antwortete mit Fehler: %2</translation> <translation>Läuft ab:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Bitte wechseln Sie zum Fortfahren in Ihren Browser.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Es ist ein Fehler während des Verbindungsaufbau aufgetreten. Bitte erneut versuchen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Browser erneut öffnen</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Link kopieren</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_el.ts b/translations/client_el.ts index 03a95f5eff11f50337fceaffaf1790a01c5964f0..b1e642554e74fbb4998406cf4e78217f6440e74d 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -766,7 +766,7 @@ This action will abort any currently running synchronization.</source> <translation>ΥπάÏχουν φάκελοι που δεν συγχÏονίστηκαν επειδή είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿Î¹ ή αποθηκευτικοί χώÏοι:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3024,44 +3024,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 διαμεσολαβητής</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Ο διακομιστής επÎστÏεψε το σφάλμα: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Αδειάστε JSON από OAuth2 ανακατεÏθυνση.</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Δεν ήταν δυνατή η ανάλυση του JSON από το διακομιστή: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Η απάντηση του διακομιστή δεν πεÏιÎχει όλα τα αναμενόμενα στοιχεία</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Σφάλμα εισόδου</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3248,19 +3210,6 @@ Note that using any logging command line options will override this setting.</so <translation>Εισάγετε διαπιστευτήÏια χÏήστη</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>ΣÏνδεση με %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>ΣÏνδεση στον Ï€ÏοεπιλεγμÎνο πεÏιηγητή ιστοσελίδων</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5314,29 +5263,6 @@ Server replied with error: %2</source> <translation>&Κωδικός Î Ïόσβασης</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Μεταβείτε στον φυλλομετÏητή για συνÎχεια.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Σφάλμα κατά την σÏνδεση. Δοκιμάστε ξανά.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Επανεκκίνηση ΠεÏιηγητή</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>ΑντιγÏαφή συνδÎσμου</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6256,6 +6182,57 @@ Server replied with error: %2</source> <translation>ΑπελευθεÏώστε τοπικό χώÏο</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Ο διακομιστής επÎστÏεψε το σφάλμα: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Αδειάστε JSON από OAuth2 ανακατεÏθυνση.</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Δεν ήταν δυνατή η ανάλυση του JSON από το διακομιστή: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Η απάντηση του διακομιστή δεν πεÏιÎχει όλα τα αναμενόμενα στοιχεία</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Σφάλμα εισόδου</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>ΣÏνδεση με %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>ΣÏνδεση στον Ï€ÏοεπιλεγμÎνο πεÏιηγητή ιστοσελίδων</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6284,4 +6261,27 @@ Server replied with error: %2</source> <translation>Λήγει:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Μεταβείτε στον φυλλομετÏητή για συνÎχεια.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Σφάλμα κατά την σÏνδεση. Δοκιμάστε ξανά.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Επανεκκίνηση ΠεÏιηγητή</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>ΑντιγÏαφή συνδÎσμου</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 6a00f9861d049ae95d50653b7e11cf4032d67f9b..8fd4b5e332da52a90248306dc4a3e0133b56181a 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -773,7 +773,7 @@ This action will abort any currently running synchronization.</translation> <translation>There are folders that were not synchronised because they are too big or external storages: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>There are folders that have grown in size beyond %1MB: %2</translation> </message> @@ -3037,44 +3037,6 @@ Note that using any logging command line options will override this setting.</tr <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error returned from the server: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Empty JSON from OAuth2 redirect</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>The reply from the server did not contain all expected fields</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Login Error</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Note that using any logging command line options will override this setting.</tr <translation>Enter user credentials</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connect to %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Login in your browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Server replied with error: %2</translation> <translation>&Password</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Please switch to your browser to proceed.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>An error occurred while connecting. Please try again.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-open Browser</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copy link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Server replied with error: %2</translation> <translation>Free up local space</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error returned from the server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Empty JSON from OAuth2 redirect</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>The reply from the server did not contain all expected fields</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Login Error</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connect to %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Login in your browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Server replied with error: %2</translation> <translation>Expires:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Please switch to your browser to proceed.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>An error occurred while connecting. Please try again.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-open Browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copy link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 2b0f494347419a6bd169d375cf2a2c26a996a51d..c6e15a0253c1aa0a635e4319d67a75592b4411db 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Kelkaj dosierujoj ne sinkroniÄis, ĉar ili estas tro grandaj âù konservataj en ekstera konservejo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3015,44 +3015,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5-prokurilo</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Eraro ricevita el la servilo: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ne eblis analizi la JSON-datumojn ricevitajn el la servilo: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respondo el la servilo ne enhavis ĉiujn atenditajn kampojn</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Ensaluta eraro</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3239,19 +3201,6 @@ Note that using any logging command line options will override this setting.</so <translation>Entajpi akreditlojn de uzanto</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Konekti al %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Ensaluti pere de via retumilo</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5304,29 +5253,6 @@ Server replied with error: %2</source> <translation>&Pasvorto</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Bv. iri al via retumilo por daÅrigi.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Eraro okazis dum konekto. Bonvolu provi ree</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Remalfermi retumilon</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopii ligilon</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6246,6 +6172,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Eraro ricevita el la servilo: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ne eblis analizi la JSON-datumojn ricevitajn el la servilo: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respondo el la servilo ne enhavis ĉiujn atenditajn kampojn</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Ensaluta eraro</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Konekti al %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Ensaluti pere de via retumilo</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6274,4 +6251,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Bv. iri al via retumilo por daÅrigi.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Eraro okazis dum konekto. Bonvolu provi ree</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Remalfermi retumilon</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopii ligilon</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es.ts b/translations/client_es.ts index a4398128bc5ba460ce5e2de3c534cfd97db9a88a..41e9ac4c2917a1180d75a9b0cef26685fb202cc6 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -774,7 +774,7 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes o están en el almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Existen carpetas que han aumentado de tamaño más alla de %1MB: %2</translation> </message> @@ -3039,44 +3039,6 @@ Nótese que usar cualquier opción de toma de registros a través de lÃnea de c <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error devuelto desde el servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Hubo un error accediendo al "token" endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON vacÃo de la redirección de OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No se puede procesar el código JSON recibido del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contiene todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error al iniciar sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Usuario incorrecto</h1><p>Se ha intentado iniciar sesión con el usuario: <em>%1</em>, pero debe iniciar sesión con el usuario: <em>%2</em>.<br>Por favor, cierre la sesión de %3 en otra pestaña, haga<a href='%4'>clic aquÃ</a> e inicie sesión como el usuario %2</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3263,19 +3225,6 @@ Nótese que usar cualquier opción de toma de registros a través de lÃnea de c <translation>Introduzca las credenciales de usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectarse a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Inicia sesión en tu navegador Web</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5337,29 +5286,6 @@ El servidor respondió con el error: %2</translation> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor vaya a su navegador para proceder.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ha ocurrido un error al conectarse. Por favor, vuelve a intentarlo.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Reabra el navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar enlace</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6279,6 +6205,57 @@ El servidor respondió con el error: %2</translation> <translation>Liberar espacio local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error devuelto desde el servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Hubo un error accediendo al "token" endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON vacÃo de la redirección de OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No se puede procesar el código JSON recibido del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contiene todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error al iniciar sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Usuario incorrecto</h1><p>Se ha intentado iniciar sesión con el usuario: <em>%1</em>, pero debe iniciar sesión con el usuario: <em>%2</em>.<br>Por favor, cierre la sesión de %3 en otra pestaña, haga<a href='%4'>clic aquÃ</a> e inicie sesión como el usuario %2</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectarse a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Inicia sesión en tu navegador Web</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6307,4 +6284,27 @@ El servidor respondió con el error: %2</translation> <translation>Caduca:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor vaya a su navegador para proceder.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ha ocurrido un error al conectarse. Por favor, vuelve a intentarlo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabra el navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar enlace</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index e65dbba5f789ed55ee9b4bc8825abe6a65b2cc28..bdf49ae4a628ab51f74b081ef1a41cd09189278e 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 2693257fb1d4d786bdfb14fb230750512be75933..ece57f84d6a585e87586f801c343a121f455d7ea 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 6f972181fd52785ea98733d6cb3a0d3d2babaae9..6b0f8ab170e0a0c9afefe0517f3e7697d9ee85ad 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index db69b0a9f60a734c40a2cb3049772d2d121d1922..92ef5402270d6080e73f05197bbce0af6879ddcd 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 922f7d9058585fed44e4df54c577d21969363396..d73b758eccdf3f95a42d218e9202c6c82971f988 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -772,7 +772,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3034,44 +3034,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Hubo un error al acceder al punto final "token": <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON vacÃo desde la redirección de OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Cuenta incorrecta</h1><p>Iniciaste sesión con la cuenta <em>%1</em>, pero debes iniciar sesión con la cuenta <em>%2</em>.<br>Por favor, cierra sesión en %3 en otra pestaña, luego <a href='%4'>haz clic aquÃ</a> e inicia sesión con %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3258,19 +3220,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5332,29 +5281,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Se produjo un error al conectar. Por favor, inténtalo de nuevo.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar enlace</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6274,6 +6200,57 @@ Server replied with error: %2</source> <translation>Liberar espacio local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Hubo un error al acceder al punto final "token": <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON vacÃo desde la redirección de OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Cuenta incorrecta</h1><p>Iniciaste sesión con la cuenta <em>%1</em>, pero debes iniciar sesión con la cuenta <em>%2</em>.<br>Por favor, cierra sesión en %3 en otra pestaña, luego <a href='%4'>haz clic aquÃ</a> e inicia sesión con %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6302,4 +6279,27 @@ Server replied with error: %2</source> <translation>Expira:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Se produjo un error al conectar. Por favor, inténtalo de nuevo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar enlace</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index c9edb555c784431b3d3a1c7f4cac6e506375bd06..21e4bd7a51d7ac0165ac3b140e6adf93ca66c94b 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index f4e8bd5877d9e3bd582f8d5ca0361fd48acca39f..810582937241b11dc62c75ac24dfbabb8c89ace1 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index b8faae110627aa647aeabcb35972fe83b566a9d8..e5e92e4f3307bc1a602a9d53cd57a49f18b9120a 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index bf2a5ec8b9e7539d12411150214f148ffb5913bc..66a9462273876c96891a1a97ee62e6164bbe27dc 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3007,44 +3007,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Error regresado del servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3231,19 +3193,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ingresar las credenciales del usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Iniciar sesión en tu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5297,29 +5246,6 @@ Server replied with error: %2</source> <translation>&Contraseña</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor cambia a tu navegador para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Re-abrir el Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6239,6 +6165,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error regresado del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No fue posible interpretar el JSON que rereso del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contenÃa todos los campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error de Inicio de Sesión</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Iniciar sesión en tu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6267,4 +6244,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor cambia a tu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Re-abrir el Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_et.ts b/translations/client_et.ts index 0fa25a14430bfde8487a4b94b347c942edd01d52..d11bd18494795fd49e914f483ca946344468c12a 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3005,44 +3005,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 proksi</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3229,19 +3191,6 @@ Note that using any logging command line options will override this setting.</so <translation>Sisesta kasutajaandmed</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Ãœhendu %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5295,29 +5244,6 @@ Server replied with error: %2</source> <translation>&Parool</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6237,6 +6163,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Ãœhendu %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation type="unfinished"/> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6265,4 +6242,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_eu.ts b/translations/client_eu.ts index aa523eb883203686dd6649e9892a674990ff2c25..085f755df194d3620d1da49ed097889109084a0f 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -772,7 +772,7 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako edo kanpoko biltegietan daudelako:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Badira %1MB baino gehiago handitu diren karpetak: %2</translation> </message> @@ -3036,44 +3036,6 @@ Kontuan izan erregistro-komando lerroaren edozein aukera erabiliz ezarpen hau ga <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Zerbitzariak itzuli duen errorea: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Errorea gertatu da "token" amaiera-puntua atzitzean: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON hutsa OAuth2 birbideratzetik</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ezin izan da zerbitzariaren JSON formatuko erantzuna irakurri: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Zerbitzariaren erantzunak ez ditu espero ziren eremu guztiak</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Saio hasiera errorea</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Kontua ez da zuzena</h1><p><em>%1 </em>kontuarekin sartu zara, baina <em>%2 </em>kontuarekin sartu behar zara. <br>Itxi saioa %3-tik beste fitxa batean, ondoren <a href='%4'>egin klik hemen </a>eta sartu %2 gisa.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Kontuan izan erregistro-komando lerroaren edozein aukera erabiliz ezarpen hau ga <translation>Sartu erabiltzailearen kredentzialak</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>%1ra konektatu</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Saioa hasi zure nabigatzailean</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Zerbitzariak errorearekin erantzun du: %2</translation> <translation>&Pasahitza</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Mesedez aldatu zure arakatzailera aurrera egiteko.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Errore bat gertatu da konektatzean. Saiatu berriro.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Berrireki nabigatzailea</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiatu esteka</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Zerbitzariak errorearekin erantzun du: %2</translation> <translation>Egin leku librea lokalean</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Zerbitzariak itzuli duen errorea: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Errorea gertatu da "token" amaiera-puntua atzitzean: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON hutsa OAuth2 birbideratzetik</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ezin izan da zerbitzariaren JSON formatuko erantzuna irakurri: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Zerbitzariaren erantzunak ez ditu espero ziren eremu guztiak</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Saio hasiera errorea</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Kontua ez da zuzena</h1><p><em>%1 </em>kontuarekin sartu zara, baina <em>%2 </em>kontuarekin sartu behar zara. <br>Itxi saioa %3-tik beste fitxa batean, ondoren <a href='%4'>egin klik hemen </a>eta sartu %2 gisa.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>%1ra konektatu</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Saioa hasi zure nabigatzailean</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Zerbitzariak errorearekin erantzun du: %2</translation> <translation>Iraungitzea:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Mesedez aldatu zure arakatzailera aurrera egiteko.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Errore bat gertatu da konektatzean. Saiatu berriro.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Berrireki nabigatzailea</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiatu esteka</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_fa.ts b/translations/client_fa.ts index be1335041f18e2ee0bc361d2f5ace2078fb627ef..92b82c304e455abe6657b64dac41923b5a4c89de 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -772,7 +772,7 @@ This action will abort any currently running synchronization.</translation> <translation>پوشه‌هایی وجود دارند Ú©Ù‡ همگام سازی نشده اند زیرا آن ها بسیار بزرگ یا مخازن خارجی هستند:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>There are folders that have grown in size beyond %1MB: %2</translation> </message> @@ -3036,44 +3036,6 @@ Note that using any logging command line options will override this setting.</tr <translation>پروکسی SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>خطای بازگشت از سرور: <em>1%</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Empty JSON from OAuth2 redirect</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>JSON بازگشتی از سرور قابل تجزیه نیست: <br><em>1%</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>پاسخ سرور شامل تمامی زمینه های مورد انتظار نبود</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>خطای ورود</h1><p>1%</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Note that using any logging command line options will override this setting.</tr <translation>وارد کردن گواهی نامه کاربر</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>متصل به %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>در مرورگر خود وارد شوید</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5333,29 +5282,6 @@ Server replied with error: %2</translation> <translation>&رمزعبور</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>لطÙا برای ادامه به مرورگر خود سوئیچ کنید.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>An error occurred while connecting. Please try again.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>مرورگر را دوباره باز کنید</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copy link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6275,6 +6201,57 @@ Server replied with error: %2</translation> <translation>Free up local space</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>خطای بازگشت از سرور: <em>1%</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Empty JSON from OAuth2 redirect</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>JSON بازگشتی از سرور قابل تجزیه نیست: <br><em>1%</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>پاسخ سرور شامل تمامی زمینه های مورد انتظار نبود</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>خطای ورود</h1><p>1%</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>متصل به %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>در مرورگر خود وارد شوید</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6303,4 +6280,27 @@ Server replied with error: %2</translation> <translation>Expires:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>لطÙا برای ادامه به مرورگر خود سوئیچ کنید.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>An error occurred while connecting. Please try again.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>مرورگر را دوباره باز کنید</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copy link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 399ecb51648a32ee109462bc99d1f9f77de7ec96..0c4a262e3d43c08c25be17d32daf47104a223764 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -769,7 +769,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <translation>Seuraavia kansioita ei synkronoitu, koska ne ovat liian suuria tai ulkoisia tallennustiloja:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3018,44 +3018,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5-välityspalvelin</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Palvelimelta palautunut virhe: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Tyhjä JSON OAuth2-uudelleenohjauksesta</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ei voitu jäsentää palvelimen palauttamaa JSON:ia: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Vastaus palvelimelta ei sisältänyt kaikkia odotettuja kenttiä</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Kirjautumisvirhe</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3242,19 +3204,6 @@ Note that using any logging command line options will override this setting.</so <translation>Anna käyttäjätiedot</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Muodosta yhteys - %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Kirjaudu selaimellasi</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5308,29 +5257,6 @@ Server replied with error: %2</source> <translation>&Salasana</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Vaihda selaimeen jatkaaksesi.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Yhdistäessä tapahtui virhe. Yritä uudelleen.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Avaa selain uudelleen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopioi linkki</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6250,6 +6176,57 @@ Server replied with error: %2</source> <translation>Vapauta paikallista tilaa</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Palvelimelta palautunut virhe: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Tyhjä JSON OAuth2-uudelleenohjauksesta</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ei voitu jäsentää palvelimen palauttamaa JSON:ia: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Vastaus palvelimelta ei sisältänyt kaikkia odotettuja kenttiä</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Kirjautumisvirhe</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Muodosta yhteys - %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Kirjaudu selaimellasi</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6278,4 +6255,27 @@ Server replied with error: %2</source> <translation>Vanhenee:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Vaihda selaimeen jatkaaksesi.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Yhdistäessä tapahtui virhe. Yritä uudelleen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Avaa selain uudelleen</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopioi linkki</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 36a981b4c749b39d650acd497e46e3343dae4bec..476a0c893a3ecb9bf4896088ce233904063e3667 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -771,7 +771,7 @@ Vous prenez vos propres risques.</translation> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont localisés sur un stockage externe ou qu'ils sont de taille trop importante :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Il y a des dossiers qui ont augmenté de taille au-delà de %1MB: %2</translation> </message> @@ -3036,44 +3036,6 @@ Notez que l'utilisation de toute option de ligne de commande de journalisat <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Erreur renvoyée par le serveur: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Une erreur est survenue en accédant au "jeton" : <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Vider le JSON de la redirection OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Impossible d'analyser le JSON renvoyé par le serveur : <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La réponse du serveur ne contient pas tous les champs attendus</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Erreur de connexion</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Erreur de compte</h1><p>Vous êtes connecté(e) avec le compte <em>%1</em>, mais devez vous connecter avec le compte <em>%2</em>.<br>Merci de vous déconnecter de %3 dans un autre onglet, puis <a href='%4'>cliquez ici</a> et connectez-vous avec %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Notez que l'utilisation de toute option de ligne de commande de journalisat <translation>Saisissez les identifiants de connexion de l'utilisateur</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connexion à %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Connectez vous sur votre navigateur</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Le serveur a répondu avec l'erreur : %2</translation> <translation>&Mot de passe</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Merci de basculer vers votre navigateur pour terminer.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Une erreur s'est produite lors de la connexion. Veuillez ré-essayer.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Redémarrez votre navigateur</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copier le lien</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Le serveur a répondu avec l'erreur : %2</translation> <translation>Libérer de l'espace local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erreur renvoyée par le serveur: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Une erreur est survenue en accédant au "jeton" : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Vider le JSON de la redirection OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Impossible d'analyser le JSON renvoyé par le serveur : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La réponse du serveur ne contient pas tous les champs attendus</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Erreur de connexion</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Erreur de compte</h1><p>Vous êtes connecté(e) avec le compte <em>%1</em>, mais devez vous connecter avec le compte <em>%2</em>.<br>Merci de vous déconnecter de %3 dans un autre onglet, puis <a href='%4'>cliquez ici</a> et connectez-vous avec %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connexion à %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Connectez vous sur votre navigateur</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Le serveur a répondu avec l'erreur : %2</translation> <translation>Expire le :</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Merci de basculer vers votre navigateur pour terminer.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Une erreur s'est produite lors de la connexion. Veuillez ré-essayer.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Redémarrez votre navigateur</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copier le lien</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 10db21b0245236e379076318fd1b4362d34ea768..5baaf0c98dada243d81fa2c4b85aa80699dc29b3 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -773,7 +773,7 @@ Esta acción interromperá calquera sincronización que estea a executarse actua <translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Hai cartafoles que creceron máis aló de %1MB: %2</translation> </message> @@ -3037,44 +3037,6 @@ Teña en conta que o uso de calquera opción da liña de ordes anulara este axus <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Erro devolto dende o servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Produciuse un erro ao acceder ao «testemuño» do punto final: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON baleiro da redirección de OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Non foi posÃbel analizar o JSON devolto dende o servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>A resposta do servidor non contiña todos os campos agardados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Produciuse un erro de acceso</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Conta erróneo</h1><p>Accedeu coa conta <em>%1</em>, mais debe acceder coa conta <em>%2</em>.<br>Peche a sesión de %3 noutra lapela, após <a href='%4'>prema aquÃ</a> e acceda con %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Teña en conta que o uso de calquera opción da liña de ordes anulara este axus <translation>Introduza as credenciais do usuario</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar con %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Acceda no seu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ O servidor respondeu co erro: %2</translation> <translation>&Contrasinal</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Cambie para o seu navegador para proseguir.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Produciuse un erro ao conectarse. Ténteo de novo.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Reabrir o navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar a ligazón</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ O servidor respondeu co erro: %2</translation> <translation>Liberar espazo local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erro devolto dende o servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Produciuse un erro ao acceder ao «testemuño» do punto final: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON baleiro da redirección de OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Non foi posÃbel analizar o JSON devolto dende o servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A resposta do servidor non contiña todos os campos agardados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Produciuse un erro de acceso</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Conta erróneo</h1><p>Accedeu coa conta <em>%1</em>, mais debe acceder coa conta <em>%2</em>.<br>Peche a sesión de %3 noutra lapela, após <a href='%4'>prema aquÃ</a> e acceda con %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar con %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Acceda no seu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ O servidor respondeu co erro: %2</translation> <translation>Caduca:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Cambie para o seu navegador para proseguir.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Produciuse un erro ao conectarse. Ténteo de novo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabrir o navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar a ligazón</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_he.ts b/translations/client_he.ts index 2da7083ff58949abfb4bc18794b164f8e0050320..ce50ca1cd21e23786500d3e02238c916848326ee 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -766,7 +766,7 @@ This action will abort any currently running synchronization.</source> <translation>×™×©× ×Ÿ תיקיות ×©×œ× ×¡×•× ×›×¨× ×• כיוון שהן גדולות מדי ×ו ב×חסון ×—×™×¦×•× ×™:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3012,44 +3012,6 @@ Note that using any logging command line options will override this setting.</so <translation>מתווך SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>חזרה שגי××” מהשרת: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON ריק ×ž×”×¤× ×™×™×ª OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>×œ× × ×™×ª×Ÿ ×œ×¤×¢× ×— ×ת ×”Ö¾JSON שחזר מהשרת: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>התגובה מהשרת ×œ× ×”×›×™×œ×” ×ת כל השדות הצפויי×</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>שגי×ת ×›× ×™×¡×”</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3236,19 +3198,6 @@ Note that using any logging command line options will override this setting.</so <translation>×œ×”×›× ×™×¡ פרטי משתמש</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>להתחבר ×ל %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>×›× ×™×¡×” בדפדפן שלך</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5302,29 +5251,6 @@ Server replied with error: %2</source> <translation>&ססמה</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>× × ×œ×”×—×œ×™×£ לדפדפן שלך כדי להמשיך.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>×ירעה שגי××” בזמן החיבור. × × ×œ× ×¡×•×ª שוב.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>× × ×œ×¤×ª×•×— ×ת הדפדפן מחדש</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>העתקת קישור</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6244,6 +6170,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>חזרה שגי××” מהשרת: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON ריק ×ž×”×¤× ×™×™×ª OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>×œ× × ×™×ª×Ÿ ×œ×¤×¢× ×— ×ת ×”Ö¾JSON שחזר מהשרת: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>התגובה מהשרת ×œ× ×”×›×™×œ×” ×ת כל השדות הצפויי×</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>שגי×ת ×›× ×™×¡×”</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>להתחבר ×ל %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>×›× ×™×¡×” בדפדפן שלך</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6272,4 +6249,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>× × ×œ×”×—×œ×™×£ לדפדפן שלך כדי להמשיך.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>×ירעה שגי××” בזמן החיבור. × × ×œ× ×¡×•×ª שוב.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>× × ×œ×¤×ª×•×— ×ת הדפדפן מחדש</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>העתקת קישור</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 685e2aade5b7b908a94f6dfbd55fbd7f3c1e5696..a7518e54779d634b0ebe1e5360741f901e97979e 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -770,7 +770,7 @@ Ova će radnja prekinuti bilo koju trenutaÄnu sinkronizaciju.</translation> <translation>Ove mape nisu sinkronizirane jer su prevelike ili su vanjski prostori za pohranu: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3033,44 +3033,6 @@ Imajte na umu da će uporaba bilo koje opcije naredbenog retka u vezi sa zapisim <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Poslužitelj je vratio pogreÅ¡ku: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>DoÅ¡lo je do pogreÅ¡ke prilikom pristupanja krajnjoj toÄki „token“: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Prazan JSON s OAuth2 preusmjeravanja</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Nije moguće parsirati JSON koji je vratio poslužitelj: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Odgovor poslužitelja ne sadrži sva oÄekivana polja</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>PogreÅ¡ka pri prijavi</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3257,19 +3219,6 @@ Imajte na umu da će uporaba bilo koje opcije naredbenog retka u vezi sa zapisim <translation>Unesi korisniÄke vjerodajnice</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Poveži s %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Prijavi se u svoj preglednik</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5329,29 +5278,6 @@ Server replied with error: %2</source> <translation>&Zaporka</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Za nastavak prijeÄ‘ite na preglednik.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>DoÅ¡lo je do pogreÅ¡ke tijekom povezivanja. PokuÅ¡ajte ponovno.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Ponovno otvori preglednik</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiraj poveznicu</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6271,6 +6197,57 @@ Server replied with error: %2</source> <translation>Oslobodi lokalni prostor za pohranu</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Poslužitelj je vratio pogreÅ¡ku: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>DoÅ¡lo je do pogreÅ¡ke prilikom pristupanja krajnjoj toÄki „token“: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Prazan JSON s OAuth2 preusmjeravanja</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nije moguće parsirati JSON koji je vratio poslužitelj: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odgovor poslužitelja ne sadrži sva oÄekivana polja</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>PogreÅ¡ka pri prijavi</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Prijavi se u svoj preglednik</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6299,4 +6276,27 @@ Server replied with error: %2</source> <translation>IstjeÄe:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Za nastavak prijeÄ‘ite na preglednik.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>DoÅ¡lo je do pogreÅ¡ke tijekom povezivanja. PokuÅ¡ajte ponovno.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponovno otvori preglednik</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiraj poveznicu</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 67ef29da2d1ee55f831f53a7b63954693c07c927..04d08bdca42a1aa51c98a33ef577f1cb48bddb6e 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -772,7 +772,7 @@ Ez a művelet megszakÃtja a jelenleg futó szinkronizálást.</translation> <translation>Az alábbi mappák nem lettek szinkronizálva, mert túl nagyok, vagy külsÅ‘ tárolók:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3036,44 +3036,6 @@ Ne feledje, hogy a naplózás parancssori kapcsolóinak használata felülbÃrá <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>A kiszolgáló hibát adott vissza: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Hiba történt a „token†végpont elérésekor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Ãœres JSON az OAuth2 átirányÃtásból</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>A kiszolgálótól visszakapott JSON nem dolgozható fel: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>A kiszolgáló válasza nem tartalmazta az összes várt mezÅ‘t</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Bejelentkezési hiba</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Hibás felhasználó</h1><p>A(z) <em>%1</em> fiókkal jelentkezett be, de a(z) <em>%2</em> fiókkal kell belépnie.<br>Jelentkezzen ki ebbÅ‘l egy másik lapon: %3, majd <a href='%4'>kattintson ide</a>, és jelentkezzen be, mint %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Ne feledje, hogy a naplózás parancssori kapcsolóinak használata felülbÃrá <translation>Adja meg a felhasználó hitelesÃtÅ‘ adatait</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Kapcsolódás: %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Bejelentkezés böngészÅ‘ben</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ A kiszolgáló hibával válaszolt: %2</translation> <translation>&Jelszó</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Váltson a böngészÅ‘re a folytatáshoz.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Hiba történt a kapcsolódáskor. Próbálja újra.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>BöngészÅ‘ újranyitása</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Hivatkozás másolása</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ A kiszolgáló hibával válaszolt: %2</translation> <translation>Hely felszabadÃtása ezen az eszközön</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>A kiszolgáló hibát adott vissza: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Hiba történt a „token†végpont elérésekor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Ãœres JSON az OAuth2 átirányÃtásból</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>A kiszolgálótól visszakapott JSON nem dolgozható fel: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A kiszolgáló válasza nem tartalmazta az összes várt mezÅ‘t</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Bejelentkezési hiba</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Hibás felhasználó</h1><p>A(z) <em>%1</em> fiókkal jelentkezett be, de a(z) <em>%2</em> fiókkal kell belépnie.<br>Jelentkezzen ki ebbÅ‘l egy másik lapon: %3, majd <a href='%4'>kattintson ide</a>, és jelentkezzen be, mint %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Kapcsolódás: %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Bejelentkezés böngészÅ‘ben</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ A kiszolgáló hibával válaszolt: %2</translation> <translation>Lejárat:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Váltson a böngészÅ‘re a folytatáshoz.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Hiba történt a kapcsolódáskor. Próbálja újra.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>BöngészÅ‘ újranyitása</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Hivatkozás másolása</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_is.ts b/translations/client_is.ts index 6e6b379ee6e0555c05f68db3d403ea619284f184..54366e7bf87b34ec3084822506b37ed1c2315d64 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -769,7 +769,7 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla gagnageymslur: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3014,44 +3014,6 @@ niðurhals. Uppsetta útgáfan er %3.</p></translation> <translation>SOCKS5 milliþjónn</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Villumelding kom frá þjóninum: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Villa à innskráningu</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3238,19 +3200,6 @@ niðurhals. Uppsetta útgáfan er %3.</p></translation> <translation>Settu inn auðkenni notandans</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Tengjast við %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Skráðu þig inn à vafranum þÃnum</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5306,29 +5255,6 @@ Server replied with error: %2</source> <translation>Ly&kilorð</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Skiptu yfir à vafrann þinn til að halda áfram.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Villa kom upp við tengingu. Endilega reyndu aftur.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Opna vafra aftur</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Afrita tengil</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6252,6 +6178,57 @@ sjálfgefið?</translation> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Villumelding kom frá þjóninum: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Villa à innskráningu</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Tengjast við %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Skráðu þig inn à vafranum þÃnum</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6280,4 +6257,27 @@ sjálfgefið?</translation> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Skiptu yfir à vafrann þinn til að halda áfram.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Villa kom upp við tengingu. Endilega reyndu aftur.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Opna vafra aftur</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Afrita tengil</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_it.ts b/translations/client_it.ts index 8866e7fce000fa3bb62d89b1e92959ba24a63872..c0a3ff51325d4e92584d9add74f59e416c3ede33 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -773,7 +773,7 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3033,44 +3033,6 @@ Nota che l'utilizzo di qualsiasi opzione della riga di comando di registraz <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Messaggio di errore dal server: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Si è verificato un errore durante l'accesso al terminatore dei "token": <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON vuoto dal reindirizzamento OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Impossibile elaborare il JSON restituito dal server: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>La risposta dal server non contiene tutti i campi attesi</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Errore di accesso</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Utente errato</h1><p>Hai effettuato l'accesso con l'utente <em>%1</em>, ma devi accedere con l'utente <em>%2</em>.<br>Chiudi la sessione di %3 in un'altra scheda, poi <a href='%4'>clicca qui</a> e accedi con %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3257,19 +3219,6 @@ Nota che l'utilizzo di qualsiasi opzione della riga di comando di registraz <translation>Digita le credenziali dell'utente</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connetti a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Accedi tramite il tuo browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5323,29 +5272,6 @@ Server replied with error: %2</source> <translation>&Password</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Passa al tuo browser per continuare.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Si è verificato un errore durante la connessione. Prova ancora.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Apri nuovamente il browser</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copia collegamento</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6265,6 +6191,57 @@ Server replied with error: %2</source> <translation>Libera spazio locale</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Messaggio di errore dal server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Si è verificato un errore durante l'accesso al terminatore dei "token": <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON vuoto dal reindirizzamento OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Impossibile elaborare il JSON restituito dal server: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La risposta dal server non contiene tutti i campi attesi</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Errore di accesso</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Utente errato</h1><p>Hai effettuato l'accesso con l'utente <em>%1</em>, ma devi accedere con l'utente <em>%2</em>.<br>Chiudi la sessione di %3 in un'altra scheda, poi <a href='%4'>clicca qui</a> e accedi con %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connetti a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Accedi tramite il tuo browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6293,4 +6270,27 @@ Server replied with error: %2</source> <translation>Scade:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Passa al tuo browser per continuare.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Si è verificato un errore durante la connessione. Prova ancora.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Apri nuovamente il browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copia collegamento</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 9b3cee6545080f3b76f72ba92f5a49691fd712fb..0d7e14b05b8970f6e5eff5746c64a8a27b7520fe 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -770,7 +770,7 @@ This action will abort any currently running synchronization.</source> <translation>大ãã™ãŽãŸã‹ã€å¤–部ストレージã«ã‚ã‚‹ãŸã‚åŒæœŸã•ã‚Œãªã‹ã£ãŸãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãŒã‚ã‚Šã¾ã™:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3032,44 +3032,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5プãƒã‚ã‚·</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>サーãƒãƒ¼ã‹ã‚‰è¿”ã•ã‚ŒãŸã‚¨ãƒ©ãƒ¼ï¼š <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>"トークン"ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã¸ã‚¢ã‚¯ã‚»ã‚¹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼š <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>OAuth2ã®ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã®JSONãŒç©º</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>サーãƒãƒ¼ã‹ã‚‰è¿”ã•ã‚ŒãŸJSONを解æžã§ãã¾ã›ã‚“ã§ã—ãŸï¼š <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>サーãƒãƒ¼ã‹ã‚‰ã®è¿”ä¿¡ã«äºˆæƒ³ã•ã‚Œã‚‹ã™ã¹ã¦ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“ã§ã—ãŸ</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>ãƒã‚°ã‚¤ãƒ³ã‚¨ãƒ©ãƒ¼ </h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3256,19 +3218,6 @@ Note that using any logging command line options will override this setting.</so <translation>ãƒ¦ãƒ¼ã‚¶ãƒ¼è³‡æ ¼æƒ…å ±ã‚’å…¥åŠ›</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>%1 ã«æŽ¥ç¶šä¸</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>ブラウザーã«ãƒã‚°ã‚¤ãƒ³</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5328,29 +5277,6 @@ Server replied with error: %2</source> <translation>パスワード(&P)</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>続行ã™ã‚‹ã«ã¯ã€ãƒ–ラウザーã«åˆ‡ã‚Šæ›¿ãˆã¦ãã ã•ã„。</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>接続ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>ブラウザーをå†åº¦é–‹ã</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>リンクをコピー</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6270,6 +6196,57 @@ Server replied with error: %2</source> <translation>ãƒãƒ¼ã‚«ãƒ«é ˜åŸŸã®ç¢ºä¿</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>サーãƒãƒ¼ã‹ã‚‰è¿”ã•ã‚ŒãŸã‚¨ãƒ©ãƒ¼ï¼š <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>"トークン"ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã¸ã‚¢ã‚¯ã‚»ã‚¹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼š <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>OAuth2ã®ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã®JSONãŒç©º</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>サーãƒãƒ¼ã‹ã‚‰è¿”ã•ã‚ŒãŸJSONを解æžã§ãã¾ã›ã‚“ã§ã—ãŸï¼š <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>サーãƒãƒ¼ã‹ã‚‰ã®è¿”ä¿¡ã«äºˆæƒ³ã•ã‚Œã‚‹ã™ã¹ã¦ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“ã§ã—ãŸ</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>ãƒã‚°ã‚¤ãƒ³ã‚¨ãƒ©ãƒ¼ </h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>%1 ã«æŽ¥ç¶šä¸</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>ブラウザーã«ãƒã‚°ã‚¤ãƒ³</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6298,4 +6275,27 @@ Server replied with error: %2</source> <translation>有効期é™:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>続行ã™ã‚‹ã«ã¯ã€ãƒ–ラウザーã«åˆ‡ã‚Šæ›¿ãˆã¦ãã ã•ã„。</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>接続ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>ブラウザーをå†åº¦é–‹ã</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>リンクをコピー</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 3c692db41dd95bec70c318ae47a6b9f30683a7c5..f7b0c2b8d5e9fa7e375efd0aa37fb89fe8aa6d47 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -432,7 +432,7 @@ Should an account import be attempted?</source> <message> <location filename="../src/gui/accountsettings.cpp" line="94"/> <source>You seem to have the Virtual Files feature enabled on this folder. At the moment, it is not possible to implicitly download virtual files that are end-to-end encrypted. To get the best experience with virtual files and end-to-end encryption, make sure the encrypted folder is marked with "Make always available locally".</source> - <translation>ì´ í´ë”ì— ê°€ìƒ íŒŒì¼ ê¸°ëŠ¥ì´ ì‚¬ìš©ë˜ê³ 있는 것 같습니다. 현재는 종단간 ì•”í˜¸í™”ëœ íŒŒì¼ì„ ìžë™ìœ¼ë¡œ ê°€ìƒ íŒŒì¼ë¡œ ë°›ì„ ìˆ˜ 없습니다. ê°€ìƒ íŒŒì¼ê³¼ 종단간 암호화가 잘 ìž‘ë™í•˜ê²Œ í•˜ë ¤ë©´, ì•”í˜¸í™”ëœ í´ë”ê°€ "í•ìƒ ì´ ìž¥ì¹˜ì— ìœ ì§€"ë˜ë„ë¡ ì§€ì •í•˜ì„¸ìš”.</translation> + <translation>ì´ í´ë”ì— ê°€ìƒ íŒŒì¼ ê¸°ëŠ¥ì´ ì‚¬ìš©ë˜ê³ 있는 것 같습니다. 현재는 종단간 ì•”í˜¸í™”ëœ ê°€ìƒ íŒŒì¼ì„ ìžë™ìœ¼ë¡œ ë°›ì„ ìˆ˜ 없습니다. ê°€ìƒ íŒŒì¼ê³¼ 종단간 암호화가 잘 ìž‘ë™í•˜ê²Œ í•˜ë ¤ë©´, ì•”í˜¸í™”ëœ í´ë”ê°€ "í•ìƒ ì´ ìž¥ì¹˜ì— ìœ ì§€"ë˜ë„ë¡ ì§€ì •í•˜ì„¸ìš”.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="102"/> @@ -447,13 +447,14 @@ Should an account import be attempted?</source> <message> <location filename="../src/gui/accountsettings.cpp" line="116"/> <source>End-to-end Encryption</source> - <translation type="unfinished"/> + <translation>종단간 암호화</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="118"/> <source>This will encrypt your folder and all files within it. These files will no longer be accessible without your encryption mnemonic key. <b>This process is not reversible. Are you sure you want to proceed?</b></source> - <translation type="unfinished"/> + <translation>í´ë”와 ì•ˆì˜ íŒŒì¼ì„ 암호화합니다. 암호화 니모닉 키가 없으면 파ì¼ì— ë” ì´ìƒ ì ‘ê·¼í• ìˆ˜ 없습니다. +<b>ì´ ê³¼ì •ì€ ë˜ëŒë¦´ 수 없습니다. ê³„ì† ì§„í–‰í•˜ê² ìŠµë‹ˆê¹Œ?</b></translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="232"/> @@ -483,17 +484,17 @@ Should an account import be attempted?</source> <message> <location filename="../src/gui/accountsettings.cpp" line="356"/> <source>Please wait for the folder to sync before trying to encrypt it.</source> - <translation type="unfinished"/> + <translation>í´ë”를 암호화하기 ì „ì— ë™ê¸°í™” ë 때까지 ê¸°ë‹¤ë ¤ 주세요.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="358"/> <source>The folder has a minor sync problem. Encryption of this folder will be possible once it has synced successfully</source> - <translation type="unfinished"/> + <translation>í´ë”ì— ì•½ê°„ì˜ ë™ê¸°í™” ë¬¸ì œê°€ 있습니다. ì´ í´ë”를 성공ì 으로 ë™ê¸°í™” í•œ 후 ì•”í˜¸í™”í• ìˆ˜ 있습니다.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="360"/> <source>The folder has a sync error. Encryption of this folder will be possible once it has synced successfully</source> - <translation type="unfinished"/> + <translation>í´ë”ì— ë™ê¸°í™” 오류가 있습니다. ì´ í´ë”를 성공ì 으로 ë™ê¸°í™” í•œ 후 ì•”í˜¸í™”í• ìˆ˜ 있습니다.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="341"/> @@ -533,7 +534,7 @@ Wait for the new sync, then encrypt it.</source> <location filename="../src/gui/accountsettings.cpp" line="535"/> <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Edit Ignored Files</source> - <translation>ë¬´ì‹œëœ íŒŒì¼ ìˆ˜ì •</translation> + <translation>ë¬´ì‹œí• íŒŒì¼ ìˆ˜ì •</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="538"/> @@ -708,7 +709,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="1227"/> <source>Connected to %1.</source> - <translation>%1(으)ë¡œ 연결했습니다.</translation> + <translation>%1ì— ì—°ê²°ë˜ì—ˆìŠµë‹ˆë‹¤.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1231"/> @@ -723,7 +724,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="1237"/> <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source> - <translation type="unfinished"/> + <translation>%1 서버가 현재 ë¦¬ë””ë ‰íŠ¸ ë˜ê³ 있거나, ë‹¹ì‹ ì´ ì¢…ì† í¬í„¸ì— ì—°ê²°ë˜ì–´ 있습니다.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1240"/> @@ -771,9 +772,9 @@ This action will abort any currently running synchronization.</source> <translation>사ì´ì¦ˆê°€ 너무 í¬ê±°ë‚˜ 외부 ì €ìž¥ì†Œì´ë¯€ë¡œ ë™ê¸°í™”ë˜ì§€ ì•Šì€ í´ë”ê°€ 있습니다:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> - <translation type="unfinished"/> + <translation>í¬ê¸°ê°€ %1MB보다 ë” ì»¤ì§„ í´ë”ê°€ 있습니다: %2</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1577"/> @@ -839,7 +840,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountstate.cpp" line="158"/> <source>Redirect detected</source> - <translation type="unfinished"/> + <translation>ë¦¬ë””ë ‰ì…˜ ê°ì§€ë¨</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="160"/> @@ -998,7 +999,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/authenticationdialog.cpp" line="37"/> <source>&Username:</source> - <translation type="unfinished"/> + <translation>&ì‚¬ìš©ìž ì´ë¦„:</translation> </message> <message> <location filename="../src/gui/authenticationdialog.cpp" line="38"/> @@ -1829,27 +1830,28 @@ OpenSSL ë¼ì´ë¸ŒëŸ¬ë¦¬ ì´ìŠˆì¼ 수 있습니다.</translation> <location filename="../src/gui/folder.cpp" line="1364"/> <source>A folder has surpassed the set folder size limit of %1MB: %2. %3</source> - <translation type="unfinished"/> + <translation>í´ë”ê°€ ì„¤ì •ëœ í¬ê¸° ì œí•œì¸ %1MB를 초과했습니다: %2. +%3</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1375"/> <source>Keep syncing</source> - <translation type="unfinished"/> + <translation>ê³„ì† ë™ê¸°í™”</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1383"/> <source>Stop syncing</source> - <translation type="unfinished"/> + <translation>ë™ê¸°í™” 중지</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1394"/> <source>The folder %1 has surpassed the set folder size limit of %2MB.</source> - <translation type="unfinished"/> + <translation>%1 í´ë”ê°€ ì„¤ì •ëœ í¬ê¸° ì œí•œì¸ %2MB를 초과했습니다.</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1395"/> <source>Would you like to stop syncing this folder?</source> - <translation type="unfinished"/> + <translation>ì´ í´ë”ì˜ ë™ê¸°í™”를 ì¤‘ë‹¨í•˜ê² ìŠµë‹ˆê¹Œ?</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1294"/> @@ -2182,23 +2184,23 @@ If this was an accident and you decide to keep your files, they will be re-synce <location filename="../src/gui/folderstatusmodel.cpp" line="1115"/> <source>A few seconds left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> - <translation>수 ì´ˆ 남ìŒ, %2ì˜ %1, %4ì˜ íŒŒì¼ %3</translation> + <translation>수 ì´ˆ 남ìŒ, %2 중 %1, %4ê°œ íŒŒì¼ ì¤‘ %3ê°œ</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="1120"/> <source>%5 left, %1 of %2, file %3 of %4</source> - <translation>%5 남ìŒ, %2ì˜ %1, %4ì˜ íŒŒì¼ %3</translation> + <translation>%5 남ìŒ, %2 중 %1, %4ê°œ íŒŒì¼ ì¤‘ %3ê°œ</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="1129"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> - <translation>%2ì˜ %1, %4ì˜ íŒŒì¼ %3</translation> + <translation>%2 중 %1, %4ê°œ íŒŒì¼ ì¤‘ %3ê°œ</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/> <source>file %1 of %2</source> - <translation>%2ì˜ íŒŒì¼ %1</translation> + <translation>%2ê°œ íŒŒì¼ ì¤‘ %1ê°œ</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="1191"/> @@ -2476,7 +2478,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="234"/> <source>Ask for confirmation before synchronizing new folders larger than</source> - <translation type="unfinished"/> + <translation>다ìŒë³´ë‹¤ í° í´ë”를 ë™ê¸°í™”í• ë•Œ 확ì¸ì„ ìš”ì²</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="249"/> @@ -2487,12 +2489,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="297"/> <source>Notify when synchronised folders grow larger than specified limit</source> - <translation type="unfinished"/> + <translation>ë™ê¸°í™”ëœ í´ë”ê°€ ì§€ì •ëœ í¬ê¸°ë³´ë‹¤ ë” ì»¤ì§ˆ ë•Œ 알림</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="324"/> <source>Automatically disable synchronisation of folders that overcome limit</source> - <translation type="unfinished"/> + <translation>í¬ê¸° ì œí•œì„ ë„˜ëŠ” í´ë”ì˜ ë™ê¸°í™”를 ìžë™ìœ¼ë¡œ 중단</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="273"/> @@ -2502,7 +2504,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="348"/> <source>Move removed files to trash</source> - <translation type="unfinished"/> + <translation>ì œê±°ëœ íŒŒì¼ì„ 휴지통으로 ì´ë™</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="284"/> @@ -2517,7 +2519,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="312"/> <source>Edit &Ignored Files</source> - <translation>ë¬´ì‹œëœ íŒŒì¼ ìˆ˜ì •</translation> + <translation>ë¬´ì‹œí• íŒŒì¼ ìˆ˜ì •</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="319"/> @@ -2635,7 +2637,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> <source>Ignored Files Editor</source> - <translation>ë¬´ì‹œëœ íŒŒì¼ íŽ¸ì§‘ê¸°</translation> + <translation>ë¬´ì‹œí• íŒŒì¼ íŽ¸ì§‘ê¸°</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> @@ -2650,7 +2652,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> - <translation>íŒ¨í„´ì— ì˜í•´ ë¬´ì‹œëœ íŒŒì¼</translation> + <translation>íŒ¨í„´ì„ í†µí•´ ë¬´ì‹œí• íŒŒì¼</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> @@ -3035,45 +3037,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 프ë¡ì‹œ</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>서버로부터 오류가 반환ë˜ì—ˆìŠµë‹ˆë‹¤: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>'í† í°' 종단ì ì— ì•¡ì„¸ìŠ¤í•˜ëŠ” 중 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤: <br><em>%1</em> - </translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>OAuth2 ë¦¬ë””ë ‰ì…˜ì—ì„œ 보낸 빈 JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>서버ì—ì„œ ë°˜í™˜ëœ JSONì„ êµ¬ë¬¸ ë¶„ì„ í• ìˆ˜ 없습니다: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>ì„œë²„ì˜ ì‘ë‹µì— ëª¨ë“ ì˜ˆìƒ í•„ë“œê°€ í¬í•¨ë˜ì§€ 않았습니다.</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>ë¡œê·¸ì¸ ì˜¤ë¥˜</h1> <p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>ìž˜ëª»ëœ ê³„ì •</h1><p>귀하는 ê³„ì • <em>%1</em>(으)ë¡œ 로그ì¸ì„ ì‹œë„하였으나, ê³„ì • <em>%2</em>(으)ë¡œ ë¡œê·¸ì¸ í•´ì•¼í•©ë‹ˆë‹¤. <br>다른 íƒì—ì„œ %3ì„(를) 로그아웃 í•œ 후, <a href='%4'>여기</a>를 í´ë¦í•˜ì—¬ %2(으)ë¡œ ë¡œê·¸ì¸ í•˜ì‹ì‹œì˜¤.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3224,6 @@ Note that using any logging command line options will override this setting.</so <translation>ì‚¬ìš©ìž ì¸ì¦ ì •ë³´ ìž…ë ¥</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>%1ì— ì—°ê²°</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>브ë¼ìš°ì €ì—ì„œ 로그ì¸</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5285,6 @@ Server replied with error: %2</source> <translation>&암호</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>ì§„í–‰ì„ ìœ„í•´ì„œ 브ë¼ìš°ì €ë¥¼ ì „í™˜í•˜ì„¸ìš”.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>연결하는 중 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 다시 ì‹œë„하ì‹ì‹œì˜¤.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>브ë¼ìš°ì €ë¥¼ 다시 열기</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>ë§í¬ 복사</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -5563,7 +5490,7 @@ Server replied with error: %2</source> <message> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="453"/> <source>Allow resharing</source> - <translation type="unfinished"/> + <translation>ìž¬ê³µìœ í—ˆìš©</translation> </message> <message> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="466"/> @@ -6277,6 +6204,58 @@ Server replied with error: %2</source> <translation>로컬 ì €ìž¥ê³µê°„ 확보</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>서버로부터 오류가 반환ë˜ì—ˆìŠµë‹ˆë‹¤: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>'í† í°' 종단ì ì— ì•¡ì„¸ìŠ¤í•˜ëŠ” 중 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤: <br><em>%1</em> + </translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>OAuth2 ë¦¬ë””ë ‰ì…˜ì—ì„œ 보낸 빈 JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>서버ì—ì„œ ë°˜í™˜ëœ JSONì„ êµ¬ë¬¸ ë¶„ì„ í• ìˆ˜ 없습니다: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>ì„œë²„ì˜ ì‘ë‹µì— ëª¨ë“ ì˜ˆìƒ í•„ë“œê°€ í¬í•¨ë˜ì§€ 않았습니다.</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>ë¡œê·¸ì¸ ì˜¤ë¥˜</h1> <p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>ìž˜ëª»ëœ ê³„ì •</h1><p>귀하는 ê³„ì • <em>%1</em>(으)ë¡œ 로그ì¸ì„ ì‹œë„하였으나, ê³„ì • <em>%2</em>(으)ë¡œ ë¡œê·¸ì¸ í•´ì•¼í•©ë‹ˆë‹¤. <br>다른 íƒì—ì„œ %3ì„(를) 로그아웃 í•œ 후, <a href='%4'>여기</a>를 í´ë¦í•˜ì—¬ %2(으)ë¡œ ë¡œê·¸ì¸ í•˜ì‹ì‹œì˜¤.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>%1ì— ì—°ê²°</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>브ë¼ìš°ì €ì—ì„œ 로그ì¸</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6284,27 @@ Server replied with error: %2</source> <translation>만료:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>ì§„í–‰ì„ ìœ„í•´ì„œ 브ë¼ìš°ì €ë¥¼ ì „í™˜í•˜ì„¸ìš”.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>연결하는 중 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 다시 ì‹œë„하ì‹ì‹œì˜¤.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>브ë¼ìš°ì €ë¥¼ 다시 열기</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>ë§í¬ 복사</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 23fdedbbeeb037e889017576a0ed0dad2a412c22..f3756f456f07d7b5a55f3e659540428bb4e234eb 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -766,7 +766,7 @@ This action will abort any currently running synchronization.</source> <translation>Yra aplankų, kurie nebuvo sinchronizuoti dÄ—l to, kad buvo per dideli arba yra iÅ¡orinÄ—s saugyklos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3017,44 +3017,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 įgaliotasis serveris</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Serveris gražino klaidÄ…:<em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Nepavyko iÅ¡analizuoti serverio grąžinto JSON: <br><em> %1 </em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Atsakyme iÅ¡ serverio nebuvo visų tikÄ—tinų laukų</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Prisijungimo klaida</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3241,19 +3203,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ä®raÅ¡ykite prisijungimo duomenis</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Prisijungti prie %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Prisijunkite narÅ¡yklÄ—je</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5307,29 +5256,6 @@ Server replied with error: %2</source> <translation>Sla&ptažodis</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>NorÄ—dami tÄ™sti, persijunkite į savo narÅ¡yklÄ™.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Jungiantis, įvyko klaida. Bandykite dar kartÄ….</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>IÅ¡ naujo atverti narÅ¡yklÄ™</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopijuoti nuorodÄ…</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6249,6 +6175,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Serveris gražino klaidÄ…:<em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nepavyko iÅ¡analizuoti serverio grąžinto JSON: <br><em> %1 </em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Atsakyme iÅ¡ serverio nebuvo visų tikÄ—tinų laukų</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Prisijungimo klaida</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Prisijungti prie %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Prisijunkite narÅ¡yklÄ—je</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6277,4 +6254,27 @@ Server replied with error: %2</source> <translation>Galioja iki:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>NorÄ—dami tÄ™sti, persijunkite į savo narÅ¡yklÄ™.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Jungiantis, įvyko klaida. Bandykite dar kartÄ….</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>IÅ¡ naujo atverti narÅ¡yklÄ™</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopijuoti nuorodÄ…</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 99d83928720bb2c18d0532a3af955d3bed92e273..212198d3362c113dc85fbeb3701125b4a6c39207 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation>Има папки кој не Ñе Ñинхронизирани бидејќи Ñе премногу големи или Ñе надворешни Ñкладишта:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3014,44 +3014,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Грешка иÑпратена од Ñерверот: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Одговорот од Ñерверот не ги Ñодржи Ñите очекувани полиња</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Грешка при најавување</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3238,19 +3200,6 @@ Note that using any logging command line options will override this setting.</so <translation>ВнеÑете акредитиви</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Поврзан Ñо %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Ðајавете Ñе од вашиот прелиÑтувач</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5304,29 +5253,6 @@ Server replied with error: %2</source> <translation>&Лозинка</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Продолжете од вашиот прелиÑтувач.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>ÐаÑтана грешка при обидот за поврзување. Обиди Ñе повторно.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Повторно отвори го прелиÑтувачот</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Копирај линк</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6246,6 +6172,57 @@ Server replied with error: %2</source> <translation>ОÑлободете проÑтор од локалниот диÑк</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Грешка иÑпратена од Ñерверот: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Одговорот од Ñерверот не ги Ñодржи Ñите очекувани полиња</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Грешка при најавување</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Поврзан Ñо %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Ðајавете Ñе од вашиот прелиÑтувач</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6274,4 +6251,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Продолжете од вашиот прелиÑтувач.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>ÐаÑтана грешка при обидот за поврзување. Обиди Ñе повторно.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Повторно отвори го прелиÑтувачот</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Копирај линк</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index ef714e130680574eec9f9049939fa9fbbe3c94b4..2f64aa0283e238cf1729f95ff7e5bbb38da6436b 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -773,7 +773,7 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Det er mapper som har vokst i størrelse utover %1MB: %2</translation> </message> @@ -3036,44 +3036,6 @@ Merk at bruk av alle kommandolinjealternativer for logging vil overstyre denne i <translation>SOCKS5-proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Feil returnert fra serveren: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Det oppsto en feil ved tilgang til "token"-endepunktet: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Tøm JSON fra OAuth2-viderekobling</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Kunne ikke analysere JSON-en som ble returnert fra serveren: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Svaret fra serveren inneholdt ikke alle forventede felt</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Innloggingsfeil</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Feil konto</h1><p>Du logget pÃ¥ med kontoen <em>%1</em>, men mÃ¥ logge pÃ¥ med kontoen <em>%2</em>.<br>Logg deg ut av %3 i en annen fane, <a href='%4'>klikk her</a> og logg pÃ¥ med %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Merk at bruk av alle kommandolinjealternativer for logging vil overstyre denne i <translation>Legg inn pÃ¥loggingsinformasjon</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Koble til %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Logg inn i din nettleser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Server svarte med feil: %2</translation> <translation>&Passord</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Vennligst bytt til nettleseren din for Ã¥ fortsette.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Det oppstod en feil under tilkobling. Vær sÃ¥ snill, prøv pÃ¥ nytt.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>GjenÃ¥pne nettleser</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopier lenke</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Server svarte med feil: %2</translation> <translation>Frigjør lokal plass</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Feil returnert fra serveren: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Det oppsto en feil ved tilgang til "token"-endepunktet: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Tøm JSON fra OAuth2-viderekobling</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kunne ikke analysere JSON-en som ble returnert fra serveren: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Svaret fra serveren inneholdt ikke alle forventede felt</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Innloggingsfeil</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Feil konto</h1><p>Du logget pÃ¥ med kontoen <em>%1</em>, men mÃ¥ logge pÃ¥ med kontoen <em>%2</em>.<br>Logg deg ut av %3 i en annen fane, <a href='%4'>klikk her</a> og logg pÃ¥ med %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Koble til %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Logg inn i din nettleser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Server svarte med feil: %2</translation> <translation>Utløper:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Vennligst bytt til nettleseren din for Ã¥ fortsette.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Det oppstod en feil under tilkobling. Vær sÃ¥ snill, prøv pÃ¥ nytt.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>GjenÃ¥pne nettleser</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopier lenke</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 022b933a1e935051ff77070f7eecad66784ce606..68ddce40c05be568eab058c6f3f7b36873c0b2e8 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -769,7 +769,7 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze te groot zijn of op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3032,44 +3032,6 @@ Merk op dat het gebruik van logging-opdrachtregel opties deze instelling zal ove <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Fout gemeld door de server: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Er treedt een fout op bij het benaderen van het "token" endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Lege JSON van OAuth2 redirect</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Kon de van de server ontvangen JSON niet verwerken: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Het antwoord van de server bevat niet alle verwachte velden</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Inlog fout<p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3256,19 +3218,6 @@ Merk op dat het gebruik van logging-opdrachtregel opties deze instelling zal ove <translation>Vul uw inloggegevens in</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Verbinden met %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Login in je browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5328,29 +5277,6 @@ Server replied with error: %2</source> <translation>&Wachtwoord</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Schakel om naar je browser om door te gaan.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Er trad een verbindingsfout op. Probeer nogmaals.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Heropen browser</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Link kopiëren</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6270,6 +6196,57 @@ Server replied with error: %2</source> <translation>Lokale ruimte vrijmaken</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fout gemeld door de server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Er treedt een fout op bij het benaderen van het "token" endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Lege JSON van OAuth2 redirect</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kon de van de server ontvangen JSON niet verwerken: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Het antwoord van de server bevat niet alle verwachte velden</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Inlog fout<p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Verbinden met %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Login in je browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6298,4 +6275,27 @@ Server replied with error: %2</source> <translation>Verloopt:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Schakel om naar je browser om door te gaan.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Er trad een verbindingsfout op. Probeer nogmaals.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Heropen browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Link kopiëren</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_oc.ts b/translations/client_oc.ts index 50010c4b5a7d7228fbe5d97597a09c730333c2f9..8f98531f53ed9b70ef6dbe2600c72e0cf457fe4c 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3005,44 +3005,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Error d’autentificacion</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3229,19 +3191,6 @@ Note that using any logging command line options will override this setting.</so <translation type="unfinished"/> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connexion a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5295,29 +5244,6 @@ Server replied with error: %2</source> <translation>&Senhal</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Mercés de passar a vòstre navigador per contunhar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Una error s’es producha en se connectant. Mercés de tornar ensajar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Tornar dobrir un navigador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar lo ligam</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6237,6 +6163,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Error d’autentificacion</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connexion a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation type="unfinished"/> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6265,4 +6242,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Mercés de passar a vòstre navigador per contunhar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Una error s’es producha en se connectant. Mercés de tornar ensajar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Tornar dobrir un navigador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar lo ligam</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 91ea31d5e3ded7f9e0cdc751c92337f52ee49296..5455ffb6e9fe759507076b0385ff105a3fcd7358 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -773,7 +773,7 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans <translation>Katalogi te nie zostaÅ‚y zsynchronizowane, ponieważ sÄ… zbyt duże lub znajdujÄ… siÄ™ w magazynach zewnÄ™trznych: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>IstniejÄ… katalogi, których rozmiar przekracza %1MB: %2</translation> </message> @@ -3037,44 +3037,6 @@ Zauważ, że użycie jakichkolwiek opcji wiersza poleceÅ„ logowania spowoduje za <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Serwer zwróciÅ‚ bÅ‚Ä…d: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas uzyskiwania dostÄ™pu do punktu koÅ„cowego "tokena": <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Pusty plik JSON z przekierowania OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Nie można przeanalizować zwróconego z serwera kodu JSON : <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Odpowiedź z serwera nie zawieraÅ‚a wszystkich oczekiwanych zakresów</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>BÅ‚Ä…d logowania</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>NiewÅ‚aÅ›ciwe konto</h1><p> ZalogowaÅ‚eÅ› siÄ™ na konto <em>%1</em>, a powinieneÅ› zalogować siÄ™ na konto <em>%2</em>.<br>Wyloguj siÄ™ z %3 na innej karcie, a nastÄ™pnie <a href='%4'>kliknij tutaj</a> i zaloguj siÄ™ za pomocÄ… %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Zauważ, że użycie jakichkolwiek opcji wiersza poleceÅ„ logowania spowoduje za <translation>Wprowadź poÅ›wiadczenia użytkownika</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>PoÅ‚Ä…cz z %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Zaloguj siÄ™ w przeglÄ…darce</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Serwer odpowiedziaÅ‚ bÅ‚Ä™dem: %2</translation> <translation>&HasÅ‚o</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Przejdź do przeglÄ…darki, aby kontynuować.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas Å‚Ä…czenia. ProszÄ™ spróbować ponownie.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Ponownie otwórz przeglÄ…darkÄ™</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiuj link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Serwer odpowiedziaÅ‚ bÅ‚Ä™dem: %2</translation> <translation>Zwolnij miejsce lokalne</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Serwer zwróciÅ‚ bÅ‚Ä…d: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas uzyskiwania dostÄ™pu do punktu koÅ„cowego "tokena": <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Pusty plik JSON z przekierowania OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nie można przeanalizować zwróconego z serwera kodu JSON : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odpowiedź z serwera nie zawieraÅ‚a wszystkich oczekiwanych zakresów</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>BÅ‚Ä…d logowania</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>NiewÅ‚aÅ›ciwe konto</h1><p> ZalogowaÅ‚eÅ› siÄ™ na konto <em>%1</em>, a powinieneÅ› zalogować siÄ™ na konto <em>%2</em>.<br>Wyloguj siÄ™ z %3 na innej karcie, a nastÄ™pnie <a href='%4'>kliknij tutaj</a> i zaloguj siÄ™ za pomocÄ… %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>PoÅ‚Ä…cz z %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Zaloguj siÄ™ w przeglÄ…darce</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Serwer odpowiedziaÅ‚ bÅ‚Ä™dem: %2</translation> <translation>Wygasa:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Przejdź do przeglÄ…darki, aby kontynuować.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas Å‚Ä…czenia. ProszÄ™ spróbować ponownie.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponownie otwórz przeglÄ…darkÄ™</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiuj link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 26d84cfd9a908d6334e10068d68ed694c30ee046..62fa700ea514b547cc7899306dc24484404818d1 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -766,7 +766,7 @@ This action will abort any currently running synchronization.</source> <translation>Existem pastas que não foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3010,44 +3010,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy de SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Erro devolvido pelo servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Não foi possÃvel processar a resposta JSON retornada pelo servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>A resposta do servidor não contem todos os campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Erro no login</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3234,19 +3196,6 @@ Note that using any logging command line options will override this setting.</so <translation>Insira as credenciais do utilizador</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Ligar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Faça login através do browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5300,29 +5249,6 @@ Server replied with error: %2</source> <translation>&Senha</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Por favor mude para o seu browser para continuar.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ocorreu um erro enquanto ligava. Por favor tente novamente.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Reabrir Navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar ligação</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6242,6 +6168,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erro devolvido pelo servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Não foi possÃvel processar a resposta JSON retornada pelo servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A resposta do servidor não contem todos os campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Erro no login</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Ligar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Faça login através do browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6270,4 +6247,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor mude para o seu browser para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ocorreu um erro enquanto ligava. Por favor tente novamente.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabrir Navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar ligação</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 1dc4d70e7aa04ef4a6370957cc27d06c68f8d234..eb01f3a051c6823687ea50792639b06343f9c97b 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -772,7 +772,7 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr <translation>Existem pastas que não foram sincronizadas porque são muito grandes ou são armazenamentos externos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Existem pastas cujo tamanho aumentou além de %1MB: %2</translation> </message> @@ -3033,44 +3033,6 @@ Note that using any logging command line options will override this setting.</so <translation>Proxy SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Erro retornado pelo servidor: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Ocorreu um erro ao acessar o "token" endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON vazio do redirecionamento OAuth2 </translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Não foi possÃvel analisar o JSON retornado pelo servidor: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>A resposta do servidor não continha todos os campos esperados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Erro de Login</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Conta errada</h1><p>Você fez login com a conta <em>%1</em>, mas deve fazer login com a conta <em>%2</em>.<br>Por favor, saia de %3 em outra guia, então<a href='%4'>click aqui</a> e inicie sessão com %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3257,19 +3219,6 @@ Note that using any logging command line options will override this setting.</so <translation>Entre com as credenciais do usuário</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectar a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Faça login no seu navegador</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5332,29 +5281,6 @@ Servidor respondeu com erro: %2</translation> <translation>&Senha</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Mude para o seu navegador para prosseguir.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ocorreu um erro durante a conexão. Tente novamente.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Reabrir o navegador</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiar link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6274,6 +6200,57 @@ Servidor respondeu com erro: %2</translation> <translation>Libere espaço local </translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erro retornado pelo servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Ocorreu um erro ao acessar o "token" endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON vazio do redirecionamento OAuth2 </translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Não foi possÃvel analisar o JSON retornado pelo servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A resposta do servidor não continha todos os campos esperados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Erro de Login</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Conta errada</h1><p>Você fez login com a conta <em>%1</em>, mas deve fazer login com a conta <em>%2</em>.<br>Por favor, saia de %3 em outra guia, então<a href='%4'>click aqui</a> e inicie sessão com %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectar a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Faça login no seu navegador</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6302,4 +6279,27 @@ Servidor respondeu com erro: %2</translation> <translation>Expira em:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Mude para o seu navegador para prosseguir.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ocorreu um erro durante a conexão. Tente novamente.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabrir o navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_ro.ts b/translations/client_ro.ts index ae195b9301bad2029e67ae6d67e2893f576d0c5e..1450b55ca4fb9ac6640c3c9188ce2401fa292fe5 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -770,7 +770,7 @@ Această acÈ›iune va opri toate sincronizările în derulare din acest moment.</ <translation>Există dosare ce nu au fost sinscronizate deoarece acestea sunt prea mari sau se află pe stocarea externă:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3021,44 +3021,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Eroare returnată de server: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Eroare la autentificare</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3245,19 +3207,6 @@ Note that using any logging command line options will override this setting.</so <translation>Introdu datele de autentificare</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Conectează-te la %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Autentifică-te în Browser</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5309,29 +5258,6 @@ Server replied with error: %2</source> <translation>&Parolă</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Copiză link</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6251,6 +6177,57 @@ Server replied with error: %2</source> <translation>EliberaÈ›i spaÈ›iu local</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Eroare returnată de server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Eroare la autentificare</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Conectează-te la %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Autentifică-te în Browser</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6279,4 +6256,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiză link</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_ru.ts b/translations/client_ru.ts index f1e384fcf85183630d1b19c0d8d1d5e143f8a8bc..b6496da9dfdc804c8761a226f3f007bc54d6d29c 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -770,7 +770,7 @@ This action will abort any currently running synchronization.</source> <translation>ЕÑÑ‚ÑŒ папки, которые не были Ñинхронизированы, так как их размер превышает уÑтановленное ограничение или они ÑвлÑÑŽÑ‚ÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼Ð¸ хранилищами:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3031,44 +3031,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5-прокÑи</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Сервер вернул ошибку: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Ошибка при доÑтупе к механизму обработки токенов: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>При перенаправлении Ñ Oauth2 получен пуÑтой ответ в формате JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ðе удалоÑÑŒ разобрать JSON, полученный Ñ Ñервера: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Ð’ ответе Ñервера ÑодержатÑÑ Ð½Ðµ вÑе ожидаемые полÑ</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Ошибка входа</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ</h1><p>Ð’Ñ‹ вошли Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью <em>%1</em>, но нужно войти Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью <em>%2</em>.<br>Выйдите из %3 в другой вкладке, а затем <a href='%4'>нажмите здеÑÑŒ</a> и войдите Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью %2</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3255,19 +3217,6 @@ Note that using any logging command line options will override this setting.</so <translation>Ввод учётных данных</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>ПодключитьÑÑ Ðº %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Выполнить вход в браузере</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5329,29 +5278,6 @@ Server replied with error: %2</source> <translation>&Пароль</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>ПожалуйÑта, перейдите в браузер, чтобы продолжить.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ошибка во Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑоединениÑ, попробуйте ещё раз.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Повторно открыть браузер</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Скопировать ÑÑылку</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6271,6 +6197,57 @@ Server replied with error: %2</source> <translation>ОÑвободить меÑто на локальном диÑке</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Сервер вернул ошибку: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Ошибка при доÑтупе к механизму обработки токенов: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>При перенаправлении Ñ Oauth2 получен пуÑтой ответ в формате JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ðе удалоÑÑŒ разобрать JSON, полученный Ñ Ñервера: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Ð’ ответе Ñервера ÑодержатÑÑ Ð½Ðµ вÑе ожидаемые полÑ</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Ошибка входа</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ</h1><p>Ð’Ñ‹ вошли Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью <em>%1</em>, но нужно войти Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью <em>%2</em>.<br>Выйдите из %3 в другой вкладке, а затем <a href='%4'>нажмите здеÑÑŒ</a> и войдите Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑью %2</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>ПодключитьÑÑ Ðº %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Выполнить вход в браузере</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6299,4 +6276,27 @@ Server replied with error: %2</source> <translation>ИÑтекает:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>ПожалуйÑта, перейдите в браузер, чтобы продолжить.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ошибка во Ð²Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑоединениÑ, попробуйте ещё раз.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Повторно открыть браузер</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Скопировать ÑÑылку</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 24f00e5e9b8773345474478cc21a11318d38f0d1..2470f350e7ab7df87b9149132022ce0c25798ce1 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -770,7 +770,7 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca sunt tropu mannas o memòrias de archiviatziones de foras:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3034,44 +3034,6 @@ Cà stia chi s'impreu de cale si siat optzione de sa riga de cumandu de regi <translation>Serbidore intermèdiu de SOCKS5 </translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Errore torradu dae su serbidore: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>B'at à pidu un'errore intrende a su terminadore de is "token": <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON bòidos dae sa re-aderetada a OAuth2 </translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation> Non faghet a elaborare su JSON torradu dae su serbidore: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Sa risposta de su serbidore non cuntenet is campos isetados</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Errore de identificatzione</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3258,19 +3220,6 @@ Cà stia chi s'impreu de cale si siat optzione de sa riga de cumandu de regi <translation>Inserta credentziales de s'utente</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Connete a %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Intra in su navigadore tuo</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5329,29 +5278,6 @@ Server replied with error: %2</source> <translation>&Crae</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Pro praghere passa a su navigadore tuo pro sighire.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>B'at à pidu un'errore connetende. Proa torra.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Torra a abèrrere su navigadore</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Còpia ligòngiu</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6271,6 +6197,57 @@ Server replied with error: %2</source> <translation>Faghe logu </translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Errore torradu dae su serbidore: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>B'at à pidu un'errore intrende a su terminadore de is "token": <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>JSON bòidos dae sa re-aderetada a OAuth2 </translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation> Non faghet a elaborare su JSON torradu dae su serbidore: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Sa risposta de su serbidore non cuntenet is campos isetados</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Errore de identificatzione</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Connete a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Intra in su navigadore tuo</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6299,4 +6276,27 @@ Server replied with error: %2</source> <translation>Iscadet:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Pro praghere passa a su navigadore tuo pro sighire.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>B'at à pidu un'errore connetende. Proa torra.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Torra a abèrrere su navigadore</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Còpia ligòngiu</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_sk.ts b/translations/client_sk.ts index b32788390597d3c6229dff93aaf17578360afe5f..b25814ea7c3f7f565c003cd33e116340ee9777c8 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -770,7 +770,7 @@ Táto akcia zruÅ¡Ã vÅ¡etky prebiehajúce synchronizácie.</translation> <translation>Niektoré prieÄinky neboli synchronizované, pretože sú prÃliÅ¡ veľké alebo sú na externom úložisku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3033,44 +3033,6 @@ Upozorňujeme, že použitie akýchkoľvek prÃkazov pre logovanie z prÃkazové <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Chyba vrátená zo servera: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Chyba pri prÃstupe k 'tokenu' endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Prázdny JSON z presmerovania OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Nie je možné spracovaÅ¥ JSON odpoveÄ zo servera: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>OdpoveÄ zo servera neobsahovala vÅ¡etky oÄakávané polia</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Chyba prihlásenia</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Chybný úÄet</h1><p>Prihlásili ste sa ako užÃvateľ <em>%1</em>, ale je potrebné sa prihlásiÅ¥ ako <em>%2</em>.<br>Odhláste %3 v inej karte, potom <a href='%4'>kliknite sem</a> a prihláste sa ako užÃvateľ %2</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3257,19 +3219,6 @@ Upozorňujeme, že použitie akýchkoľvek prÃkazov pre logovanie z prÃkazové <translation>Vložte prihlasovacie údaje</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>PripojiÅ¥ sa k %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Prihlásenie sa v prehliadaÄi</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5329,29 +5278,6 @@ Server replied with error: %2</source> <translation>&Heslo</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Ak chcete pokraÄovaÅ¥, prepnite sa prosÃm do svojho prehliadaÄa.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Pri pripájanà sa vyskytla chyba. ProsÃm skúste znova.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Znovu otvoriÅ¥ prehliadaÄ</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>KopÃrovaÅ¥ odkaz</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6271,6 +6197,57 @@ Server replied with error: %2</source> <translation>UvoľniÅ¥ lokálny priestor</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Chyba vrátená zo servera: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Chyba pri prÃstupe k 'tokenu' endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Prázdny JSON z presmerovania OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nie je možné spracovaÅ¥ JSON odpoveÄ zo servera: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>OdpoveÄ zo servera neobsahovala vÅ¡etky oÄakávané polia</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Chyba prihlásenia</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Chybný úÄet</h1><p>Prihlásili ste sa ako užÃvateľ <em>%1</em>, ale je potrebné sa prihlásiÅ¥ ako <em>%2</em>.<br>Odhláste %3 v inej karte, potom <a href='%4'>kliknite sem</a> a prihláste sa ako užÃvateľ %2</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>PripojiÅ¥ sa k %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Prihlásenie sa v prehliadaÄi</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6299,4 +6276,27 @@ Server replied with error: %2</source> <translation>PlatnosÅ¥ konÄÃ:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Ak chcete pokraÄovaÅ¥, prepnite sa prosÃm do svojho prehliadaÄa.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Pri pripájanà sa vyskytla chyba. ProsÃm skúste znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Znovu otvoriÅ¥ prehliadaÄ</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>KopÃrovaÅ¥ odkaz</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 35306ff7386c125dd22ecc9b49da41785f75d8fb..06e1f47e225bc3b67fe2f71a69b7110a2810d34e 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -770,7 +770,7 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans <translation>Zaznane so mape, ki zaradi omejitve velikosti, ali zato, ker so del zunanje shrambe, niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3033,44 +3033,6 @@ Uporaba kateregakoli argumenta z ukazom v ukazni vrstici prepiÅ¡e to nastavitev. <translation>PosredniÅ¡ki strežnik SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>S strežnika je prejet odziv o napaki: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>PriÅ¡lo je do napake med dostopom do konÄne toÄke »žetona«: <br><em>%1</em>.</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Preusmeritev OAuth2 prek prazne vsebine JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ni mogoÄe razÄleniti zapisa JSON, vrnjenega s strežnika: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Odziv strežnika ne vkljuÄuje vseh priÄakovanih polj</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Napaka prijave</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3257,19 +3219,6 @@ Uporaba kateregakoli argumenta z ukazom v ukazni vrstici prepiÅ¡e to nastavitev. <translation>VpiÅ¡i uporabniÅ¡ka poverila</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Vzpostavi povezavo s strežnikom %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Prijava v brskalniku</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5329,29 +5278,6 @@ Server replied with error: %2</source> <translation>&Geslo</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Za nadaljevanje preklopite na brskalnik.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Med vzpostavljanjem povezave je priÅ¡lo do napake. Poskusite znova.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Ponovno odpri brskalnik</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiraj povezavo</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6271,6 +6197,57 @@ Server replied with error: %2</source> <translation>Sprostite krajevno shrambo</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>S strežnika je prejet odziv o napaki: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>PriÅ¡lo je do napake med dostopom do konÄne toÄke »žetona«: <br><em>%1</em>.</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Preusmeritev OAuth2 prek prazne vsebine JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ni mogoÄe razÄleniti zapisa JSON, vrnjenega s strežnika: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odziv strežnika ne vkljuÄuje vseh priÄakovanih polj</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Napaka prijave</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Vzpostavi povezavo s strežnikom %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Prijava v brskalniku</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6299,4 +6276,27 @@ Server replied with error: %2</source> <translation>PoteÄe:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Za nadaljevanje preklopite na brskalnik.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Med vzpostavljanjem povezave je priÅ¡lo do napake. Poskusite znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponovno odpri brskalnik</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiraj povezavo</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_sr.ts b/translations/client_sr.ts index afc8e7f38983b411315c64e16b42f3ec5dc13aff..ba9246e06a200aa57fa60392c22a2564c2657c0f 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -773,7 +773,7 @@ This action will abort any currently running synchronization.</source> <translation>Ово Ñу фаÑцикле које ниÑу Ñинхронизоване зато што Ñу превелике или Ñу на Ñпољним Ñкладиштима:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Има фолдера чија је величина нараÑла преко %1MB: %2</translation> </message> @@ -3037,44 +3037,6 @@ Note that using any logging command line options will override this setting.</so <translation>СОКС-5 прокÑи</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Грешка враћена Ñа Ñервера: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Дошло је до грешке приликом обраде „token†приÑтупне тачке: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Примљен је празан JSON као OAuth2 преуÑмеравање</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ðе могу да парÑирам JSON враћен Ñа Ñервера: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Одговор Ñа Ñервера није Ñадржао Ñва очекивана поља</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Грешка пријављивања</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Погрешан налог</h1><p>Пријавили Ñте Ñе кориÑтећи налог <em>%1</em>, али морате да Ñе пријавите кориÑтећи налог <em>%2</em>.<br>Молимо Ð²Ð°Ñ Ð´Ð° Ñе одјавите Ñа налога %3 у другој картици, па да затим <a href='%4'>кликнете овде</a> и пријавите Ñе кориÑтећи налог %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Note that using any logging command line options will override this setting.</so <translation>УнеÑите кориÑничке акредитиве</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Повежи %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Пријавите Ñе из веб читача</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Server replied with error: %2</source> <translation>&Лозинка</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Пребаците Ñе на веб читач да наÑтавите.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Догодила Ñе грешка при повезивању. Покушајте поново.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Отворите веб читач поново</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Копирај везу</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Server replied with error: %2</source> <translation>ОÑлободи локални проÑтор</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Грешка враћена Ñа Ñервера: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Дошло је до грешке приликом обраде „token†приÑтупне тачке: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Примљен је празан JSON као OAuth2 преуÑмеравање</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ðе могу да парÑирам JSON враћен Ñа Ñервера: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Одговор Ñа Ñервера није Ñадржао Ñва очекивана поља</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Грешка пријављивања</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Погрешан налог</h1><p>Пријавили Ñте Ñе кориÑтећи налог <em>%1</em>, али морате да Ñе пријавите кориÑтећи налог <em>%2</em>.<br>Молимо Ð²Ð°Ñ Ð´Ð° Ñе одјавите Ñа налога %3 у другој картици, па да затим <a href='%4'>кликнете овде</a> и пријавите Ñе кориÑтећи налог %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Повежи %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Пријавите Ñе из веб читача</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Server replied with error: %2</source> <translation>ИÑтиче:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Пребаците Ñе на веб читач да наÑтавите.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Догодила Ñе грешка при повезивању. Покушајте поново.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Отворите веб читач поново</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Копирај везу</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_sv.ts b/translations/client_sv.ts index d1b668d6c8302110c4b8457703ec0334e31da02e..9ee571321570b8ce8dc7edeef556fe38092a0575 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -773,7 +773,7 @@ Den här Ã¥tgärden avbryter alla synkroniseringar som körs.</translation> <translation>Det finns mappar som inte blivit synkroniserade pÃ¥ grund av att de är för stora eller är externa lagringsytor: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Det finns mappar som har vuxit i storlek större än %1MB: %2</translation> </message> @@ -3037,44 +3037,6 @@ Observera att om du använder kommandoradsalternativ för loggning kommer den h <translation>SOCKS5 proxy</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Fel returnerat frÃ¥n server: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Fel uppstod vid Ã¥tkomst till "token"-endpoint: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Tom JSON frÃ¥n OAuth2-ompekning</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Kunde inte para JSON som returnerades frÃ¥n servern: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Svaret frÃ¥n servern innehöll inte alla förväntade fält</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Inloggningsfel</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Fel konto</h1><p>Du loggade in med konto <em>%1</em>, men mÃ¥ste logga in med konto <em>%2</em>.<br>Logga ut frÃ¥n %3 i en annan flik, sedan <a href='%4'>klicka här</a> och logga in med %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Observera att om du använder kommandoradsalternativ för loggning kommer den h <translation>Ange inloggningsuppgifter</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>Anslut till %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Logga in i din webbläsare</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Servern svarade med fel: %2</translation> <translation>&Lösenord</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Vänligen växla till webbläsaren för att fortsätta.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Ett fel inträffade vid anslutning. Försök igen.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Ã…teröppna webbläsaren</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Kopiera länk</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Servern svarade med fel: %2</translation> <translation>Frigör lokalt utrymme</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fel returnerat frÃ¥n server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Fel uppstod vid Ã¥tkomst till "token"-endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>Tom JSON frÃ¥n OAuth2-ompekning</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kunde inte para JSON som returnerades frÃ¥n servern: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Svaret frÃ¥n servern innehöll inte alla förväntade fält</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Inloggningsfel</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Fel konto</h1><p>Du loggade in med konto <em>%1</em>, men mÃ¥ste logga in med konto <em>%2</em>.<br>Logga ut frÃ¥n %3 i en annan flik, sedan <a href='%4'>klicka här</a> och logga in med %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Anslut till %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Logga in i din webbläsare</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Servern svarade med fel: %2</translation> <translation>Förfaller:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Vänligen växla till webbläsaren för att fortsätta.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ett fel inträffade vid anslutning. Försök igen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ã…teröppna webbläsaren</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiera länk</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_th.ts b/translations/client_th.ts index 87f69da655cef3e4a105c698d6b24358255e2070..fca26aa40f3c3605bbc8d56082e040f4860daff3 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -769,7 +769,7 @@ This action will abort any currently running synchronization.</source> <translation>มีบางโฟลเดà¸à¸£à¹Œà¸—ี่ไม่ถูà¸à¸‹à¸´à¸‡à¹‚ครไนซ์เพราะมีขนาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป หรืà¸à¹€à¸›à¹‡à¸™à¸žà¸·à¹‰à¸™à¸—ี่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ ายนà¸à¸:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation type="unfinished"/> </message> @@ -3015,44 +3015,6 @@ Note that using any logging command line options will override this setting.</so <translation>พร็à¸à¸à¸‹à¸µ SOCKS5</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>ไม่สามารถà¹à¸¢à¸à¸§à¸´à¹€à¸„ราะห์ JSON ที่ส่งมาจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>à¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹„ม่ได้มีฟิลด์ที่ต้à¸à¸‡à¸à¸²à¸£à¸—ั้งหมด</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>ไม่สามารถเข้าสู่ระบบ</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3239,19 +3201,6 @@ Note that using any logging command line options will override this setting.</so <translation>ป้à¸à¸™à¸‚้à¸à¸¡à¸¹à¸¥à¸›à¸£à¸°à¸ˆà¸³à¸•à¸±à¸§à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ปยัง %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>เข้าสู่ระบบในเบราว์เซà¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5304,29 +5253,6 @@ Server replied with error: %2</source> <translation>&รหัสผ่าน</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>à¸à¸£à¸¸à¸“าดำเนินà¸à¸²à¸£à¸•à¹ˆà¸à¸šà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>เปิดเบราว์เซà¸à¸£à¹Œà¸à¸µà¸à¸„รั้ง</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6246,6 +6172,57 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>ไม่สามารถà¹à¸¢à¸à¸§à¸´à¹€à¸„ราะห์ JSON ที่ส่งมาจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>à¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹„ม่ได้มีฟิลด์ที่ต้à¸à¸‡à¸à¸²à¸£à¸—ั้งหมด</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>ไม่สามารถเข้าสู่ระบบ</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ปยัง %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>เข้าสู่ระบบในเบราว์เซà¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6274,4 +6251,27 @@ Server replied with error: %2</source> <translation type="unfinished"/> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>à¸à¸£à¸¸à¸“าดำเนินà¸à¸²à¸£à¸•à¹ˆà¸à¸šà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>เปิดเบราว์เซà¸à¸£à¹Œà¸à¸µà¸à¸„รั้ง</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 3d6f4a72af102ee1c4ecbd11dc985cc3341d8862..e2f00c4895a9d5ad64322c707460121ee4c114df 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -773,7 +773,7 @@ Bu iÅŸlem ÅŸu anda yürütülmekte olan eÅŸitleme iÅŸlemlerini durdurur.</transl <translation>Çok büyük oldukları için ya da dış depolama alanında bulundukları için eÅŸitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>Boyutu %1MB deÄŸerini aÅŸan klasörler var: %2</translation> </message> @@ -3036,44 +3036,6 @@ Komut satırından verilen günlük komutlarının bu ayarın yerine geçeceÄŸin <translation>SOCKS5 vekil sunucu</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Sunucudan hata yanıtı alındı: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>"kod" uç noktasına eriÅŸilirken bir sorun çıktı: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>OAuth2 yönlendirmesinden gelen JSON boÅŸ</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Sunucudan alınan JSON iÅŸlenemedi: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Sunucudan alınan yanıtta beklenen tüm alanlar yok</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Oturum açma sorunu</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Hesap yanlış</h1><p><em>%1</em> hesabıyla oturum açtınız. Ancak <em>%2</em> hesabıyla oturum açmalıydınız.<br>Lütfen baÅŸka bir sekmde %3 oturumunu kapatın ve <a href='%4'>buraya tıklayarak</a> %2 ile oturum açın.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3260,19 +3222,6 @@ Komut satırından verilen günlük komutlarının bu ayarın yerine geçeceÄŸin <translation>Kullanıcı kimlik doÄŸrulama bilgilerini yazın</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>%1 ile baÄŸlan</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>Tarayıcınızda oturum açın</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5334,29 +5283,6 @@ Sunucunun verdiÄŸi hata yanıtı: %2</translation> <translation>&Parola</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Lütfen iÅŸlemi yapmak için tarayıcınıza geçin</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>BaÄŸlantı kurulurken bir sorun çıktı. Lütfen yeniden deneyin.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Tarayıcıyı yeniden aç</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>BaÄŸlantıyı kopyala</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6276,6 +6202,57 @@ Sunucunun verdiÄŸi hata yanıtı: %2</translation> <translation>Yerelden kaldırıp yer aç</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Sunucudan hata yanıtı alındı: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>"kod" uç noktasına eriÅŸilirken bir sorun çıktı: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>OAuth2 yönlendirmesinden gelen JSON boÅŸ</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Sunucudan alınan JSON iÅŸlenemedi: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Sunucudan alınan yanıtta beklenen tüm alanlar yok</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Oturum açma sorunu</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Hesap yanlış</h1><p><em>%1</em> hesabıyla oturum açtınız. Ancak <em>%2</em> hesabıyla oturum açmalıydınız.<br>Lütfen baÅŸka bir sekmde %3 oturumunu kapatın ve <a href='%4'>buraya tıklayarak</a> %2 ile oturum açın.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>%1 ile baÄŸlan</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Tarayıcınızda oturum açın</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6304,4 +6281,27 @@ Sunucunun verdiÄŸi hata yanıtı: %2</translation> <translation>Geçerlilik süresi sonu:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Lütfen iÅŸlemi yapmak için tarayıcınıza geçin</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>BaÄŸlantı kurulurken bir sorun çıktı. Lütfen yeniden deneyin.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Tarayıcıyı yeniden aç</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>BaÄŸlantıyı kopyala</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_uk.ts b/translations/client_uk.ts index cd3927ffd0576d11d77689a08234cd2e8bba048a..e86059ac03b438d59b3b1f92310e38160ef44bef 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -773,7 +773,7 @@ This action will abort any currently running synchronization.</source> <translation>Окремі каталоги не було Ñинхронізовано, оÑкільки їхній розмір завеликий або розміщені у зовнішніх Ñховищах:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>ВиÑвлено %2 каталогів, розмір Ñких збільшивÑÑ Ð¿Ð¾Ð·Ð° вÑтановленим обмеженнÑм %1MB</translation> </message> @@ -3037,44 +3037,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 прокÑÑ–</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>Сервер повернув помилку: <em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>Помилка з доÑтупом до "токена" на кінцевій точці: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>ПереÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð³Ð¾ JSON з OAuth2</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Ðеможливо обробити JSON, Ñкий повернув Ñервер: <br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>Відповідь Ñервера не міÑтить вÑÑ– очікувані полÑ</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Помилка із входом</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>Ðеправильна обліковка</h1><p>Ви увійшли під обліковим запиÑом<em></em>, але маєте бути <em></em>.<br>Будь лаÑка, вийдіть з %3 у іншій вкладці, далі<a href='%4'>клацніть тут</a> та увійдіть під %2.</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Note that using any logging command line options will override this setting.</so <translation>Вказати облікові дані</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>З'єднати з %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>ÐвторизуйтеÑÑ Ñƒ вашому браузері</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Server replied with error: %2</source> <translation>&Пароль</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Будь лаÑка, перейдіть до вашого переглÑдача Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Помилка під Ñ‡Ð°Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'єднаннÑ. Спробуйте ще раз.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Відкрити переглÑдач</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>Копіювати поÑиланнÑ</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Server replied with error: %2</source> <translation>Звільнити міÑце на приÑтрої</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Сервер повернув помилку: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>Помилка з доÑтупом до "токена" на кінцевій точці: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>ПереÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð³Ð¾ JSON з OAuth2</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Ðеможливо обробити JSON, Ñкий повернув Ñервер: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Відповідь Ñервера не міÑтить вÑÑ– очікувані полÑ</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Помилка із входом</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>Ðеправильна обліковка</h1><p>Ви увійшли під обліковим запиÑом<em></em>, але маєте бути <em></em>.<br>Будь лаÑка, вийдіть з %3 у іншій вкладці, далі<a href='%4'>клацніть тут</a> та увійдіть під %2.</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>З'єднати з %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>ÐвторизуйтеÑÑ Ñƒ вашому браузері</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Server replied with error: %2</source> <translation>Термін дії:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Будь лаÑка, перейдіть до вашого переглÑдача Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Помилка під Ñ‡Ð°Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'єднаннÑ. Спробуйте ще раз.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Відкрити переглÑдач</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Копіювати поÑиланнÑ</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 6f9ecccb57085cd7981a784745145ff48bffa7e1..a02539ddfc0333671ec5769c79e91ca464554f89 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -769,7 +769,7 @@ This action will abort any currently running synchronization.</source> <translation>以下目录由于太大或是外部å˜å‚¨è€Œæ²¡æœ‰åŒæ¥ï¼š</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>有些文件夹的大å°å·²è¶…过 %1MB: %2</translation> </message> @@ -3030,44 +3030,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 代ç†</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>æœåŠ¡å™¨è¿”回错误:<em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>访问 "token" 端点时出错:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>æ¥è‡ª OAuth2 é‡å®šå‘的空 JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>æ— æ³•è§£æžä»ŽæœåŠ¡å™¨è¿”回的JSONä¿¡æ¯ï¼š<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>æœåŠ¡å™¨æ²¡æœ‰å›žå¤é¢„期的å—段</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>登录错误</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>è´¦å·é”™è¯¯</h1><p>您已使用 <em>%1</em> è´¦å·ç™»å…¥ï¼Œä½†å¿…é¡»ä½¿ç”¨è´¦å· <em>%2</em>登录。<br>请在å¦ä¸€ä¸ªé¡µé¢ä¸ç™»å‡º %3,然åŽ<a href='%4'>点击æ¤å¤„</a>并使用 %2 登录。</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3254,19 +3216,6 @@ Note that using any logging command line options will override this setting.</so <translation>输入用户密ç </translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>连接到 %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>在æµè§ˆå™¨ä¸ç™»å½•</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5322,29 +5271,6 @@ Server replied with error: %2</source> <translation>密ç (&P)</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>请切æ¢åˆ°æ‚¨çš„æµè§ˆå™¨ç»§ç»ã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>连接时å‘生错误。请é‡è¯•ã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>é‡æ–°æ‰“å¼€æµè§ˆå™¨</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>å¤åˆ¶é“¾æŽ¥</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6264,6 +6190,57 @@ Server replied with error: %2</source> <translation>释放本地空间</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>æœåŠ¡å™¨è¿”回错误:<em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>访问 "token" 端点时出错:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>æ¥è‡ª OAuth2 é‡å®šå‘的空 JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>æ— æ³•è§£æžä»ŽæœåŠ¡å™¨è¿”回的JSONä¿¡æ¯ï¼š<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>æœåŠ¡å™¨æ²¡æœ‰å›žå¤é¢„期的å—段</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>登录错误</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>è´¦å·é”™è¯¯</h1><p>您已使用 <em>%1</em> è´¦å·ç™»å…¥ï¼Œä½†å¿…é¡»ä½¿ç”¨è´¦å· <em>%2</em>登录。<br>请在å¦ä¸€ä¸ªé¡µé¢ä¸ç™»å‡º %3,然åŽ<a href='%4'>点击æ¤å¤„</a>并使用 %2 登录。</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>连接到 %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>在æµè§ˆå™¨ä¸ç™»å½•</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6292,4 +6269,27 @@ Server replied with error: %2</source> <translation>过期:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>请切æ¢åˆ°æ‚¨çš„æµè§ˆå™¨ç»§ç»ã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>连接时å‘生错误。请é‡è¯•ã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>é‡æ–°æ‰“å¼€æµè§ˆå™¨</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>å¤åˆ¶é“¾æŽ¥</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 4924c91fb02ecfa6736c351e5c5e322f0487f636..6fe7758e20a44f9f74b07e51c1473b8138fca0af 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -774,7 +774,7 @@ This action will abort any currently running synchronization.</source> <translation>æœ‰éƒ¨åˆ†è³‡æ–™å¤¾å› ç‚ºå®¹é‡å¤ªå¤§æˆ–是外部å˜å„²æ²’有辦法åŒæ¥ï¼š </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>有些資料夾的大å°å·²è¶…éŽ %1MB:%2</translation> </message> @@ -3038,44 +3038,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 代ç†ä¼ºæœå™¨</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>伺æœå™¨å›žè¦†éŒ¯èª¤ï¼š<em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>å˜å–權æ–進入點發生錯誤:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>收到來自OAuth2é‡å®šå‘的空JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>無法解æžä¼ºæœå™¨ç™¼å›žçš„JSON:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>伺æœå™¨çš„回應沒有包å«æ‰€æœ‰é 期的欄ä½</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>登入錯誤</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>錯誤的帳戶</h1><p>您使用帳戶 <em>%1</em> ç™»éŒ„ï¼Œä½†å¿…é ˆä½¿ç”¨å¸³æˆ¶ <em>%2</em>。<br>請在å¦ä¸€å€‹é¸é …å¡ä¸é€€å‡º %3,然後<a href='%4'>單擊æ¤è™•</a>並使用 %2 登錄。</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3262,19 +3224,6 @@ Note that using any logging command line options will override this setting.</so <translation>請輸入用戶身分驗è‰</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>連線到 %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>請在ç€è¦½å™¨ä¸Šç™»å…¥</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5336,29 +5285,6 @@ Server replied with error: %2</source> <translation>密碼(&P)</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>請轉至ç€è¦½å™¨ç¹¼çºŒã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>連接時發生錯誤。請é‡è©¦ã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>é‡æ–°é–‹å•Ÿç€è¦½å™¨</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>複製連çµ</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6278,6 +6204,57 @@ Server replied with error: %2</source> <translation>釋放近端å˜å„²ç©ºé–“</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>伺æœå™¨å›žè¦†éŒ¯èª¤ï¼š<em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>å˜å–權æ–進入點發生錯誤:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>收到來自OAuth2é‡å®šå‘的空JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>無法解æžä¼ºæœå™¨ç™¼å›žçš„JSON:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>伺æœå™¨çš„回應沒有包å«æ‰€æœ‰é 期的欄ä½</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>登入錯誤</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>錯誤的帳戶</h1><p>您使用帳戶 <em>%1</em> ç™»éŒ„ï¼Œä½†å¿…é ˆä½¿ç”¨å¸³æˆ¶ <em>%2</em>。<br>請在å¦ä¸€å€‹é¸é …å¡ä¸é€€å‡º %3,然後<a href='%4'>單擊æ¤è™•</a>並使用 %2 登錄。</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>連線到 %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>請在ç€è¦½å™¨ä¸Šç™»å…¥</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6306,4 +6283,27 @@ Server replied with error: %2</source> <translation>到期日:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>請轉至ç€è¦½å™¨ç¹¼çºŒã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>連接時發生錯誤。請é‡è©¦ã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>é‡æ–°é–‹å•Ÿç€è¦½å™¨</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>複製連çµ</translation> + </message> +</context> </TS> \ No newline at end of file diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 4e15805fa8a7b0e622b34c96a608e81bb1a5c2b3..37d55e096dd61a888c532056466184a9cdc464ff 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -773,7 +773,7 @@ This action will abort any currently running synchronization.</source> <translation>æœ‰éƒ¨åˆ†è³‡æ–™å¤¾å› ç‚ºå®¹é‡å¤ªå¤§æˆ–是外部儲å˜ç©ºé–“沒有辦法åŒæ¥ï¼š</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1584"/> + <location filename="../src/gui/accountsettings.cpp" line="1572"/> <source>There are folders that have grown in size beyond %1MB: %2</source> <translation>有些資料夾的大å°å·²è¶…éŽ %1MB:%2</translation> </message> @@ -3037,44 +3037,6 @@ Note that using any logging command line options will override this setting.</so <translation>SOCKS5 代ç†ä¼ºæœå™¨</translation> </message> </context> -<context> - <name>OCC::OAuth</name> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> - <source>Error returned from the server: <em>%1</em></source> - <translation>伺æœå™¨å›žå‚³éŒ¯èª¤ï¼š<em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> - <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation>å˜å–「權æ–ã€é€²å…¥é»žç™¼ç”ŸéŒ¯èª¤ï¼š<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>來自 OAuth2 é‡æ–°å°Žå‘的空 JSON</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> - <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>無法解æžä¼ºæœå™¨å›žå‚³çš„ JSON:<br><em>%1</em></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> - <translation>伺æœå™¨çš„回應沒有包å«æ‰€æœ‰é 期的欄ä½</translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> - <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>登入錯誤</h1><p>%1</p></translation> - </message> - <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> - <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> - <translation><h1>錯誤的帳號</h1><p>您已使用 <em>%1</em> å¸³è™Ÿç™»å…¥ï¼Œä½†å¿…é ˆä½¿ç”¨å¸³è™Ÿ <em>%2</em>。<br>請在å¦ä¸€å€‹åˆ†é ä¸ç™»å‡º %3,然後<a href='%4'>點擊æ¤è™•</a>並使用 %2 登入。</p></translation> - </message> -</context> <context> <name>OCC::OCUpdater</name> <message> @@ -3261,19 +3223,6 @@ Note that using any logging command line options will override this setting.</so <translation>請輸入使用者憑è‰</translation> </message> </context> -<context> - <name>OCC::OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> - <source>Connect to %1</source> - <translation>連線到 %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> - <source>Login in your browser</source> - <translation>請在ç€è¦½å™¨ä¸Šç™»å…¥</translation> - </message> -</context> <context> <name>OCC::OwncloudPropagator</name> <message> @@ -5335,29 +5284,6 @@ Server replied with error: %2</source> <translation>密碼(&P)</translation> </message> </context> -<context> - <name>OwncloudOAuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>請切æ›åˆ°ç€è¦½å™¨ä»¥ç¹¼çºŒã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>連線時發生錯誤。請é‡è©¦ã€‚</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>é‡æ–°é–‹å•Ÿç€è¦½å™¨</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> - <source>Copy link</source> - <translation>複製連çµ</translation> - </message> -</context> <context> <name>OwncloudSetupPage</name> <message> @@ -6277,6 +6203,57 @@ Server replied with error: %2</source> <translation>釋放本機空間</translation> </message> </context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>伺æœå™¨å›žå‚³éŒ¯èª¤ï¼š<em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> + <translation>å˜å–「權æ–ã€é€²å…¥é»žç™¼ç”ŸéŒ¯èª¤ï¼š<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <source>Empty JSON from OAuth2 redirect</source> + <translation>來自 OAuth2 é‡æ–°å°Žå‘的空 JSON</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>無法解æžä¼ºæœå™¨å›žå‚³çš„ JSON:<br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="130"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>伺æœå™¨çš„回應沒有包å«æ‰€æœ‰é 期的欄ä½</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>登入錯誤</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <source><h1>Wrong account</h1><p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in with %2.</p></source> + <translation><h1>錯誤的帳號</h1><p>您已使用 <em>%1</em> å¸³è™Ÿç™»å…¥ï¼Œä½†å¿…é ˆä½¿ç”¨å¸³è™Ÿ <em>%2</em>。<br>請在å¦ä¸€å€‹åˆ†é ä¸ç™»å‡º %3,然後<a href='%4'>點擊æ¤è™•</a>並使用 %2 登入。</p></translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>連線到 %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>請在ç€è¦½å™¨ä¸Šç™»å…¥</translation> + </message> +</context> <context> <name>OCC::ShareUserLine</name> <message> @@ -6305,4 +6282,27 @@ Server replied with error: %2</source> <translation>到期:</translation> </message> </context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>請切æ›åˆ°ç€è¦½å™¨ä»¥ç¹¼çºŒã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>連線時發生錯誤。請é‡è©¦ã€‚</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>é‡æ–°é–‹å•Ÿç€è¦½å™¨</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>複製連çµ</translation> + </message> +</context> </TS> \ No newline at end of file